diff --git a/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py b/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py index 34b9b28a3f..14ef4b842a 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py @@ -41,7 +41,7 @@ def get_sorted_metrics(self): ) for metrics in resource_metrics: for scope_metrics in metrics.scope_metrics: - all_metrics = [metric for metric in scope_metrics.metrics] + all_metrics = list(scope_metrics.metrics) return self.sorted_metrics(all_metrics) @staticmethod @@ -54,7 +54,7 @@ def sorted_metrics(metrics): key=lambda m: m.name, ) - def assertMetricExpected( + def assert_metric_expected( self, metric, expected_value, expected_attributes ): data_point = next(metric.data.data_points) @@ -75,7 +75,7 @@ def assertMetricExpected( dict(data_point.attributes), ) - def assertDurationMetricExpected( + def assert_duration_metric_expected( self, metric, duration_estimated, expected_attributes ): data_point = next(metric.data.data_points) @@ -130,7 +130,7 @@ def test_basic_metrics(self): self.assertEqual( server_active_request.name, "http.server.active_requests" ) - self.assertMetricExpected( + self.assert_metric_expected( server_active_request, 0, { @@ -143,7 +143,7 @@ def test_basic_metrics(self): ) self.assertEqual(server_duration.name, "http.server.duration") - self.assertDurationMetricExpected( + self.assert_duration_metric_expected( server_duration, client_duration_estimated, { @@ -157,7 +157,7 @@ def test_basic_metrics(self): ) self.assertEqual(server_request_size.name, "http.server.request.size") - self.assertMetricExpected( + self.assert_metric_expected( server_request_size, 0, { @@ -173,7 +173,7 @@ def test_basic_metrics(self): self.assertEqual( server_response_size.name, "http.server.response.size" ) - self.assertMetricExpected( + self.assert_metric_expected( server_response_size, len(response.body), { @@ -187,7 +187,7 @@ def test_basic_metrics(self): ) self.assertEqual(client_duration.name, "http.client.duration") - self.assertDurationMetricExpected( + self.assert_duration_metric_expected( client_duration, client_duration_estimated, { @@ -198,7 +198,7 @@ def test_basic_metrics(self): ) self.assertEqual(client_request_size.name, "http.client.request.size") - self.assertMetricExpected( + self.assert_metric_expected( client_request_size, 0, { @@ -211,7 +211,7 @@ def test_basic_metrics(self): self.assertEqual( client_response_size.name, "http.client.response.size" ) - self.assertMetricExpected( + self.assert_metric_expected( client_response_size, len(response.body), {