Skip to content

Commit ee2c31e

Browse files
cuichenlicuichenli
committed
remove redundant metric
1 parent 24b443c commit ee2c31e

File tree

2 files changed

+1
-46
lines changed
  • instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src

2 files changed

+1
-46
lines changed

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxSingletons.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ public final class WebfluxSingletons {
2626
Instrumenter.builder(
2727
GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, new WebfluxSpanNameExtractor());
2828

29-
if (SpringWebfluxConfig.captureExperimentalSpanAttributes()) {
30-
builder.addAttributesExtractor(new ExperimentalAttributesExtractor());
31-
}
29+
if (SpringWebfluxConfig.captureExperimentalSpanAttributes()) {}
3230

3331
INSTRUMENTER =
3432
builder

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server;
77

8-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
98
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
109
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1110
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -140,11 +139,6 @@ void basicGetTest(Parameter parameter) {
140139
span.hasKind(SpanKind.INTERNAL)
141140
.hasParent(trace.getSpan(0))
142141
.hasAttributesSatisfyingExactly(
143-
satisfies(
144-
stringKey("spring-webflux.handler.type"),
145-
parameter.annotatedMethod == null
146-
? val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
147-
: val -> val.isEqualTo(TestController.class.getName())),
148142
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
149143
satisfies(
150144
CODE_NAMESPACE,
@@ -265,11 +259,6 @@ void getAsyncResponseTest(Parameter parameter) {
265259
span.hasKind(SpanKind.INTERNAL)
266260
.hasParent(trace.getSpan(0))
267261
.hasAttributesSatisfyingExactly(
268-
satisfies(
269-
stringKey("spring-webflux.handler.type"),
270-
parameter.annotatedMethod == null
271-
? val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
272-
: val -> val.isEqualTo(TestController.class.getName())),
273262
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
274263
satisfies(
275264
CODE_NAMESPACE,
@@ -377,11 +366,6 @@ void createSpanDuringHandlerFunctionTest(Parameter parameter) {
377366
span.hasKind(SpanKind.INTERNAL)
378367
.hasParent(trace.getSpan(0))
379368
.hasAttributesSatisfyingExactly(
380-
satisfies(
381-
stringKey("spring-webflux.handler.type"),
382-
parameter.annotatedMethod == null
383-
? val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
384-
: val -> val.isEqualTo(TestController.class.getName())),
385369
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
386370
satisfies(
387371
CODE_NAMESPACE,
@@ -448,9 +432,6 @@ void get404Test() {
448432
.hasStatus(StatusData.error())
449433
.hasEventsSatisfyingExactly(SpringWebfluxTest::resource404Exception)
450434
.hasAttributesSatisfyingExactly(
451-
equalTo(
452-
stringKey("spring-webflux.handler.type"),
453-
"org.springframework.web.reactive.resource.ResourceWebHandler"),
454435
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
455436
equalTo(
456437
CODE_NAMESPACE,
@@ -509,9 +490,6 @@ void basicPostTest() {
509490
.hasKind(SpanKind.INTERNAL)
510491
.hasParent(trace.getSpan(0))
511492
.hasAttributesSatisfyingExactly(
512-
satisfies(
513-
stringKey("spring-webflux.handler.type"),
514-
val -> val.contains(EchoHandlerFunction.class.getName())),
515493
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
516494
satisfies(
517495
CODE_NAMESPACE,
@@ -572,11 +550,6 @@ void getToBadEndpointTest(Parameter parameter) {
572550
EXCEPTION_STACKTRACE,
573551
val -> val.isInstanceOf(String.class))))
574552
.hasAttributesSatisfyingExactly(
575-
satisfies(
576-
stringKey("spring-webflux.handler.type"),
577-
parameter.annotatedMethod == null
578-
? val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
579-
: val -> val.isEqualTo(TestController.class.getName())),
580553
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
581554
satisfies(
582555
CODE_NAMESPACE,
@@ -637,9 +610,6 @@ void redirectTest() {
637610
.hasKind(SpanKind.INTERNAL)
638611
.hasParent(trace.getSpan(0))
639612
.hasAttributesSatisfyingExactly(
640-
satisfies(
641-
stringKey("spring-webflux.handler.type"),
642-
val -> val.startsWith("server.RedirectComponent$$Lambda")),
643613
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
644614
satisfies(
645615
CODE_NAMESPACE,
@@ -669,9 +639,6 @@ void redirectTest() {
669639
span.hasKind(SpanKind.INTERNAL)
670640
.hasParent(trace.getSpan(0))
671641
.hasAttributesSatisfyingExactly(
672-
satisfies(
673-
stringKey("spring-webflux.handler.type"),
674-
val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)),
675642
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
676643
satisfies(
677644
CODE_NAMESPACE,
@@ -730,11 +697,6 @@ void multipleGetsToDelayingRoute(Parameter parameter) {
730697
span.hasKind(SpanKind.INTERNAL)
731698
.hasParent(trace.getSpan(0))
732699
.hasAttributesSatisfyingExactly(
733-
satisfies(
734-
stringKey("spring-webflux.handler.type"),
735-
parameter.annotatedMethod == null
736-
? val -> val.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX)
737-
: val -> val.isEqualTo(TestController.class.getName())),
738700
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
739701
satisfies(
740702
CODE_NAMESPACE,
@@ -808,11 +770,6 @@ void cancelRequestTest() throws Exception {
808770
.hasKind(SpanKind.INTERNAL)
809771
.hasParent(trace.getSpan(0))
810772
.hasAttributesSatisfyingExactly(
811-
satisfies(
812-
stringKey("spring-webflux.handler.type"),
813-
value ->
814-
value.startsWith(
815-
"server.SpringWebFluxTestApplication$$Lambda")),
816773
satisfies(CODE_FUNCTION, val -> val.isEqualTo("handle")),
817774
satisfies(
818775
CODE_NAMESPACE,

0 commit comments

Comments
 (0)