Conditionally set session id, fix mismatch of status_code attribute

Author: swcollard

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

@@ -222,15 +222,25 @@ impl Starting {
                                 "mcp_server",
                                 method = %request.method(),
                                 uri = %request.uri(),
-                                session_id = %request.headers().get("mcp-session-id").and_then(|v| v.to_str().ok()).unwrap_or(""),
+                                session_id = tracing::field::Empty,
                                 status_code = tracing::field::Empty,
                             )
                         })
                         .on_response(
                             |response: &axum::http::Response<_>,
                              _latency: std::time::Duration,
                              span: &tracing::Span| {
-                                span.record("status", tracing::field::display(response.status()));
+                                span.record(
+                                    "status_code",
+                                    tracing::field::display(response.status()),
+                                );
+                                if let Some(session_id) = response
+                                    .headers()
+                                    .get("mcp-session-id")
+                                    .and_then(|v| v.to_str().ok())
+                                {
+                                    span.record("session_id", tracing::field::display(session_id));
+                                }
                             },
                         ),
                 );

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

@@ -32,6 +32,9 @@ impl TelemetryAttribute {
             TelemetryAttribute::SessionId => {
                 Key::from_static_str(TelemetryAttribute::SessionId.as_str())
             }
+            TelemetryAttribute::StatusCode => {
+                Key::from_static_str(TelemetryAttribute::StatusCode.as_str())
+            }
         }
     }
 

crates/apollo-mcp-server/telemetry.toml

@@ -8,6 +8,7 @@ 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"
 session_id = "The value of the Mcp-Session-Id header in the HTTP request"
+status_code = "The HTTP status code returned by requests using the Streamable HTTP Transport"
 
 [metrics.apollo.mcp]
 "initialize.count" = "Number of times initialize has been called"