Refactors for constants (#36696)

Author: lzchen

sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md

@@ -10,6 +10,9 @@
 
 ### Other Changes
 
+- Update instrumentation constants info
+    ([#36696](https://github.com/Azure/azure-sdk-for-python/pull/36696))
+
 ## 1.0.0b28 (2024-07-29)
 
 ### Other Changes

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_constants.py

@@ -153,8 +153,15 @@
     "urllib",
     "urllib3",
     _AZURE_SDK_OPENTELEMETRY_NAME,
+    # Instrumentations below this line have not been added to statsbeat report yet
     "cassandra",
     "tortoiseorm",
+    "aiohttp-server",
+    "asyncio",
+    "mysqlclient",
+    "psycopg",
+    "threading",
+    "wsgi",
 ]
 
 _INSTRUMENTATIONS_BIT_MAP = {_INSTRUMENTATIONS_LIST[i]: _BASE**i for i in range(len(_INSTRUMENTATIONS_LIST))}
@@ -174,6 +181,7 @@
 
 # Temporary solution for checking which instrumentations support metric collection
 _INSTRUMENTATION_SUPPORTING_METRICS_LIST = (
+    "opentelemetry.instrumentation.asgi",
     "opentelemetry.instrumentation.django",
     "opentelemetry.instrumentation.falcon",
     "opentelemetry.instrumentation.fastapi",

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py

@@ -11,6 +11,7 @@
 import warnings
 from typing import Callable, Dict, Any
 
+from opentelemetry.semconv.attributes.service_attributes import SERVICE_NAME
 from opentelemetry.semconv.resource import ResourceAttributes
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.util import ns_to_iso_str
@@ -212,7 +213,7 @@ def _create_telemetry_item(timestamp: int) -> TelemetryItem:
 def _populate_part_a_fields(resource: Resource):
     tags = {}
     if resource and resource.attributes:
-        service_name = resource.attributes.get(ResourceAttributes.SERVICE_NAME)
+        service_name = resource.attributes.get(SERVICE_NAME)
         service_namespace = resource.attributes.get(ResourceAttributes.SERVICE_NAMESPACE)
         service_instance_id = resource.attributes.get(ResourceAttributes.SERVICE_INSTANCE_ID)
         device_id = resource.attributes.get(ResourceAttributes.DEVICE_ID)

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py

@@ -4,7 +4,12 @@
 from typing import Optional, Sequence, Any
 
 from opentelemetry._logs.severity import SeverityNumber
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv.attributes.exception_attributes import (
+    EXCEPTION_ESCAPED,
+    EXCEPTION_MESSAGE,
+    EXCEPTION_STACKTRACE,
+    EXCEPTION_TYPE,
+)
 from opentelemetry.sdk._logs import LogData
 from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
 
@@ -126,10 +131,10 @@ def _convert_log_to_envelope(log_data: LogData) -> TelemetryItem:
     )
     exc_type = exc_message = stack_trace = None
     if log_record.attributes:
-        exc_type = log_record.attributes.get(SpanAttributes.EXCEPTION_TYPE)
-        exc_message = log_record.attributes.get(SpanAttributes.EXCEPTION_MESSAGE)
+        exc_type = log_record.attributes.get(EXCEPTION_TYPE)
+        exc_message = log_record.attributes.get(EXCEPTION_MESSAGE)
         # pylint: disable=line-too-long
-        stack_trace = log_record.attributes.get(SpanAttributes.EXCEPTION_STACKTRACE)
+        stack_trace = log_record.attributes.get(EXCEPTION_STACKTRACE)
     severity_level = _get_severity_level(log_record.severity_number)
 
     # Event telemetry
@@ -206,10 +211,10 @@ def _is_ignored_attribute(key: str) -> bool:
 
 _IGNORED_ATTRS = frozenset(
     (
-        SpanAttributes.EXCEPTION_TYPE,
-        SpanAttributes.EXCEPTION_MESSAGE,
-        SpanAttributes.EXCEPTION_STACKTRACE,
-        SpanAttributes.EXCEPTION_ESCAPED,
+        EXCEPTION_TYPE,
+        EXCEPTION_MESSAGE,
+        EXCEPTION_STACKTRACE,
+        EXCEPTION_ESCAPED,
         _APPLICATION_INSIGHTS_EVENT_MARKER_ATTRIBUTE,
     )
 )

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py

@@ -8,7 +8,11 @@
 from functools import partial
 
 # pylint: disable=import-error
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv.attributes.exception_attributes import (
+    EXCEPTION_MESSAGE,
+    EXCEPTION_STACKTRACE,
+    EXCEPTION_TYPE,
+)
 from opentelemetry.sdk import _logs
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 from opentelemetry.sdk.resources import Resource
@@ -136,9 +140,9 @@ def setUpClass(cls):
                 ),
                 attributes={
                     "test": "attribute",
-                    SpanAttributes.EXCEPTION_TYPE: "ZeroDivisionError",
-                    SpanAttributes.EXCEPTION_MESSAGE: "division by zero",
-                    SpanAttributes.EXCEPTION_STACKTRACE: 'Traceback (most recent call last):\n  File "test.py", line 38, in <module>\n    raise ZeroDivisionError()\nZeroDivisionError\n'
+                    EXCEPTION_TYPE: "ZeroDivisionError",
+                    EXCEPTION_MESSAGE: "division by zero",
+                    EXCEPTION_STACKTRACE: 'Traceback (most recent call last):\n  File "test.py", line 38, in <module>\n    raise ZeroDivisionError()\nZeroDivisionError\n'
                 },
             ),
             InstrumentationScope("test_name"),
