Fix suppress_instrumentation functionality

Author: oxeye-nikolay

instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py

@@ -3,7 +3,7 @@
 from pika.channel import Channel
 from pika.spec import Basic, BasicProperties
 
-from opentelemetry import propagate, trace
+from opentelemetry import context, propagate, trace
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.propagators.textmap import CarrierT, Getter
 from opentelemetry.semconv.trace import (
@@ -102,9 +102,10 @@ def get_span(
     if properties.headers is None:
         properties.headers = {}
     ctx = propagate.extract(properties.headers, getter=pika_getter)
-    if ctx.get_value("suppress_instrumentation") or ctx.get_value(
+    if context.get_value("suppress_instrumentation") or context.get_value(
         _SUPPRESS_INSTRUMENTATION_KEY
     ):
+        print("Suppressing instrumentation!")
         return None
     task_name = properties.type if properties.type else task_name
     span = tracer.start_span(

instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py

@@ -20,21 +20,21 @@
 
 class TestUtils(TestCase):
     @staticmethod
+    @mock.patch("opentelemetry.context.get_value")
     @mock.patch("opentelemetry.instrumentation.pika.utils.generate_span_name")
     @mock.patch("opentelemetry.instrumentation.pika.utils.enrich_span")
     @mock.patch("opentelemetry.propagate.extract")
     def test_get_span(
         extract: mock.MagicMock,
         enrich_span: mock.MagicMock,
         generate_span_name: mock.MagicMock,
+        get_value: mock.MagicMock,
     ) -> None:
         tracer = mock.MagicMock(spec=Tracer)
         channel = mock.MagicMock()
         properties = mock.MagicMock()
         task_name = "test.test"
-        context = mock.MagicMock()
-        context.get_value.return_value = None
-        extract.return_value = context
+        get_value.return_value = None
         span = utils.get_span(tracer, channel, properties, task_name)
         extract.assert_called_once()
         generate_span_name.assert_called_once()
@@ -47,6 +47,7 @@ def test_get_span(
             for call in enrich_span.call_args_list
         ), "The returned span was not enriched using enrich_span!"
 
+    @mock.patch("opentelemetry.context.get_value")
     @mock.patch("opentelemetry.instrumentation.pika.utils.generate_span_name")
     @mock.patch("opentelemetry.instrumentation.pika.utils.enrich_span")
     @mock.patch("opentelemetry.propagate.extract")
@@ -55,11 +56,13 @@ def test_get_span_suppressed(
         extract: mock.MagicMock,
         enrich_span: mock.MagicMock,
         generate_span_name: mock.MagicMock,
+        get_value: mock.MagicMock,
     ) -> None:
         tracer = mock.MagicMock(spec=Tracer)
         channel = mock.MagicMock()
         properties = mock.MagicMock()
         task_name = "test.test"
+        get_value.return_value = True
         span = utils.get_span(tracer, channel, properties, task_name)
         self.assertEqual(span, None)
         extract.assert_called_once()