Lint + take in feedback around operation name

apollographql · Apr 19, 2022 · 326e330 · 326e330
1 parent ec1e960
commit 326e330
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/apollo-router/src/axum_http_server_factory.rs b/apollo-router/src/axum_http_server_factory.rs
@@ -510,21 +510,6 @@ async fn run_graphql_request(
     }
 }
 
-fn get_operation_name(http_request: &Request<graphql::Request>) -> String {
-    http_request
-        .body()
-        .operation_name
-        .clone()
-        .or_else(|| {
-            http_request
-                .uri()
-                .query()
-                .and_then(|query| graphql::Request::from_urlencoded_query(query.to_string()).ok())
-                .and_then(|q| q.operation_name)
-        })
-        .unwrap_or_default()
-}
-
 fn prefers_html(accept_header: &HeaderValue) -> bool {
     accept_header
         .to_str()

diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs
@@ -7,6 +7,7 @@ use crate::plugins::telemetry::metrics::{
 use crate::plugins::telemetry::tracing::TracingConfigurator;
 use crate::subscriber::replace_layer;
 use ::tracing::{info_span, Span};
+use apollo_router_core::prelude::graphql;
 use apollo_router_core::{
     http_compat, register_plugin, ExecutionRequest, ExecutionResponse, Handler, Plugin,
     QueryPlannerRequest, QueryPlannerResponse, ResponseBody, RouterRequest, RouterResponse,
@@ -462,7 +463,16 @@ impl Telemetry {
                 .body()
                 .operation_name
                 .clone()
-                .unwrap_or_else(|| "".to_string());
+                .or_else(|| {
+                    http_request
+                        .url()
+                        .query()
+                        .and_then(|query| {
+                            graphql::Request::from_urlencoded_query(query.to_string()).ok()
+                        })
+                        .and_then(|q| q.operation_name)
+                })
+                .unwrap_or_default();
             let client_name = headers
                 .get(&client_name_header)
                 .cloned()