Cleanup

Author: anuraaga

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

@@ -22,6 +22,7 @@
 from opentelemetry.semconv._incubating.attributes.otel_attributes import (
     OTEL_COMPONENT_NAME,
     OTEL_COMPONENT_TYPE,
+    OtelComponentTypeValues,
 )
 from opentelemetry.semconv._incubating.metrics.otel_metrics import (
     create_otel_sdk_exporter_log_exported,
@@ -50,15 +51,15 @@
 class ExporterMetrics:
     def __init__(
         self,
-        component_type: str,
-        signal: Literal["span", "log", "metric_data_point"],
+        component_type: OtelComponentTypeValues | None,
+        signal: Literal["traces", "metrics", "logs"],
         endpoint: UrlParseResult,
         meter_provider: MeterProvider | None,
     ) -> None:
-        if signal == "span":
+        if signal == "traces":
             create_exported = create_otel_sdk_exporter_span_exported
             create_inflight = create_otel_sdk_exporter_span_inflight
-        elif signal == "log":
+        elif signal == "logs":
             create_exported = create_otel_sdk_exporter_log_exported
             create_inflight = create_otel_sdk_exporter_log_inflight
         else:
@@ -76,6 +77,7 @@ def __init__(
             elif endpoint.scheme == "http":
                 port = 80
 
+        component_type = (component_type or OtelComponentTypeValues("unknown_otlp_exporter")).value
         count = _component_counter[component_type]
         _component_counter[component_type] = count + 1
         self._standard_attrs: dict[str, AttributeValue] = {

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

@@ -111,8 +111,8 @@ def __init__(
             stub=LogsServiceStub,
             result=LogRecordExportResult,
             channel_options=channel_options,
-            component_type=OtelComponentTypeValues.OTLP_GRPC_LOG_EXPORTER.value,
-            signal="log",
+            component_type=OtelComponentTypeValues.OTLP_GRPC_LOG_EXPORTER,
+            signal="logs",
             meter_provider=meter_provider,
         )
 

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

@@ -108,6 +108,9 @@
 from opentelemetry.sdk.resources import Resource as SDKResource
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExportResult
+from opentelemetry.semconv._incubating.attributes.otel_attributes import (
+    OtelComponentTypeValues,
+)
 from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
     RPC_RESPONSE_STATUS_CODE,
 )
@@ -307,8 +310,8 @@ def __init__(
         compression: Optional[Compression] = None,
         channel_options: Optional[Tuple[Tuple[str, str]]] = None,
         *,
-        component_type: Optional[str] = None,
-        signal: Literal["span", "log", "metric_data_point"] = "span",
+        component_type: Union[OtelComponentTypeValues, None] = None,
+        signal: Literal["traces", "metrics", "logs"] = "traces",
         meter_provider: Optional[MeterProvider] = None,
     ):
         super().__init__()
@@ -383,8 +386,8 @@ def __init__(
                 OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE,
             )
 
-        self._component_type = component_type or type(self).__qualname__
-        self._signal: Literal["span", "log", "metric_data_point"] = signal
+        self._component_type = component_type
+        self._signal: Literal["traces", "metrics", "logs"] = signal
         self._parsed_url = parsed_url
         self._metrics = ExporterMetrics(
             self._component_type,

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

@@ -159,8 +159,8 @@ def __init__(
             timeout=timeout or environ_timeout,
             compression=compression,
             channel_options=channel_options,
-            component_type=OtelComponentTypeValues.OTLP_GRPC_METRIC_EXPORTER.value,
-            signal="metric_data_point",
+            component_type=OtelComponentTypeValues.OTLP_GRPC_METRIC_EXPORTER,
+            signal="metrics",
             meter_provider=meter_provider,
         )
 

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

@@ -141,8 +141,8 @@ def __init__(
             timeout=timeout or environ_timeout,
             compression=compression,
             channel_options=channel_options,
-            component_type=OtelComponentTypeValues.OTLP_GRPC_SPAN_EXPORTER.value,
-            signal="span",
+            component_type=OtelComponentTypeValues.OTLP_GRPC_SPAN_EXPORTER,
+            signal="traces",
             meter_provider=meter_provider,
         )