Skip to content

Commit f7d1652

Browse files
committed
remove code attributes
1 parent f2315e3 commit f7d1652

File tree

4 files changed

+1
-34
lines changed

4 files changed

+1
-34
lines changed

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
8585
}
8686
}
8787
}
88-
8988
tasks.withType<Test>().configureEach {
9089
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
91-
jvmArgs("-Dotel.semconv-stability.opt-in=code")
9290
}

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionCodeAttributesGetter.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.api.trace.Span;
1010
import io.opentelemetry.context.Context;
11-
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
1211
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1312
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
1413
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
@@ -24,8 +23,6 @@ public final class Play24Singletons {
2423
INSTRUMENTER =
2524
Instrumenter.<ActionData, Void>builder(
2625
GlobalOpenTelemetry.get(), "io.opentelemetry.play-mvc-2.4", s -> SPAN_NAME)
27-
.addAttributesExtractor(
28-
CodeAttributesExtractor.create(new ActionCodeAttributesGetter()))
2926
.setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
3027
.buildInstrumenter();
3128
}

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.QUERY_PARAM;
1414
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
16-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1716
import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE;
1817

1918
import io.opentelemetry.api.common.AttributeKey;
@@ -24,7 +23,6 @@
2423
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
2524
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
2625
import io.opentelemetry.sdk.trace.data.StatusData;
27-
import io.opentelemetry.semconv.CodeAttributes;
2826
import java.util.HashSet;
2927
import java.util.Set;
3028
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -116,10 +114,7 @@ protected void configure(HttpServerTestOptions options) {
116114
@Override
117115
public SpanDataAssert assertHandlerSpan(
118116
SpanDataAssert span, String method, ServerEndpoint endpoint) {
119-
span.hasName("play.request")
120-
.hasKind(INTERNAL)
121-
.hasAttributesSatisfyingExactly(
122-
equalTo(CodeAttributes.CODE_FUNCTION_NAME, "play.api.mvc.ActionBuilder$$anon$2.apply"));
117+
span.hasName("play.request").hasKind(INTERNAL);
123118

124119
if (endpoint == EXCEPTION) {
125120
span.hasStatus(StatusData.error());

0 commit comments

Comments
 (0)