Fix according to CR Comments

Author: oxeye-nikolay

CHANGELOG.md

@@ -13,8 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package
   ([#586](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/586))
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-aiohttp-client`, `openetelemetry-instrumentation-fastapi`,        
-  `opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3`,
-  `opentelemetry-instrumentation-pika` Added `request_hook` and `response_hook` callbacks 
+  `opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3` Added `request_hook` and `response_hook` callbacks 
   ([#576](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/576))
 
 ### Changed

instrumentation/opentelemetry-instrumentation-pika/setup.cfg

@@ -41,7 +41,6 @@ packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.5
     wrapt >= 1.0.0, < 2.0.0
-    pika >= 1.1.0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-pika/setup.py

@@ -11,23 +11,79 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+
+# DO NOT EDIT. THIS FILE WAS AUTOGENERATED FROM templates/instrumentation_setup.py.txt.
+# RUN `python scripts/generate_setup.py` TO REGENERATE.
+
+
+import distutils.cmd
+import json
 import os
+from configparser import ConfigParser
 
 import setuptools
 
+config = ConfigParser()
+config.read("setup.cfg")
+
+# We provide extras_require parameter to setuptools.setup later which
+# overwrites the extra_require section from setup.cfg. To support extra_require
+# secion in setup.cfg, we load it here and merge it with the extra_require param.
+extras_require = {}
+if "options.extras_require" in config:
+    for key, value in config["options.extras_require"].items():
+        extras_require[key] = [v for v in value.split("\n") if v.strip()]
+
 BASE_DIR = os.path.dirname(__file__)
+PACKAGE_INFO = {}
+
 VERSION_FILENAME = os.path.join(
-    BASE_DIR, "src", "opentelemetry", "instrumentation", "pika", "version.py",
+    BASE_DIR, "src", "opentelemetry", "instrumentation", "pika", "version.py"
 )
-PACKAGE_INFO = {}
 with open(VERSION_FILENAME) as f:
     exec(f.read(), PACKAGE_INFO)
 
+PACKAGE_FILENAME = os.path.join(
+    BASE_DIR, "src", "opentelemetry", "instrumentation", "pika", "package.py"
+)
+with open(PACKAGE_FILENAME) as f:
+    exec(f.read(), PACKAGE_INFO)
+
+# Mark any instruments/runtime dependencies as test dependencies as well.
+extras_require["instruments"] = PACKAGE_INFO["_instruments"]
+test_deps = extras_require.get("test", [])
+for dep in extras_require["instruments"]:
+    test_deps.append(dep)
+
+extras_require["test"] = test_deps
+
+
+class JSONMetadataCommand(distutils.cmd.Command):
+
+    description = (
+        "print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
+        "auto-generate code in other places",
+    )
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        metadata = {
+            "name": config["metadata"]["name"],
+            "version": PACKAGE_INFO["__version__"],
+            "instruments": PACKAGE_INFO["_instruments"],
+        }
+        print(json.dumps(metadata))
+
+
 setuptools.setup(
+    cmdclass={"meta": JSONMetadataCommand},
     version=PACKAGE_INFO["__version__"],
-    entry_points={
-        "opentelemetry_instrumentor": [
-            "pika = opentelemetry.instrumentation.pika:PikaInstrumentor"
-        ]
-    },
+    extras_require=extras_require,
 )

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

@@ -66,6 +66,7 @@
 ---
 """
 
-# pylint: disable=unused-argument
-from .pika_instrumentor import PikaInstrumentor
-from .version import __version__
+from .pika_instrumentor import (  # pylint: disable=unused-argument
+    PikaInstrumentor,
+)
+from .version import __version__  # pylint: disable=unused-argument

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

@@ -75,6 +75,13 @@ def _uninstrument_channel_functions(channel: Channel) -> None:
     def instrument_channel(
         channel: Channel, tracer_provider: Optional[TracerProvider] = None,
     ) -> None:
+        if not hasattr(channel, "_is_instrumented_by_opentelemetry"):
+            channel._is_instrumented_by_opentelemetry = False
+        if channel._is_instrumented_by_opentelemetry:
+            _LOG.warning(
+                "Attempting to instrument Pika channel while already instrumented!"
+            )
+            return
         tracer = trace.get_tracer(__name__, __version__, tracer_provider)
         channel.__setattr__("__opentelemetry_tracer", tracer)
         if not hasattr(channel, "_impl"):
@@ -88,6 +95,14 @@ def instrument_channel(
 
     @staticmethod
     def uninstrument_channel(channel: Channel) -> None:
+        if (
+            not hasattr(channel, "_is_instrumented_by_opentelemetry")
+            or not channel._is_instrumented_by_opentelemetry
+        ):
+            _LOG.error(
+                "Attempting to uninstrument Pika channel while already uninstrumented!"
+            )
+            return
         if not hasattr(channel, "_impl"):
             _LOG.error("Could not find implementation for provided channel!")
             return

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

@@ -105,13 +105,13 @@ def _get_span(
     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(
         context=ctx, name=_generate_span_name(task_name, operation)
     )
-    _enrich_span(span, channel, properties, task_name, operation)
+    if span.is_recording():
+        _enrich_span(span, channel, properties, task_name, operation)
     return span