Group metrics by instrumentation scopes in the SDK

open-telemetry · May 12, 2022 · 5e7d981 · 5e7d981
1 parent 436dfff
commit 5e7d981
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/...r-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_metric_exporter/__init__.py b/...r-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_metric_exporter/__init__.py
@@ -101,24 +101,19 @@ def _translate_data(
 
                 instrumentation_scope = scope_metrics.scope
 
-                if instrumentation_scope not in (
-                    instrumentation_scope_pb2_scope_metrics
-                ):
-
-                    # instrumentation_scope comes from the meter, it is never
-                    # None.
-                    instrumentation_scope_pb2_scope_metrics[
-                        instrumentation_scope
-                    ] = pb2.ScopeMetrics(
-                        scope=InstrumentationScope(
-                            name=instrumentation_scope.name,
-                            version=instrumentation_scope.version,
-                        )
+                # The SDK groups metrics in instrumentation scopes already so
+                # there is no need to check for existing instrumentation scopes
+                # here.
+                pb2_scope_metrics = pb2.ScopeMetrics(
+                    scope=InstrumentationScope(
+                        name=instrumentation_scope.name,
+                        version=instrumentation_scope.version,
                     )
+                )
 
-                pb2_scope_metrics = instrumentation_scope_pb2_scope_metrics[
+                instrumentation_scope_pb2_scope_metrics[
                     instrumentation_scope
-                ]
+                ] = pb2_scope_metrics
 
                 for metric in scope_metrics.metrics:
                     pb2_metric = pb2.Metric(

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/metrics/test_otlp_metrics_exporter.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/tests/metrics/test_otlp_metrics_exporter.py
@@ -268,7 +268,7 @@ def setUp(self):
                                 version="first_version",
                                 schema_url="insrumentation_scope_schema_url",
                             ),
-                            metrics=[histogram],
+                            metrics=[histogram, histogram],
                             schema_url="instrumentation_scope_schema_url",
                         ),
                         ScopeMetrics(
@@ -280,15 +280,6 @@ def setUp(self):
                             metrics=[histogram],
                             schema_url="instrumentation_scope_schema_url",
                         ),
-                        ScopeMetrics(
-                            scope=SDKInstrumentationScope(
-                                name="first_name",
-                                version="first_version",
-                                schema_url="insrumentation_scope_schema_url",
-                            ),
-                            metrics=[histogram],
-                            schema_url="instrumentation_scope_schema_url",
-                        ),
                         ScopeMetrics(
                             scope=SDKInstrumentationScope(
                                 name="third_name",

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/metric_reader_storage.py b/opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/metric_reader_storage.py
@@ -48,6 +48,7 @@
     SdkConfiguration,
 )
 from opentelemetry.sdk._metrics._internal.view import View
+from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 
 _logger = getLogger(__name__)
 
@@ -131,6 +132,10 @@ def collect(self) -> MetricsData:
 
             scope_metrics: List[ScopeMetrics] = []
 
+            instrumentation_scope_scope_metrics: (
+                Dict[InstrumentationScope, ScopeMetrics]
+            ) = {}
+
             for (
                 instrument,
                 view_instrument_matches,
@@ -194,13 +199,22 @@ def collect(self) -> MetricsData:
                             data=data,
                         )
                     )
-                scope_metrics.append(
-                    ScopeMetrics(
+
+                if instrument.instrumentation_scope not in (
+                    instrumentation_scope_scope_metrics
+                ):
+                    instrumentation_scope_scope_metrics[
+                        instrument.instrumentation_scope
+                    ] = ScopeMetrics(
                         scope=instrument.instrumentation_scope,
                         metrics=metrics,
                         schema_url=instrument.instrumentation_scope.schema_url,
                     )
-                )
+
+                scope_metrics = instrumentation_scope_scope_metrics[
+                    instrument.instrumentation_scope
+                ]
+                scope_metrics.metrics.extend(metrics)
 
         return MetricsData(
             resource_metrics=[