From 744e9610800cf59e54e72244bb31fc3e5eca8267 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Mon, 7 Dec 2020 16:29:57 +0000 Subject: [PATCH] Update instrumentations (#232) --- .github/workflows/test.yml | 3 ++- .../tests/test_middleware.py | 8 ++++---- .../tests/test_requests_integration.py | 12 ++++++------ .../tests/test_system_metrics.py | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c73f3ca3..167a52e5a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,8 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: ce6449accf315977dd1eab940f7f49b7d894618f + CORE_REPO_SHA: f69e12fba8d0afd587dd21adbedfe751153aa73c + jobs: build: diff --git a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py index 9bd23ee52..b75a8cd0e 100644 --- a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py +++ b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py @@ -144,8 +144,8 @@ class TestMiddleware(TestBase, WsgiTestBase): self.assertEqual(span.attributes["http.status_text"], "OK") self.assertIsNotNone(_django_instrumentor.meter) - self.assertEqual(len(_django_instrumentor.meter.metrics), 1) - recorder = _django_instrumentor.meter.metrics.pop() + self.assertEqual(len(_django_instrumentor.meter.instruments), 1) + recorder = list(_django_instrumentor.meter.instruments.values())[0] match_key = get_dict_as_key( { "http.flavor": "1.1", @@ -222,7 +222,7 @@ class TestMiddleware(TestBase, WsgiTestBase): self.assertEqual(span.attributes["http.scheme"], "http") self.assertEqual(span.attributes["http.status_code"], 500) self.assertIsNotNone(_django_instrumentor.meter) - self.assertEqual(len(_django_instrumentor.meter.metrics), 1) + self.assertEqual(len(_django_instrumentor.meter.instruments), 1) self.assertEqual(len(span.events), 1) event = span.events[0] @@ -230,7 +230,7 @@ class TestMiddleware(TestBase, WsgiTestBase): self.assertEqual(event.attributes["exception.type"], "ValueError") self.assertEqual(event.attributes["exception.message"], "error") - recorder = _django_instrumentor.meter.metrics.pop() + recorder = list(_django_instrumentor.meter.instruments.values())[0] match_key = get_dict_as_key( { "http.flavor": "1.1", diff --git a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py index 2f84f983d..aaecce167 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py +++ b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py @@ -88,8 +88,8 @@ class RequestsIntegrationTestBase(abc.ABC): ) self.assertIsNotNone(RequestsInstrumentor().meter) - self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) - recorder = RequestsInstrumentor().meter.metrics.pop() + self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1) + recorder = list(RequestsInstrumentor().meter.instruments.values())[0] match_key = get_dict_as_key( { "http.flavor": "1.1", @@ -287,8 +287,8 @@ class RequestsIntegrationTestBase(abc.ABC): self.assertEqual(span.status.status_code, StatusCode.ERROR) self.assertIsNotNone(RequestsInstrumentor().meter) - self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) - recorder = RequestsInstrumentor().meter.metrics.pop() + self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1) + recorder = list(RequestsInstrumentor().meter.instruments.values())[0] match_key = get_dict_as_key( { "http.method": "GET", @@ -328,8 +328,8 @@ class RequestsIntegrationTestBase(abc.ABC): ) self.assertEqual(span.status.status_code, StatusCode.ERROR) self.assertIsNotNone(RequestsInstrumentor().meter) - self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) - recorder = RequestsInstrumentor().meter.metrics.pop() + self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1) + recorder = list(RequestsInstrumentor().meter.instruments.values())[0] match_key = get_dict_as_key( { "http.method": "GET", diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py b/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py index 2f155383f..bf2c2d447 100644 --- a/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py @@ -37,7 +37,7 @@ class TestSystemMetrics(TestBase): mock_get_meter.return_value = meter SystemMetrics(self.memory_metrics_exporter) - self.assertEqual(len(meter.observers), 18) + self.assertEqual(len(meter.instruments), 18) observer_names = [ "system.cpu.time", @@ -60,7 +60,7 @@ class TestSystemMetrics(TestBase): "runtime.{}.gc_count".format(self.implementation), ] - for observer in meter.observers: + for observer in meter.instruments.values(): self.assertIn(observer.name, observer_names) observer_names.remove(observer.name)