Update prometheus_client to 0.11.0 (jaegertracing#327)

kasium · web-flow · commit f3b51b9078da · 2021-09-07T14:40:29.000-04:00
The tests must be adapeted due prometheus/client_python#300 Signed-off-by: Kai Mueller <15907922+kasium@users.noreply.github.com>
diff --git a/setup.py b/setup.py
@@ -65,7 +65,7 @@
             'codecov',
             'tchannel==2.1.0',
             'opentracing_instrumentation>=3,<4',
-            'prometheus_client==0.3.1',
+            'prometheus_client==0.11.0',
             'mypy',
         ]
     },
diff --git a/tests/test_prometheus.py b/tests/test_prometheus.py
@@ -25,7 +25,7 @@ def test_prometheus_metrics_counter():
     counter2 = metrics.create_counter(name='jaeger:test_counter',
                                       tags={'result': 'ok'})
     counter2(1)
-    after = REGISTRY.get_sample_value('test_jaeger:test_counter',
+    after = REGISTRY.get_sample_value('test_jaeger:test_counter_total',
                                       {'result': 'ok'})
     assert 2 == after
 
@@ -34,7 +34,7 @@ def test_prometheus_metrics_counter_without_tags():
     metrics = PrometheusMetricsFactory()
     counter = metrics.create_counter(name='jaeger:test_counter_no_tags')
     counter(1)
-    after = REGISTRY.get_sample_value('jaeger:test_counter_no_tags')
+    after = REGISTRY.get_sample_value('jaeger:test_counter_no_tags_total')
     assert 1 == after
 
 
@@ -65,7 +65,7 @@ def test_prometheus_metrics_metric_with_service_name_label():
     counter = metrics.create_counter(name='jaeger:test_counter_with_service_name_label',
                                      tags={'x': 'y'})
     counter(1)
-    counter_after = REGISTRY.get_sample_value('jaeger:test_counter_with_service_name_label',
+    counter_after = REGISTRY.get_sample_value('jaeger:test_counter_with_service_name_label_total',
                                               {'service': 'test', 'x': 'y'})
     assert 1 == counter_after
     assert 1 == gauge_after
@@ -78,6 +78,8 @@ def test_prometheus_metrics_metric_without_service_name_label():
     gauge_after = REGISTRY.get_sample_value('jaeger:test_gauge_without_service_name_label')
     counter = metrics.create_counter(name='jaeger:test_counter_without_service_name_label')
     counter(1)
-    counter_after = REGISTRY.get_sample_value('jaeger:test_counter_without_service_name_label')
+    counter_after = REGISTRY.get_sample_value(
+        'jaeger:test_counter_without_service_name_label_total'
+    )
     assert 1 == counter_after
     assert 1 == gauge_after

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`'codecov',`
`66`	`66`	`'tchannel==2.1.0',`
`67`	`67`	`'opentracing_instrumentation>=3,<4',`
`68`		`- 'prometheus_client==0.3.1',`
	`68`	`+ 'prometheus_client==0.11.0',`
`69`	`69`	`'mypy',`
`70`	`70`	`]`
`71`	`71`	`},`