Testing coverage and dependency issues

Author: Johnnyl202

.flake8

@@ -19,9 +19,6 @@ exclude =
   CVS
   .venv*/
   venv*/
-  **/venv*/
-  **/.venv*/
-  aws-opentelemetry-distro/src/amazon/opentelemetry/distro/mcpinstrumentor/venv
   target
   __pycache__
   mock_collector_service_pb2.py

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/mcpinstrumentor/loggertwo.log renamed to aws-opentelemetry-distro/loggertwo.log

@@ -48,7 +48,6 @@ dependencies = [
   "opentelemetry-instrumentation-boto == 0.54b1",
   "opentelemetry-instrumentation-boto3sqs == 0.54b1",
   "opentelemetry-instrumentation-botocore == 0.54b1",
-  "opentelemetry-instrumentation-cassandra == 0.54b1",
   "opentelemetry-instrumentation-celery == 0.54b1",
   "opentelemetry-instrumentation-confluent-kafka == 0.54b1",
   "opentelemetry-instrumentation-dbapi == 0.54b1",
@@ -82,9 +81,9 @@ dependencies = [
   "opentelemetry-instrumentation-urllib == 0.54b1",
   "opentelemetry-instrumentation-urllib3 == 0.54b1",
   "opentelemetry-instrumentation-wsgi == 0.54b1",
+  "opentelemetry-instrumentation-cassandra == 0.54b1",
 ]
 
-
 [project.optional-dependencies]
 # The 'patch' optional dependency is used for applying patches to specific libraries.
 # If a new patch is added into the list, it must also be added into tox.ini, dev-requirements.txt and _instrumentation_patch
@@ -112,4 +111,4 @@ include = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/amazon"]
+packages = ["src/amazon"]

aws-opentelemetry-distro/pyproject.toml

@@ -9,7 +9,7 @@
 from opentelemetry.instrumentation.utils import unwrap
 
 
-def setup_loggertwo():
+def setup_logger_two():
     logger = logging.getLogger("loggertwo")
     logger.setLevel(logging.DEBUG)
     handler = logging.FileHandler("loggertwo.log", mode="w")
@@ -21,7 +21,7 @@ def setup_loggertwo():
     return logger
 
 
-loggertwo = setup_loggertwo()
+logger_two = setup_logger_two()
 
 
 class MCPInstrumentor(BaseInstrumentor):
@@ -33,7 +33,7 @@ def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs: Any) -> None:
-        tracer_provider = kwargs.get("tracer_provider")  # Move this line up
+        tracer_provider = kwargs.get("tracer_provider")
         if tracer_provider:
             self.tracer_provider = tracer_provider
         else:
@@ -42,15 +42,15 @@ def _instrument(self, **kwargs: Any) -> None:
             lambda _: wrap_function_wrapper(
                 "mcp.shared.session",
                 "BaseSession.send_request",
-                self._send_request_wrapper,
+                self._wrap_send_request,
             ),
             "mcp.shared.session",
         )
         register_post_import_hook(
             lambda _: wrap_function_wrapper(
                 "mcp.server.lowlevel.server",
                 "Server._handle_request",
-                self._server_handle_request_wrapper,
+                self._wrap_handle_request,
             ),
             "mcp.server.lowlevel.server",
         )
@@ -96,7 +96,7 @@ def _inject_trace_context(self, request_data, span_ctx):
         request_data["params"]["_meta"]["trace_context"] = {"trace_id": span_ctx.trace_id, "span_id": span_ctx.span_id}
 
     # Send Request Wrapper
-    def _send_request_wrapper(self, wrapped, instance, args, kwargs):
+    def _wrap_send_request(self, wrapped, instance, args, kwargs):
         """
         Changes made:
             The wrapper intercepts the request before sending, injects distributed tracing context into the
@@ -133,7 +133,7 @@ async def async_wrapper():
 
         return async_wrapper()
 
-    def getname(self, req):
+    def _get_span_name(self, req):
         span_name = "unknown"
         import mcp.types as types
 
@@ -147,7 +147,7 @@ def getname(self, req):
         return span_name
 
     # Handle Request Wrapper
-    async def _server_handle_request_wrapper(self, wrapped, instance, args, kwargs):
+    async def _wrap_handle_request(self, wrapped, instance, args, kwargs):
         """
         Changes made:
         This wrapper intercepts requests before processing, extracts distributed tracing context from
@@ -175,7 +175,7 @@ async def _server_handle_request_wrapper(self, wrapped, instance, args, kwargs):
                 trace_flags=trace.TraceFlags(trace.TraceFlags.SAMPLED),
                 trace_state=trace.TraceState(),
             )
-            span_name = self.getname(req)
+            span_name = self._get_span_name(req)
             with tracer.start_as_current_span(
                 span_name,
                 kind=trace.SpanKind.SERVER,
@@ -185,7 +185,4 @@ async def _server_handle_request_wrapper(self, wrapped, instance, args, kwargs):
                 result = await wrapped(*args, **kwargs)
                 return result
         else:
-            return await wrapped(
-                *args,
-                **kwargs,
-            )
+            return await wrapped(*args, **kwargs)

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/mcpinstrumentor/mcpinstrumentor.py

@@ -25,11 +25,11 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
+  "openinference-instrumentation-mcp",
   "opentelemetry-api",
   "opentelemetry-instrumentation",
-  "opentelemetry-semantic-conventions",
-  "wrapt",
   "opentelemetry-sdk",
+  "wrapt"
 ]
 
 [project.optional-dependencies]