Merge branch 'main' into dependabot/bundler/resources/google_cloud_pl…

…atform/webmock-tw-3.23.0
open-telemetry · Apr 10, 2024 · b11f85f · b11f85f
2 parents 55cb4e4 + b391e8e
commit b11f85f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb
@@ -89,11 +89,11 @@ def validate(query:, validate:, &block)
           end
 
           def analyze_multiplex(multiplex:, &block)
-            tracer.in_span('graphql.analyze_query', &block)
+            tracer.in_span('graphql.analyze_multiplex', &block)
           end
 
           def analyze_query(query:, &block)
-            tracer.in_span('graphql.analyze_multiplex', &block)
+            tracer.in_span('graphql.analyze_query', &block)
           end
 
           def execute_query(query:, &block)

diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb
@@ -47,8 +47,8 @@
           'graphql.lex',
           'graphql.parse',
           'graphql.validate',
-          'graphql.analyze_multiplex',
           'graphql.analyze_query',
+          'graphql.analyze_multiplex',
           'graphql.execute_query',
           'graphql.execute_query_lazy',
           'graphql.execute_multiplex'