Akka-http-server renames
MODIFY
dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
@@ -17,7 +17,7 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
class LagomTest extends AgentTestRunner {
static {
- System.setProperty("dd.integration.akkahttp.enabled", "true")
+ System.setProperty("dd.integration.akka-http-server.enabled", "true")
}
@Shared
@@ -77,7 +77,7 @@ class LagomTest extends AgentTestRunner {
trace(0, 2) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET ws://?/echo"
errored false
tags {
@@ -87,7 +87,7 @@ class LagomTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
}
}
span(1) {
@@ -115,7 +115,7 @@ class LagomTest extends AgentTestRunner {
trace(0, 1) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET ws://?/error"
errored true
tags {
@@ -125,7 +125,7 @@ class LagomTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
"error" true
}
}

MODIFY
dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpInstrumentation.java
dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpInstrumentation.java
@@ -35,7 +35,7 @@ import scala.runtime.AbstractFunction1;
@AutoService(Instrumenter.class)
public final class AkkaHttpInstrumentation extends Instrumenter.Configurable {
public AkkaHttpInstrumentation() {
- super("akkahttp");
+ super("akka-http", "akka-http-server");
}
@Override
@@ -122,12 +122,12 @@ public final class AkkaHttpInstrumentation extends Instrumenter.Configurable {
GlobalTracer.get().extract(Format.Builtin.HTTP_HEADERS, new AkkaHttpHeaders(request));
final Scope scope =
GlobalTracer.get()
- .buildSpan("akkahttp.request")
+ .buildSpan("akka-http.request")
.asChildOf(extractedContext)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER)
.withTag(Tags.HTTP_METHOD.getKey(), request.method().value())
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET)
- .withTag(Tags.COMPONENT.getKey(), "akkahttp-action")
+ .withTag(Tags.COMPONENT.getKey(), "akka-http-server")
.withTag(Tags.HTTP_URL.getKey(), request.getUri().toString())
.startActive(false);

MODIFY
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy
@@ -7,7 +7,7 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
class AkkaHttpInstrumentationTest extends AgentTestRunner {
static {
- System.setProperty("dd.integration.akkahttp.enabled", "true")
+ System.setProperty("dd.integration.akka-http-server.enabled", "true")
}
@Shared
@@ -47,7 +47,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
traceId 123
parentId 456
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /test"
errored false
tags {
@@ -57,7 +57,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
}
}
span(1) {
@@ -89,7 +89,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
trace(0, 1) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /$endpoint"
errored true
tags {
@@ -99,7 +99,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
"error" true
"error.type" RuntimeException.name
"error.msg" errorMessage
@@ -132,7 +132,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
trace(0, 1) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /server-error"
errored true
tags {
@@ -142,7 +142,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
"error" true
}
}
@@ -171,7 +171,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
trace(0, 1) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "404"
errored false
tags {
@@ -181,7 +181,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
}
}
}

MODIFY
dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
@@ -10,7 +10,7 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
class Play26Test extends AgentTestRunner {
static {
- System.setProperty("dd.integration.akkahttp.enabled", "true")
+ System.setProperty("dd.integration.akka-http-server.enabled", "true")
}
@Shared
@@ -47,7 +47,7 @@ class Play26Test extends AgentTestRunner {
traceId 123
parentId 456
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /helloplay/:from"
errored false
tags {
@@ -57,7 +57,7 @@ class Play26Test extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
}
}
span(1) {
@@ -97,7 +97,7 @@ class Play26Test extends AgentTestRunner {
trace(0, 2) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /make-error"
errored true
tags {
@@ -107,7 +107,7 @@ class Play26Test extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
"error" true
}
}
@@ -147,7 +147,7 @@ class Play26Test extends AgentTestRunner {
trace(0, 2) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "GET /exception"
errored true
tags {
@@ -157,7 +157,7 @@ class Play26Test extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
"error" true
}
}
@@ -200,7 +200,7 @@ class Play26Test extends AgentTestRunner {
trace(0, 2) {
span(0) {
serviceName "unnamed-java-app"
- operationName "akkahttp.request"
+ operationName "akka-http.request"
resourceName "404"
errored false
tags {
@@ -210,7 +210,7 @@ class Play26Test extends AgentTestRunner {
"http.method" "GET"
"span.kind" "server"
"span.type" "web"
- "component" "akkahttp-action"
+ "component" "akka-http-server"
}
}
span(1) {

Akka-http-server renames