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(prometheus): PrometheusMeterRegistry to support same name with different set of tag keys #38

Merged
merged 5 commits into from
Jul 20, 2021

Conversation

christosarvanitis
Copy link
Collaborator

@christosarvanitis christosarvanitis commented Jul 6, 2021

Fixes: #26
Additionally the micrometer libraries are updated to the available LTS.

The work done in this PR is duplicated/imported from micrometer-metrics/micrometer#2653 that attempts to fix the limitation on the micrometer-prometheus library.

Loading in a local environment and triggering some pipelines the Orca metrics show that the issue is fixed:

# HELP stage_invocations_duration_total  
# TYPE stage_invocations_duration_total counter
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T008C",spinSvc="orca",spinnakerRelease="1.26.2",stageType="manualJudgment",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T007C",spinSvc="orca",spinnakerRelease="1.26.2",stageType="savePipeline",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T008E",spinSvc="orca",spinnakerRelease="1.26.2",stageType="wait",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T0084",spinSvc="orca",spinnakerRelease="1.26.2",stageType="wait",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T0098",spinSvc="orca",spinnakerRelease="1.26.2",stageType="wait",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T0096",spinSvc="orca",spinnakerRelease="1.26.2",stageType="wait",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T008D",spinSvc="orca",spinnakerRelease="1.26.2",stageType="manualJudgment",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T0083",spinSvc="orca",spinnakerRelease="1.26.2",stageType="savePipeline",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
stage_invocations_duration_total{armSpinSvcVer="2.27.0-snapshot.20210708112241.6b80ae6",lib="aop",libVer="v1.1.2-SNAPSHOT",ossSpinSvcVer="2.20.0-20210422230020",percentile="T007E",spinSvc="orca",spinnakerRelease="1.26.2",stageType="savePipeline",statistic="percentile",status="SUCCEEDED",version="2.20.0-20210422230020",} 1.0
 % curl -s 127.0.0.1:8083/aop-prometheus | grep stage_invocations_duration_total | sort | wc -l 
      11
 % curl -s 127.0.0.1:8083/aop-prometheus | grep stage_invocations_duration_total | sort |uniq|  wc -l 
      11

@coveralls
Copy link

coveralls commented Jul 7, 2021

Pull Request Test Coverage Report for Build #73

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage remained the same at 93.309%

Files with Coverage Reduction New Missed Lines %
file:/home/runner/work/armory-observability-plugin/armory-observability-plugin/common/src/main/java/io/armory/plugin/observability/newrelic/NewRelicRegistrySupplier.java 1 95.0%
Totals Coverage Status
Change from base Build #71: 0.0%
Covered Lines: 251
Relevant Lines: 269

💛 - Coveralls

@christosarvanitis christosarvanitis merged commit 415b386 into master Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

text format parsing error in line 289: second TYPE line for metric name \"stage_invocations_total\"
3 participants