@@ -157,9 +161,9 @@ def setUpClass(cls):
                 ),
                 attributes={
                     "test": "attribute",
-                    SpanAttributes.EXCEPTION_TYPE: "ZeroDivisionError",
-                    SpanAttributes.EXCEPTION_MESSAGE: "division by zero",
-                    SpanAttributes.EXCEPTION_STACKTRACE: 'Traceback (most recent call last):\n  File "test.py", line 38, in <module>\n    raise ZeroDivisionError()\nZeroDivisionError\n'
+                    EXCEPTION_TYPE: "ZeroDivisionError",
+                    EXCEPTION_MESSAGE: "division by zero",
+                    EXCEPTION_STACKTRACE: 'Traceback (most recent call last):\n  File "test.py", line 38, in <module>\n    raise ZeroDivisionError()\nZeroDivisionError\n'
                 },
             ),
             InstrumentationScope("test_name"),
@@ -178,9 +182,9 @@ def setUpClass(cls):
                 ),
                 attributes={
                     "test": "attribute",
-                    SpanAttributes.EXCEPTION_TYPE: "",
-                    SpanAttributes.EXCEPTION_MESSAGE: "",
-                    SpanAttributes.EXCEPTION_STACKTRACE: ""
+                    EXCEPTION_TYPE: "",
+                    EXCEPTION_MESSAGE: "",
+                    EXCEPTION_STACKTRACE: ""
                 },
             ),
             InstrumentationScope("test_name"),
@@ -199,9 +203,9 @@ def setUpClass(cls):
                 ),
                 attributes={
                     "test": "attribute",
-                    SpanAttributes.EXCEPTION_TYPE: "",
-                    SpanAttributes.EXCEPTION_MESSAGE: "",
-                    SpanAttributes.EXCEPTION_STACKTRACE: ""
+                    EXCEPTION_TYPE: "",
+                    EXCEPTION_MESSAGE: "",
+                    EXCEPTION_STACKTRACE: ""
                 },
             ),
             InstrumentationScope("test_name"),

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/metrics/test_metrics.py

@@ -11,8 +11,6 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.metrics.export import (
     AggregationTemporality,
-    Gauge,
-    Histogram,
     HistogramDataPoint,
     Metric,
     MetricExportResult,

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_base_exporter.py

@@ -16,10 +16,7 @@
     BaseExporter,
     ExportResult,
 )
-from azure.monitor.opentelemetry.exporter.statsbeat._state import (
-    _REQUESTS_MAP,
-    _STATSBEAT_STATE,
-)
+from azure.monitor.opentelemetry.exporter.statsbeat._state import _REQUESTS_MAP
 from azure.monitor.opentelemetry.exporter._constants import (
     _REQ_DURATION_NAME,
     _REQ_EXCEPTION_NAME,

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/trace/test_trace.py

@@ -13,7 +13,12 @@
 from opentelemetry.sdk import trace, resources
 from opentelemetry.sdk.trace.export import SpanExportResult
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv.attributes.exception_attributes import (
+    EXCEPTION_ESCAPED,
+    EXCEPTION_MESSAGE,
+    EXCEPTION_STACKTRACE,
+    EXCEPTION_TYPE,
+)
 from opentelemetry.trace import Link, SpanContext, SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
@@ -1180,10 +1185,10 @@ def test_span_events_to_envelopes_exception(self):
             kind=SpanKind.CLIENT,
         )
         attributes = {
-            SpanAttributes.EXCEPTION_TYPE: "ZeroDivisionError",
-            SpanAttributes.EXCEPTION_MESSAGE: "zero division error",
-            SpanAttributes.EXCEPTION_STACKTRACE: "Traceback: ZeroDivisionError, division by zero",
-            SpanAttributes.EXCEPTION_ESCAPED: "True",
+            EXCEPTION_TYPE: "ZeroDivisionError",
+            EXCEPTION_MESSAGE: "zero division error",
+            EXCEPTION_STACKTRACE: "Traceback: ZeroDivisionError, division by zero",
+            EXCEPTION_ESCAPED: "True",
         }
         span.add_event("exception", attributes, time)
         span.start()