Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix servlet metric names #5734

Merged
merged 10 commits into from Jul 24, 2019

Conversation

@JorikSchellekens
Copy link
Contributor

commented Jul 22, 2019

No description provided.

@JorikSchellekens JorikSchellekens requested a review from matrix-org/synapse-core Jul 22, 2019

@richvdh
Copy link
Member

left a comment

looks like a good start, but needs a few tweaks. Also the CI is failing.

Show resolved Hide resolved synapse/http/server.py
Show resolved Hide resolved synapse/http/server.py Outdated
Show resolved Hide resolved synapse/http/server.py
Show resolved Hide resolved changelog.d/5734.bugfix Outdated
Show resolved Hide resolved synapse/http/server.py Outdated

@JorikSchellekens JorikSchellekens requested a review from richvdh Jul 23, 2019

@richvdh
Copy link
Member

left a comment

couple more things

Show resolved Hide resolved changelog.d/5734.bugfix Outdated
Show resolved Hide resolved synapse/http/server.py Outdated
Show resolved Hide resolved synapse/http/server.py Outdated
@codecov

This comment has been minimized.

Copy link

commented Jul 24, 2019

Codecov Report

Merging #5734 into develop will decrease coverage by 0.01%.
The diff coverage is 80%.

@@             Coverage Diff             @@
##           develop    #5734      +/-   ##
===========================================
- Coverage    63.49%   63.48%   -0.02%     
===========================================
  Files          331      331              
  Lines        36305    36304       -1     
  Branches      5989     5989              
===========================================
- Hits         23051    23046       -5     
- Misses       11616    11619       +3     
- Partials      1638     1639       +1
@codecov

This comment has been minimized.

Copy link

commented Jul 24, 2019

Codecov Report

Merging #5734 into release-v1.2.0 will decrease coverage by <.01%.
The diff coverage is 80%.

@@                Coverage Diff                 @@
##           release-v1.2.0    #5734      +/-   ##
==================================================
- Coverage           63.44%   63.44%   -0.01%     
==================================================
  Files                 331      331              
  Lines               36293    36290       -3     
  Branches             5990     5989       -1     
==================================================
- Hits                23027    23023       -4     
- Misses              11627    11628       +1     
  Partials             1639     1639
@richvdh
Copy link
Member

left a comment

lgtm, once the CI completes!

@JorikSchellekens JorikSchellekens changed the base branch from develop to release-v1.2.0 Jul 24, 2019

@JorikSchellekens JorikSchellekens force-pushed the joriks/fix_servlet_names branch from 05b802a to c85b834 Jul 24, 2019

@JorikSchellekens JorikSchellekens merged commit cf2972c into release-v1.2.0 Jul 24, 2019

19 checks passed

buildkite/synapse Build #3065 passed (23 minutes, 39 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 9 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 16 seconds)
Details
buildkite/synapse/isort Passed (19 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (19 seconds)
Details
buildkite/synapse/pipeline Passed (9 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (18 minutes, 44 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (4 minutes, 30 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (5 minutes, 44 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (4 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (19 minutes, 2 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (18 minutes, 51 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (8 minutes, 57 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (5 minutes, 40 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Soft failed (exit status 1)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (4 minutes, 28 seconds)
Details
codecov/patch 80% of diff hit (target 0%)
Details
codecov/project 63.44% (target 0%)
Details

anoadragon453 added a commit that referenced this pull request Jul 24, 2019

Merge tag 'v1.2.0rc2' into develop
Bugfixes
--------

- Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](#5734))

@JorikSchellekens JorikSchellekens deleted the joriks/fix_servlet_names branch Jul 24, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.