add rpc service name for MCP server

Author: liustve

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/instrumentation.py

@@ -108,10 +108,12 @@ async def async_wrapper():
                 return await wrapped(*args, **kwargs)
 
             request_id: Optional[int] = getattr(instance, "_request_id", None)
-            span_name, span_kind = self._DEFAULT_SERVER_SPAN_NAME, SpanKind.SERVER
+            span_name = self._DEFAULT_SERVER_SPAN_NAME
+            span_kind = SpanKind.SERVER
 
             if isinstance(message, (ClientRequest, ClientNotification)):
-                span_name, span_kind = self._DEFAULT_CLIENT_SPAN_NAME, SpanKind.CLIENT
+                span_name = self._DEFAULT_CLIENT_SPAN_NAME
+                span_kind = SpanKind.CLIENT
 
             message_json = message.model_dump(by_alias=True, mode="json", exclude_none=True)
 
@@ -225,6 +227,7 @@ async def _wrap_server_message_handler(
             self._DEFAULT_SERVER_SPAN_NAME, kind=SpanKind.SERVER, context=parent_ctx
         ) as server_span:
 
+            server_span.set_attribute(SpanAttributes.RPC_SERVICE, instance.name)
             self._generate_mcp_message_attrs(server_span, incoming_msg, request_id)
 
             try: