Merge pull request #391 from apollographql/fix/telemetry-attributes-2

Fix/telemetry attributes 2

Author: swcollard

crates/apollo-mcp-server/src/operations/operation.rs

@@ -139,7 +139,7 @@ impl Operation {
     }
 
     /// Generate a description for an operation based on documentation in the schema
-    #[tracing::instrument(skip(comments, tree_shaker, graphql_schema))]
+    #[tracing::instrument(skip(comments, tree_shaker, graphql_schema, operation_def), fields(operation_type = ?operation_def.operation_type, operation_id = ?operation_def.name))]
     fn tool_description(
         comments: Option<String>,
         tree_shaker: &mut SchemaTreeShaker,
@@ -427,7 +427,7 @@ pub fn operation_name(
         .to_string())
 }
 
-#[tracing::instrument(skip(source_text))]
+#[tracing::instrument(skip_all, fields(operation_type = ?operation_definition.operation_type, operation_id = ?operation_definition.name))]
 pub fn variable_description_overrides(
     source_text: &str,
     operation_definition: &Node<OperationDefinition>,
@@ -459,7 +459,7 @@ pub fn variable_description_overrides(
     argument_overrides_map
 }
 
-#[tracing::instrument(skip(source_text))]
+#[tracing::instrument(skip_all, fields(operation_type = ?operation_definition.operation_type, operation_id = ?operation_definition.name))]
 pub fn find_opening_parens_offset(
     source_text: &str,
     operation_definition: &Node<OperationDefinition>,

crates/apollo-mcp-server/src/server/states/running.rs

@@ -176,24 +176,34 @@ impl Running {
 }
 
 impl ServerHandler for Running {
-    #[tracing::instrument(skip(self, _request))]
+    #[tracing::instrument(skip_all, fields(apollo.mcp.client_name = request.client_info.name, apollo.mcp.client_version = request.client_info.version))]
     async fn initialize(
         &self,
-        _request: InitializeRequestParam,
+        request: InitializeRequestParam,
         context: RequestContext<RoleServer>,
     ) -> Result<InitializeResult, McpError> {
         let meter = &meter::METER;
+        let attributes = vec![
+            KeyValue::new(
+                TelemetryAttribute::ClientName.to_key(),
+                request.client_info.name.clone(),
+            ),
+            KeyValue::new(
+                TelemetryAttribute::ClientVersion.to_key(),
+                request.client_info.version.clone(),
+            ),
+        ];
         meter
             .u64_counter(TelemetryMetric::InitializeCount.as_str())
             .build()
-            .add(1, &[]);
+            .add(1, &attributes);
         // TODO: how to remove these?
         let mut peers = self.peers.write().await;
         peers.push(context.peer);
         Ok(self.get_info())
     }
 
-    #[tracing::instrument(skip(self, context, request), fields(apollo.mcp.tool_name = request.name.as_ref(), apollo.mcp.request_id = %context.id.clone()))]
+    #[tracing::instrument(skip_all, fields(apollo.mcp.tool_name = request.name.as_ref(), apollo.mcp.request_id = %context.id.clone()))]
     async fn call_tool(
         &self,
         request: CallToolRequestParam,

crates/apollo-mcp-server/src/telemetry_attributes.rs

@@ -23,6 +23,12 @@ impl TelemetryAttribute {
             TelemetryAttribute::RawOperation => {
                 Key::from_static_str(TelemetryAttribute::RawOperation.as_str())
             }
+            TelemetryAttribute::ClientName => {
+                Key::from_static_str(TelemetryAttribute::ClientName.as_str())
+            }
+            TelemetryAttribute::ClientVersion => {
+                Key::from_static_str(TelemetryAttribute::ClientVersion.as_str())
+            }
         }
     }
 

crates/apollo-mcp-server/telemetry.toml

@@ -5,6 +5,8 @@ operation_source = "The operation source - either operation (local file/op colle
 request_id = "The request id"
 success = "Sucess flag indicator"
 raw_operation = "Graphql operation text and metadata used for Tool generation"
+client_name = "The client name that initializes with the MCP Server"
+client_version = "The client version that initializes with the MCP Server"
 
 [metrics.apollo.mcp]
 "initialize.count" = "Number of times initialize has been called"