Skip to content

Commit 3eb313f

Browse files
committed
fix: Add AppmapMiddleware.should_record
1 parent 61ae343 commit 3eb313f

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

appmap/_implementation/web_framework.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ def __init__(self):
135135
self.record_url = "/_appmap/record"
136136
DetectEnabled.initialize()
137137

138+
def should_record(self):
139+
return DetectEnabled.should_enable("remote") or DetectEnabled.should_enable("requests")
140+
138141
def before_request_hook(self, request, request_path, recording_is_running):
139142
if request_path == self.record_url:
140143
return None, None, None

appmap/django.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from django.urls.resolvers import _route_to_regex
2424

2525
from appmap._implementation import generation, recording, web_framework
26-
from appmap._implementation.detect_enabled import DetectEnabled
2726
from appmap._implementation.env import Env
2827
from appmap._implementation.event import (
2928
ExceptionEvent,
@@ -217,10 +216,7 @@ def __init__(self, get_response):
217216
self.recorder = Recorder()
218217

219218
def __call__(self, request):
220-
if not (
221-
DetectEnabled.should_enable("remote")
222-
or DetectEnabled.should_enable("requests")
223-
):
219+
if not self.should_record():
224220
return self.get_response(request)
225221

226222
if request.path_info == self.record_url:

appmap/flask.py

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ def __init__(self, app=None):
5353
self.init_app(app)
5454

5555
def init_app(self, app):
56-
if not (
57-
DetectEnabled.should_enable("remote")
58-
or DetectEnabled.should_enable("requests")
59-
):
56+
if not self.should_record():
6057
return
6158

6259
self.recording = Recording()
@@ -85,10 +82,7 @@ def init_app(self, app):
8582
app.after_request(self.after_request)
8683

8784
def record_get(self):
88-
if not (
89-
DetectEnabled.should_enable("remote")
90-
or DetectEnabled.should_enable("requests")
91-
):
85+
if not self.should_record():
9286
return "Appmap is disabled.", 404
9387

9488
return {"enabled": self.recording.is_running()}
@@ -109,10 +103,7 @@ def record_delete(self):
109103
return json.loads(generation.dump(self.recording))
110104

111105
def before_request(self):
112-
if not (
113-
DetectEnabled.should_enable("remote")
114-
or DetectEnabled.should_enable("requests")
115-
):
106+
if not self.should_record():
116107
return
117108

118109
rec, start, call_event_id = self.before_request_hook(
@@ -149,10 +140,7 @@ def before_request_main(self, rec, request):
149140
return None, None
150141

151142
def after_request(self, response):
152-
if not (
153-
DetectEnabled.should_enable("remote")
154-
or DetectEnabled.should_enable("requests")
155-
):
143+
if not self.should_record():
156144
return response
157145

158146
return self.after_request_hook(

0 commit comments

Comments
 (0)