opamp: suppress instrumentation for client requests (#384)

Author: xrmx

src/opentelemetry/_opamp/client.py

@@ -20,13 +20,18 @@
 from typing import Generator, Mapping
 
 from uuid_utils import uuid7
-from opentelemetry.util.types import AnyValue
 
-import opentelemetry._opamp.messages as messages
+from opentelemetry._opamp import messages
 from opentelemetry._opamp.transport.requests import RequestsTransport
 from opentelemetry._opamp.version import __version__
 from opentelemetry._opamp.proto import opamp_pb2
-
+from opentelemetry.context import (
+    _SUPPRESS_INSTRUMENTATION_KEY,
+    attach,
+    detach,
+    set_value,
+)
+from opentelemetry.util.types import AnyValue
 
 _logger = getLogger(__name__)
 
@@ -128,15 +133,15 @@ def _build_remote_config_status_response_message(self, remote_config_status: opa
         return data
 
     def _send(self, data: bytes):
+        token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
         try:
             response = self._transport.send(
                 url=self._endpoint, headers=self._headers, data=data, timeout_millis=self._timeout_millis
             )
             return response
-        except:
-            raise
         finally:
             self._sequence_num += 1
+            detach(token)
 
     def _decode_remote_config(
         self, remote_config: opamp_pb2.AgentRemoteConfig

tests/integration/test_integration.py

@@ -36,7 +36,10 @@ class GRPCIntegrationTestCase(ElasticIntegrationGRPCTestCase):
     @classmethod
     def requirements(cls):
         requirements = super().requirements()
-        return requirements + [f"opentelemetry-instrumentation-sqlite3=={OTEL_INSTRUMENTATION_VERSION}"]
+        return requirements + [
+            f"opentelemetry-instrumentation-sqlite3=={OTEL_INSTRUMENTATION_VERSION}",
+            f"opentelemetry-instrumentation-requests=={OTEL_INSTRUMENTATION_VERSION}",
+        ]
 
     def script(self):
         import sqlite3
@@ -187,6 +190,23 @@ def test_script():
         self.assertIn(edot_user_agent, traces_headers[0]["user-agent"])
         self.assertIn(edot_user_agent, logs_headers[0]["user-agent"])
 
+    def test_opamp_client_requests_are_not_instrumented(self):
+        def test_script():
+            from opentelemetry._events import Event, get_event_logger
+
+            event = Event(name="test.event", attributes={}, body={"key": "value"})
+            event_logger = get_event_logger(__name__)
+            event_logger.emit(event)
+
+        env = {"ELASTIC_OTEL_OPAMP_ENDPOINT": "https://httpbin.org/"}
+        stdout, stderr, returncode = self.run_script(
+            test_script, environment_variables=env, wrapper_script="opentelemetry-instrument"
+        )
+
+        telemetry = self.get_telemetry()
+        self.assertFalse(telemetry["traces"])
+        self.assertTrue(telemetry["logs"])
+
 
 @pytest.mark.integration
 class HTTPIntegrationTestCase(ElasticIntegrationHTTPTestCase):