Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix servlet metric names #5734

Merged
merged 10 commits into from Jul 24, 2019
Merged

Fix servlet metric names #5734

merged 10 commits into from Jul 24, 2019

Conversation

JorikSchellekens
Copy link
Contributor

No description provided.

@JorikSchellekens JorikSchellekens requested a review from a team July 22, 2019 16:37
richvdh
richvdh suggested changes Jul 22, 2019
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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 Show resolved Hide resolved
richvdh
richvdh suggested changes Jul 24, 2019
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple more things

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

codecov bot 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
Copy link

codecov bot commented Jul 24, 2019 •
edited

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
richvdh approved these changes Jul 24, 2019
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, once the CI completes!

@JorikSchellekens JorikSchellekens changed the base branch from develop to release-v1.2.0 July 24, 2019 10:49
@JorikSchellekens JorikSchellekens merged commit cf2972c into release-v1.2.0 Jul 24, 2019
anoadragon453 added a commit that referenced this pull request Jul 24, 2019
@anoadragon453
Merge tag 'v1.2.0rc2' into develop
baf081c 
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 July 24, 2019 16:55
anoadragon453 added a commit that referenced this pull request Feb 19, 2020
@anoadragon453
Fix servlet metric names (#5734)
bc34ac5
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@richvdh richvdh richvdh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@JorikSchellekens @richvdh