Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Report per request metrics for all of the things using request_handler #756

Merged
merged 3 commits into from Apr 28, 2016

Conversation

Projects
None yet
2 participants
Contributor

NegativeMjark commented Apr 28, 2016

No description provided.

@erikjohnston erikjohnston commented on an outdated diff Apr 28, 2016

synapse/http/server.py
@@ -133,6 +142,13 @@ def wrapped_request_handler(self, request):
},
send_cors=True
)
+ finally:
+ try:
+ request_metrics.stop(
+ self.clock, request, self.__class__.__name__
+ )
+ except:
@erikjohnston

erikjohnston Apr 28, 2016

Owner

Ewwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww.

Can we not instead just check if report_metrics is true?

@erikjohnston erikjohnston commented on an outdated diff Apr 28, 2016

synapse/http/server.py
@@ -197,19 +213,19 @@ def render(self, request):
self._async_render(request)
return server.NOT_DONE_YET
- @request_handler
+ @request_handler(report_metrics=False)
@erikjohnston

erikjohnston Apr 28, 2016

Owner

Why can this not be True?

NegativeMjark added some commits Apr 28, 2016

Owner

erikjohnston commented Apr 28, 2016

LGTM

@NegativeMjark NegativeMjark merged commit 1c188cf into develop Apr 28, 2016

8 checks passed

Flake8 + Packaging (Commit) Build #552 origin/markjh/more_metrics succeeded in 31 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #536 origin/markjh/more_metrics succeeded in 4 min 46 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #543 origin/markjh/more_metrics succeeded in 3 min 24 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #596 origin/markjh/more_metrics succeeded in 1 min 12 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the markjh/more_metrics branch Dec 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment