Akka http server span names are always akka.request open-telemetry#3478…

… (open-telemetry#5150) * Akka http server span names are always akka.request open-telemetry#3478 - removed hardcoded span name "akka.request" - implemented route() in AkkaHttpServerAttributesExtractor to provide a better span name - retrofitted AkkaHttpServerInstrumentationTest.groovy * Akka http server span names are always akka.request open-telemetry#3478 - removed hardcoded span name "akka.request" and changed to "HTTP {METHOD}" - retrofitted AkkaHttpServerInstrumentationTest.groovy * Akka http server span names are always akka.request open-telemetry#3478 - removed hardcoded span name "akka.request" and changed to "HTTP {METHOD}" - retrofitted AkkaHttpServerInstrumentationTest.groovy * Akka http server span names are always akka.request open-telemetry#3478 - removed hardcoded span name "akka.request" and changed to "HTTP {METHOD}" - retrofitted AkkaHttpServerInstrumentationTest.groovy and related tests
RashmiRam · May 23, 2022 · e6fd516 · e6fd516
1 parent 1470ac9
commit e6fd516
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.../io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java b/.../io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
@@ -10,6 +10,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerMetrics;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
 import io.opentelemetry.instrumentation.api.server.ServerSpanNaming;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
@@ -25,7 +26,7 @@ public class AkkaHttpServerSingletons {
         Instrumenter.<HttpRequest, HttpResponse>builder(
                 GlobalOpenTelemetry.get(),
                 AkkaHttpUtil.instrumentationName(),
-                unused -> "akka.request")
+                HttpSpanNameExtractor.create(httpAttributesExtractor))
             .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesExtractor))
             .addAttributesExtractor(httpAttributesExtractor)
             .addRequestMetrics(HttpServerMetrics.get())

diff --git a/...on/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/...on/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -21,13 +21,13 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<Object>
 //  }
 
   @Override
-  String expectedServerSpanName(ServerEndpoint endpoint) {
-    return "akka.request"
+  boolean testCapturedHttpHeaders() {
+    false
   }
 
   @Override
-  boolean testCapturedHttpHeaders() {
-    false
+  String expectedServerSpanName(ServerEndpoint endpoint) {
+    return "HTTP GET"
   }
 
   @Override

diff --git a/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy
@@ -107,7 +107,7 @@ class PlayServerTest extends HttpServerTest<Server> implements AgentTestTrait {
 
   @Override
   String expectedServerSpanName(ServerEndpoint endpoint) {
-    return "akka.request"
+    return "HTTP GET"
   }
 
 }