Add Mapping to _encode_value, remove translations from common metrics encoder.

Author: jack-burridge-cfh

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/__init__.py

@@ -15,7 +15,7 @@
 
 import logging
 from collections.abc import Sequence
-from typing import Any, Optional, List, Callable, TypeVar, Dict
+from typing import Any, Mapping, Optional, List, Callable, TypeVar, Dict
 
 from .version import __version__
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
@@ -27,6 +27,9 @@
 )
 from opentelemetry.proto.common.v1.common_pb2 import AnyValue as PB2AnyValue
 from opentelemetry.proto.common.v1.common_pb2 import KeyValue as PB2KeyValue
+from opentelemetry.proto.common.v1.common_pb2 import (
+    KeyValueList as PB2KeyValueList,
+)
 from opentelemetry.proto.common.v1.common_pb2 import (
     ArrayValue as PB2ArrayValue,
 )
@@ -68,9 +71,12 @@ def _encode_value(value: Any) -> PB2AnyValue:
         return PB2AnyValue(
             array_value=PB2ArrayValue(values=[_encode_value(v) for v in value])
         )
-    # tracing specs currently does not support Mapping type attributes.
-    # elif isinstance(value, abc.Mapping):
-    #     pass
+    elif isinstance(value, Mapping):
+        return PB2AnyValue(
+            kvlist_value=PB2KeyValueList(
+                values=[_encode_key_value(str(k), v) for k, v in value.items()]
+            )
+        )
     raise Exception(f"Invalid type {type(value)} of value {value}")
 
 

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/metrics_encoder/__init__.py

@@ -12,18 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from typing import Sequence, Any, Mapping, Dict, Callable, List
 
+from opentelemetry.exporter.otlp.proto.common import _encode_attributes
 from opentelemetry.proto.collector.metrics.v1.metrics_service_pb2 import (
     ExportMetricsServiceRequest,
 )
-from opentelemetry.proto.common.v1.common_pb2 import (
-    KeyValue,
-    InstrumentationScope,
-    AnyValue,
-    ArrayValue,
-    KeyValueList,
-)
+from opentelemetry.proto.common.v1.common_pb2 import InstrumentationScope
 from opentelemetry.proto.metrics.v1 import metrics_pb2 as pb2
 from opentelemetry.sdk.metrics.export import (
     MetricsData,
@@ -34,23 +28,10 @@
 from opentelemetry.proto.resource.v1.resource_pb2 import (
     Resource as PB2Resource,
 )
-from opentelemetry.sdk.resources import Resource
 
 _logger = logging.getLogger(__name__)
 
 
-def _translate_attributes(attributes) -> Sequence[KeyValue]:
-    output = []
-    if attributes:
-
-        for key, value in attributes.items():
-            try:
-                output.append(_translate_key_values(key, value))
-            except Exception as error:  # pylint: disable=broad-except
-                _logger.exception(error)
-    return output
-
-
 def encode_metrics(data: MetricsData) -> ExportMetricsServiceRequest:
     resource_metrics_dict = {}
 
@@ -90,7 +71,7 @@ def encode_metrics(data: MetricsData) -> ExportMetricsServiceRequest:
                 if isinstance(metric.data, Gauge):
                     for data_point in metric.data.data_points:
                         pt = pb2.NumberDataPoint(
-                            attributes=_translate_attributes(
+                            attributes=_encode_attributes(
                                 data_point.attributes
                             ),
                             time_unix_nano=data_point.time_unix_nano,
@@ -104,7 +85,7 @@ def encode_metrics(data: MetricsData) -> ExportMetricsServiceRequest:
                 elif isinstance(metric.data, Histogram):
                     for data_point in metric.data.data_points:
                         pt = pb2.HistogramDataPoint(
-                            attributes=_translate_attributes(
+                            attributes=_encode_attributes(
                                 data_point.attributes
                             ),
                             time_unix_nano=data_point.time_unix_nano,
@@ -126,7 +107,7 @@ def encode_metrics(data: MetricsData) -> ExportMetricsServiceRequest:
                 elif isinstance(metric.data, Sum):
                     for data_point in metric.data.data_points:
                         pt = pb2.NumberDataPoint(
-                            attributes=_translate_attributes(
+                            attributes=_encode_attributes(
                                 data_point.attributes
                             ),
                             start_time_unix_nano=(
@@ -163,75 +144,10 @@ def encode_metrics(data: MetricsData) -> ExportMetricsServiceRequest:
         resource_data.append(
             pb2.ResourceMetrics(
                 resource=PB2Resource(
-                    attributes=_translate_attributes(sdk_resource.attributes)
+                    attributes=_encode_attributes(sdk_resource.attributes)
                 ),
                 scope_metrics=scope_data.values(),
             )
         )
     resource_metrics = resource_data
     return ExportMetricsServiceRequest(resource_metrics=resource_metrics)
-
-
-def _translate_value(value: Any) -> KeyValue:
-    if isinstance(value, bool):
-        return AnyValue(bool_value=value)
-    elif isinstance(value, str):
-        return AnyValue(string_value=value)
-    elif isinstance(value, int):
-        return AnyValue(int_value=value)
-    elif isinstance(value, float):
-        return AnyValue(double_value=value)
-    elif isinstance(value, Sequence):
-        return AnyValue(
-            array_value=ArrayValue(values=[_translate_value(v) for v in value])
-        )
-    elif isinstance(value, Mapping):
-        return AnyValue(
-            kvlist_value=KeyValueList(
-                values=[
-                    _translate_key_values(str(k), v) for k, v in value.items()
-                ]
-            )
-        )
-    raise Exception(f"Invalid type {type(value)} of value {value}")
-
-
-def _translate_key_values(key: str, value: Any) -> KeyValue:
-    return KeyValue(key=key, value=_translate_value(value))
-
-
-def _get_resource_data(
-    sdk_resource_scope_data: Dict[Resource, Any],  # ResourceDataT?
-    resource_class: Callable[..., PB2Resource],
-    name: str,
-) -> List[PB2Resource]:
-
-    resource_data = []
-
-    for (
-        sdk_resource,
-        scope_data,
-    ) in sdk_resource_scope_data.items():
-
-        collector_resource = PB2Resource()
-
-        for key, value in sdk_resource.attributes.items():
-
-            try:
-                # pylint: disable=no-member
-                collector_resource.attributes.append(
-                    _translate_key_values(key, value)
-                )
-            except Exception as error:  # pylint: disable=broad-except
-                _logger.exception(error)
-
-        resource_data.append(
-            resource_class(
-                **{
-                    "resource": collector_resource,
-                    "scope_{}".format(name): scope_data.values(),
-                }
-            )
-        )
-
-    return resource_data

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

@@ -134,7 +134,7 @@ def _translate_key_values(key: str, value: Any) -> KeyValue:
 
 
 @deprecated(
-    version="1.16.0",
+    version="1.17.0",
     reason="Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead",
 )
 def get_resource_data(

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py

@@ -21,9 +21,10 @@
 from io import BytesIO
 from time import sleep
 from deprecated import deprecated
+
+from opentelemetry.exporter.otlp.proto.common import _get_resource_data
 from opentelemetry.exporter.otlp.proto.common.metrics_encoder import (
     encode_metrics,
-    _get_resource_data,
 )
 from opentelemetry.exporter.otlp.proto.http import Compression
 from opentelemetry.sdk.metrics._internal.aggregation import Aggregation
@@ -254,7 +255,7 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
 
 
 @deprecated(
-    version="1.16.0",
+    version="1.17.0",
     reason="Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead",
 )
 def get_resource_data(