From 1082611ca7218d55409723b1cbce53d9125358b5 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 8 Dec 2021 15:50:54 +0100 Subject: [PATCH] Enable Armeria server instrumentation notFound() test (#4842) --- .../ArmeriaNetClientAttributesExtractor.java | 4 ++-- .../ArmeriaNetServerAttributesExtractor.java | 4 ++-- .../armeria/v1_3/ArmeriaTracingBuilder.java | 2 -- .../armeria/v1_3/OpenTelemetryService.java | 11 +---------- .../armeria/v1_3/AbstractArmeriaHttpServerTest.groovy | 6 ------ 5 files changed, 5 insertions(+), 22 deletions(-) rename instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/{internal => }/ArmeriaNetClientAttributesExtractor.java (89%) rename instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/{internal => }/ArmeriaNetServerAttributesExtractor.java (88%) diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesExtractor.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetClientAttributesExtractor.java similarity index 89% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesExtractor.java rename to instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetClientAttributesExtractor.java index 352a1e8f19be..f96758b59bbe 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesExtractor.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetClientAttributesExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3.internal; +package io.opentelemetry.instrumentation.armeria.v1_3; import com.linecorp.armeria.common.RequestContext; import com.linecorp.armeria.common.logging.RequestLog; @@ -13,7 +13,7 @@ import java.net.SocketAddress; import javax.annotation.Nullable; -public final class ArmeriaNetClientAttributesExtractor +final class ArmeriaNetClientAttributesExtractor extends InetSocketAddressNetClientAttributesExtractor { @Override diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetServerAttributesExtractor.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesExtractor.java similarity index 88% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetServerAttributesExtractor.java rename to instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesExtractor.java index 9d8d4f4eb511..971dd935ec62 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetServerAttributesExtractor.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3.internal; +package io.opentelemetry.instrumentation.armeria.v1_3; import com.linecorp.armeria.common.RequestContext; import com.linecorp.armeria.common.logging.RequestLog; @@ -13,7 +13,7 @@ import java.net.SocketAddress; import javax.annotation.Nullable; -public final class ArmeriaNetServerAttributesExtractor +final class ArmeriaNetServerAttributesExtractor extends InetSocketAddressNetServerAttributesExtractor { @Override diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java index 7b865fc8464b..09e857b60eeb 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java @@ -21,8 +21,6 @@ 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.armeria.v1_3.internal.ArmeriaNetClientAttributesExtractor; -import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaNetServerAttributesExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.ArrayList; import java.util.List; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java index 88e1b3e09074..2d6c997cf2ab 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java @@ -7,7 +7,6 @@ import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpResponse; -import com.linecorp.armeria.common.HttpStatus; import com.linecorp.armeria.common.logging.RequestLog; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.ServiceRequestContext; @@ -36,15 +35,7 @@ public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) throws Exc if (span.isRecording()) { ctx.log() .whenComplete() - .thenAccept( - log -> { - if (log.responseHeaders().status().equals(HttpStatus.NOT_FOUND)) { - // Assume a not-found request was not served. The route we use by default will be - // some fallback like `/*` which is not as useful as the requested path. - span.updateName(ctx.path()); - } - instrumenter.end(context, ctx, log, log.responseCause()); - }); + .thenAccept(log -> instrumenter.end(context, ctx, log, log.responseCause())); } try (Scope ignored = context.makeCurrent()) { diff --git a/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy b/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy index 8b236bbb22c4..3f2af2d06eef 100644 --- a/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy +++ b/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy @@ -50,12 +50,6 @@ abstract class AbstractArmeriaHttpServerTest extends HttpServerTest { ] } - @Override - boolean testNotFound() { - // currently span name is /notFound which indicates it won't be low-cardinality - false - } - @Override Server startServer(int port) { ServerBuilder sb = Server.builder()