[feat] Contribute mcp Instrumentor

aws-opentelemetry-distro/pyproject.toml

@@ -89,12 +89,17 @@ dependencies = [
 # If a new patch is added into the list, it must also be added into tox.ini, dev-requirements.txt and _instrumentation_patch
 patch = [
   "botocore ~= 1.0",
+  "mcp >= 1.6.0",
 ]
+
 test = []
 
 [project.entry-points.opentelemetry_configurator]
 aws_configurator = "amazon.opentelemetry.distro.aws_opentelemetry_configurator:AwsOpenTelemetryConfigurator"
 
+[project.entry-points.opentelemetry_instrumentor]
+mcp = "amazon.opentelemetry.distro.instrumentation.mcp.instrumentation:McpInstrumentor"
+
 [project.entry-points.opentelemetry_distro]
 aws_distro = "amazon.opentelemetry.distro.aws_opentelemetry_distro:AwsOpenTelemetryDistro"
 

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

@@ -41,6 +41,7 @@
     AWS_STEPFUNCTIONS_STATEMACHINE_ARN,
 )
 from amazon.opentelemetry.distro._aws_resource_attribute_configurator import get_service_attribute
+from amazon.opentelemetry.distro.instrumentation.mcp.semconv import MCPSpanAttributes
 from amazon.opentelemetry.distro._aws_span_processing_util import (
     LOCAL_ROOT,
     MAX_KEYWORD_LENGTH,
@@ -97,6 +98,7 @@
 _SERVER_SOCKET_PORT: str = SpanAttributes.SERVER_SOCKET_PORT
 _AWS_TABLE_NAMES: str = SpanAttributes.AWS_DYNAMODB_TABLE_NAMES
 _AWS_BUCKET_NAME: str = SpanAttributes.AWS_S3_BUCKET
+_MCP_METHOD_NAME: str = MCPSpanAttributes.MCP_METHOD_NAME
 
 # Normalized remote service names for supported AWS services
 _NORMALIZED_DYNAMO_DB_SERVICE_NAME: str = "AWS::DynamoDB"
@@ -263,6 +265,9 @@ def _set_remote_service_and_operation(span: ReadableSpan, attributes: BoundedAtt
     elif is_key_present(span, _GRAPHQL_OPERATION_TYPE):
         remote_service = _GRAPHQL
         remote_operation = _get_remote_operation(span, _GRAPHQL_OPERATION_TYPE)
+    elif is_key_present(span, _MCP_METHOD_NAME) and is_key_present(span, _RPC_SERVICE):
+        remote_service = _normalize_remote_service_name(span, _get_remote_service(span, _RPC_SERVICE))
+        remote_operation = _get_remote_operation(span, _MCP_METHOD_NAME)
 
     # Peer service takes priority as RemoteService over everything but AWS Remote.
     if is_key_present(span, _PEER_SERVICE) and not is_key_present(span, AWS_REMOTE_SERVICE):

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/instrumentation/mcp/README.md

@@ -0,0 +1,31 @@
+# MCP Instrumentor
+
+OpenTelemetry instrumentation for Model Context Protocol (MCP).
+
+## Installation
+
+Included in AWS OpenTelemetry Distro:
+
+```bash
+pip install aws-opentelemetry-distro
+```
+
+## Usage
+
+Automatically enabled with:
+
+```bash
+opentelemetry-instrument python your_mcp_app.py
+```
+
+## Configuration
+
+- `MCP_INSTRUMENTATION_SERVER_NAME`: Override default server name (default: "mcp server")
+
+## Spans Created
+
+- **Client**: 
+  - Initialize: `mcp.initialize`
+  - List Tools: `mcp.list_tools`
+  - Call Tool: `mcp.call_tool.{tool_name}`
+- **Server**: `tools/initialize`, `tools/list`, `tools/{tool_name}`

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/instrumentation/mcp/__init__.py

@@ -0,0 +1,7 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+from .version import __version__
+from .instrumentation import McpInstrumentor
+
+__all__ = ["McpInstrumentor", "__version__"]