refactor(otel): remove botocore registration

Author: zhongkechen

packages/aws-durable-execution-sdk-python-otel/pyproject.toml

@@ -32,13 +32,6 @@ dependencies = [
 otel-invocation = "aws_durable_execution_sdk_python_otel.plugin_provider:INVOCATION_OTEL_PLUGIN_PROVIDER"
 otel-execution = "aws_durable_execution_sdk_python_otel.plugin_provider:EXECUTION_OTEL_PLUGIN_PROVIDER"
 
-[project.optional-dependencies]
-# Optional AWS SDK instrumentation for the global provider path. The
-# instrumentations module degrades gracefully when it is absent.
-instrumentation = [
-  "opentelemetry-instrumentation-botocore",
-]
-
 [project.urls]
 Documentation = "https://github.com/aws/aws-durable-execution-sdk-python#readme"
 Issues = "https://github.com/aws/aws-durable-execution-sdk-python/issues"

packages/aws-durable-execution-sdk-python-otel/src/aws_durable_execution_sdk_python_otel/__init__.py

@@ -17,9 +17,6 @@
 from aws_durable_execution_sdk_python_otel.otel_plugin_config import (
     OtelPluginConfig,
 )
-from aws_durable_execution_sdk_python_otel.instrumentations import (
-    register_standalone_instrumentations,
-)
 from aws_durable_execution_sdk_python_otel.log_filter import (
     OtelContextLogFilter,
     install_log_filter,
@@ -46,7 +43,6 @@
     "derive_workflow_span_id",
     "install_log_filter",
     "operation_id_to_span_id",
-    "register_standalone_instrumentations",
     "w3c_client_context_extractor",
     "xray_context_extractor",
 ]

packages/aws-durable-execution-sdk-python-otel/src/aws_durable_execution_sdk_python_otel/execution_plugin.py

@@ -64,9 +64,6 @@
     operation_id_to_span_id,
 )
 from aws_durable_execution_sdk_python_otel.otel_plugin_config import OtelPluginConfig
-from aws_durable_execution_sdk_python_otel.instrumentations import (
-    register_standalone_instrumentations,
-)
 from aws_durable_execution_sdk_python_otel.log_filter import install_log_filter
 from aws_durable_execution_sdk_python_otel.provider import create_tracer_provider
 
@@ -112,11 +109,6 @@ def __init__(self, config: OtelPluginConfig | None = None) -> None:
         self._id_generator = DeterministicIdGenerator()
         self._bind_sdk_tracer()
 
-        try:
-            register_standalone_instrumentations(result)
-        except Exception:
-            logger.exception("Failed to register standalone instrumentations")
-
         # Per-invocation state.
         self._execution_arn = ""
         self._execution_trace_id: int | None = None

packages/aws-durable-execution-sdk-python-otel/src/aws_durable_execution_sdk_python_otel/instrumentations.py

@@ -46,9 +46,6 @@
 from aws_durable_execution_sdk_python_otel.log_filter import install_log_filter
 from aws_durable_execution_sdk_python_otel.otel_plugin_config import OtelPluginConfig
 from aws_durable_execution_sdk_python_otel.provider import create_tracer_provider
-from aws_durable_execution_sdk_python_otel.instrumentations import (
-    register_standalone_instrumentations,
-)
 
 
 logger = logging.getLogger(__name__)
@@ -121,11 +118,6 @@ def __init__(self, config: OtelPluginConfig | None = None) -> None:
         self._id_generator = DeterministicIdGenerator()
         self._bind_sdk_tracer()
 
-        try:
-            register_standalone_instrumentations(result)
-        except Exception:
-            logger.exception("Failed to register standalone instrumentations")
-
         # per invocation status:
         self._execution_arn = ""
         self._execution_trace_id: int | None = None

packages/aws-durable-execution-sdk-python-otel/src/aws_durable_execution_sdk_python_otel/invocation_plugin.py

@@ -0,0 +1,48 @@
+"""Tests for application ownership of OpenTelemetry instrumentation."""
+
+from __future__ import annotations
+
+import sys
+from types import ModuleType
+
+import pytest
+from opentelemetry import trace
+from opentelemetry.sdk.trace import TracerProvider
+
+from aws_durable_execution_sdk_python_otel.execution_plugin import ExecutionOtelPlugin
+from aws_durable_execution_sdk_python_otel.invocation_plugin import InvocationOtelPlugin
+from aws_durable_execution_sdk_python_otel.otel_plugin_config import OtelPluginConfig
+
+
+PluginType = type[ExecutionOtelPlugin] | type[InvocationOtelPlugin]
+
+
+@pytest.mark.parametrize(
+    "plugin_type",
+    [ExecutionOtelPlugin, InvocationOtelPlugin],
+)
+def test_plugin_does_not_register_botocore_instrumentation(
+    plugin_type: PluginType,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    provider = TracerProvider()
+    monkeypatch.setattr(trace, "get_tracer_provider", lambda: provider)
+    instrument_calls: list[dict[str, object]] = []
+
+    class BotocoreInstrumentor:
+        is_instrumented_by_opentelemetry = False
+
+        def instrument(self, **kwargs: object) -> None:
+            instrument_calls.append(kwargs)
+
+    botocore_module = ModuleType("opentelemetry.instrumentation.botocore")
+    setattr(botocore_module, "BotocoreInstrumentor", BotocoreInstrumentor)
+    monkeypatch.setitem(
+        sys.modules,
+        "opentelemetry.instrumentation.botocore",
+        botocore_module,
+    )
+
+    plugin_type(OtelPluginConfig(enrich_logger=False))
+
+    assert instrument_calls == []

packages/aws-durable-execution-sdk-python-otel/tests/test_instrumentation_ownership.py

@@ -49,7 +49,6 @@ extra-dependencies = [
   "pytest",
   "boto3-stubs[lambda]",
   "opentelemetry-sdk>=1.20.0",
-  "opentelemetry-instrumentation-botocore",
 ]
 
 [tool.hatch.envs.types.scripts]