[feat] Contribute mcp Instrumentor

.flake8

@@ -19,6 +19,9 @@ 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/pyproject.toml

@@ -48,6 +48,7 @@ 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",
@@ -81,9 +82,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

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/mcpinstrumentor/README.md

@@ -0,0 +1,17 @@
+# MCP Instrumentor
+
+OpenTelemetry MCP instrumentation package.
+
+## Installation
+
+```bash
+pip install mcpinstrumentor
+```
+
+## Usage
+
+```python
+from mcpinstrumentor import MCPInstrumentor
+
+MCPInstrumentor().instrument()
+```

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

@@ -0,0 +1,191 @@
+import logging
+from typing import Any, Collection
+
+from openinference.instrumentation.mcp.package import _instruments
+from wrapt import register_post_import_hook, wrap_function_wrapper
+
+from opentelemetry import trace
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.utils import unwrap
+
+
+def setup_loggertwo():
+    logger = logging.getLogger("loggertwo")
+    logger.setLevel(logging.DEBUG)
+    handler = logging.FileHandler("loggertwo.log", mode="w")
+    handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
+    handler.setFormatter(formatter)
+    if not logger.handlers:
+        logger.addHandler(handler)
+    return logger
+
+
+loggertwo = setup_loggertwo()
+
+
+class MCPInstrumentor(BaseInstrumentor):
+    """
+    An instrumenter for MCP.
+    """
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _instruments
+
+    def _instrument(self, **kwargs: Any) -> None:
+        tracer_provider = kwargs.get("tracer_provider")  # Move this line up
+        if tracer_provider:
+            self.tracer_provider = tracer_provider
+        else:
+            self.tracer_provider = None
+        register_post_import_hook(
+            lambda _: wrap_function_wrapper(
+                "mcp.shared.session",
+                "BaseSession.send_request",
+                self._send_request_wrapper,
+            ),
+            "mcp.shared.session",
+        )
+        register_post_import_hook(
+            lambda _: wrap_function_wrapper(
+                "mcp.server.lowlevel.server",
+                "Server._handle_request",
+                self._server_handle_request_wrapper,
+            ),
+            "mcp.server.lowlevel.server",
+        )
+
+    def _uninstrument(self, **kwargs: Any) -> None:
+        unwrap("mcp.shared.session", "BaseSession.send_request")
+        unwrap("mcp.server.lowlevel.server", "Server._handle_request")
+
+    def handle_attributes(self, span, request, is_client=True):
+        import mcp.types as types
+
+        operation = "Server Handle Request"
+        if isinstance(request, types.ListToolsRequest):
+            operation = "ListTool"
+            span.set_attribute("mcp.list_tools", True)
+        elif isinstance(request, types.CallToolRequest):
+            if hasattr(request, "params") and hasattr(request.params, "name"):
+                operation = request.params.name
+            span.set_attribute("mcp.call_tool", True)
+        if is_client:
+            self._add_client_attributes(span, operation, request)
+        else:
+            self._add_server_attributes(span, operation, request)
+
+    def _add_client_attributes(self, span, operation, request):
+        span.set_attribute("span.kind", "CLIENT")
+        span.set_attribute("aws.remote.service", "Appsignals MCP Server")
+        span.set_attribute("aws.remote.operation", operation)
+        if hasattr(request, "params") and hasattr(request.params, "name"):
+            span.set_attribute("tool.name", request.params.name)
+
+    def _add_server_attributes(self, span, operation, request):
+        span.set_attribute("server_side", True)
+        span.set_attribute("aws.span.kind", "SERVER")
+        if hasattr(request, "params") and hasattr(request.params, "name"):
+            span.set_attribute("tool.name", request.params.name)
+
+    def _inject_trace_context(self, request_data, span_ctx):
+        if "params" not in request_data:
+            request_data["params"] = {}
+        if "_meta" not in request_data["params"]:
+            request_data["params"]["_meta"] = {}
+        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):
+        """
+        Changes made:
+            The wrapper intercepts the request before sending, injects distributed tracing context into the
+            request's params._meta field and creates OpenTelemetry spans. The wrapper does not change anything
+            else from the original function's behavior because it reconstructs the request object with the same
+            type and calling the original function with identical parameters.
+        """
+
+        async def async_wrapper():
+            if self.tracer_provider is None:
+                tracer = trace.get_tracer("mcp.client")
+            else:
+                tracer = self.tracer_provider.get_tracer("mcp.client")
+            with tracer.start_as_current_span("client.send_request", kind=trace.SpanKind.CLIENT) as span:
+                span_ctx = span.get_span_context()
+                request = args[0] if len(args) > 0 else kwargs.get("request")
+                if request:
+                    req_root = request.root if hasattr(request, "root") else request
+
+                    self.handle_attributes(span, req_root, True)
+                    request_data = request.model_dump(by_alias=True, mode="json", exclude_none=True)
+                    self._inject_trace_context(request_data, span_ctx)
+                    # Reconstruct request object with injected trace context
+                    modified_request = type(request).model_validate(request_data)
+                    if len(args) > 0:
+                        new_args = (modified_request,) + args[1:]
+                        result = await wrapped(*new_args, **kwargs)
+                    else:
+                        kwargs["request"] = modified_request
+                        result = await wrapped(*args, **kwargs)
+                else:
+                    result = await wrapped(*args, **kwargs)
+                return result
+
+        return async_wrapper()
+
+    def getname(self, req):
+        span_name = "unknown"
+        import mcp.types as types
+
+        if isinstance(req, types.ListToolsRequest):
+            span_name = "tools/list"
+        elif isinstance(req, types.CallToolRequest):
+            if hasattr(req, "params") and hasattr(req.params, "name"):
+                span_name = f"tools/{req.params.name}"
+            else:
+                span_name = "unknown"
+        return span_name
+
+    # Handle Request Wrapper
+    async def _server_handle_request_wrapper(self, wrapped, instance, args, kwargs):
+        """
+        Changes made:
+        This wrapper intercepts requests before processing, extracts distributed tracing context from
+        the request's params._meta field, and creates server-side OpenTelemetry spans linked to the client spans.
+        The wrapper also does not change the original function's behavior by calling it with identical parameters
+        ensuring no breaking changes to the MCP server functionality.
+        """
+        req = args[1] if len(args) > 1 else None
+        trace_context = None
+
+        if req and hasattr(req, "params") and req.params and hasattr(req.params, "meta") and req.params.meta:
+            trace_context = req.params.meta.trace_context
+        if trace_context:
+
+            if self.tracer_provider is None:
+                tracer = trace.get_tracer("mcp.server")
+            else:
+                tracer = self.tracer_provider.get_tracer("mcp.server")
+            trace_id = trace_context.get("trace_id")
+            span_id = trace_context.get("span_id")
+            span_context = trace.SpanContext(
+                trace_id=trace_id,
+                span_id=span_id,
+                is_remote=True,
+                trace_flags=trace.TraceFlags(trace.TraceFlags.SAMPLED),
+                trace_state=trace.TraceState(),
+            )
+            span_name = self.getname(req)
+            with tracer.start_as_current_span(
+                span_name,
+                kind=trace.SpanKind.SERVER,
+                context=trace.set_span_in_context(trace.NonRecordingSpan(span_context)),
+            ) as span:
+                self.handle_attributes(span, req, False)
+                result = await wrapped(*args, **kwargs)
+                return result
+        else:
+            return await wrapped(
+                *args,
+                **kwargs,
+            )

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/mcpinstrumentor/pyproject.toml

@@ -0,0 +1,48 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "amazon-opentelemetry-distro-mcpinstrumentor"
+version = "0.1.0"
+description = "OpenTelemetry MCP instrumentation for AWS Distro"
+readme = "README.md"
+license = "Apache-2.0"
+requires-python = ">=3.9"
+authors = [
+  { name = "Johnny Lin", email = "[email protected]" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+  "opentelemetry-api",
+  "opentelemetry-instrumentation",
+  "opentelemetry-semantic-conventions",
+  "wrapt",
+  "opentelemetry-sdk",
+]
+
+[project.optional-dependencies]
+instruments = ["mcp"]
+
+[project.entry-points.opentelemetry_instrumentor]
+mcp = "mcpinstrumentor:MCPInstrumentor"
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "mcpinstrumentor.py",
+  "README.md"
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]