diff --git a/instrumentation/armeria-1.3/javaagent/build.gradle.kts b/instrumentation/armeria-1.14/javaagent/build.gradle.kts similarity index 66% rename from instrumentation/armeria-1.3/javaagent/build.gradle.kts rename to instrumentation/armeria-1.14/javaagent/build.gradle.kts index 89e62ac51c38..e5f89e3308b4 100644 --- a/instrumentation/armeria-1.3/javaagent/build.gradle.kts +++ b/instrumentation/armeria-1.14/javaagent/build.gradle.kts @@ -6,18 +6,19 @@ muzzle { pass { group.set("com.linecorp.armeria") module.set("armeria") - versions.set("[1.3.0,)") + versions.set("[1.14.0,)") assertInverse.set(true) } } dependencies { - implementation(project(":instrumentation:armeria-1.3:library")) + implementation(project(":instrumentation:armeria-1.14:library")) + implementation(project(":instrumentation:grpc-1.6:javaagent")) testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent")) - library("com.linecorp.armeria:armeria:1.3.0") + library("com.linecorp.armeria:armeria:1.14.0") - testImplementation(project(":instrumentation:armeria-1.3:testing")) + testImplementation(project(":instrumentation:armeria-1.14:testing")) } tasks { diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/AbstractStreamMessageSubscriptionInstrumentation.java similarity index 97% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/AbstractStreamMessageSubscriptionInstrumentation.java index c106cce9bfe4..838fd2cc8a80 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/AbstractStreamMessageSubscriptionInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaInstrumentationModule.java similarity index 92% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaInstrumentationModule.java index fc530b529d53..106edec1f9d5 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Arrays.asList; @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class ArmeriaInstrumentationModule extends InstrumentationModule { public ArmeriaInstrumentationModule() { - super("armeria", "armeria-1.3"); + super("armeria", "armeria-1.14"); } @Override diff --git a/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaRpcClientBuilderInstrumentation.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaRpcClientBuilderInstrumentation.java new file mode 100644 index 000000000000..8ef848e0f3b9 --- /dev/null +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaRpcClientBuilderInstrumentation.java @@ -0,0 +1,45 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + + package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; + + import static net.bytebuddy.matcher.ElementMatchers.isMethod; + import static net.bytebuddy.matcher.ElementMatchers.isPublic; + import static net.bytebuddy.matcher.ElementMatchers.named; + + import com.linecorp.armeria.client.grpc.GrpcClientBuilder; + import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; + import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; + import io.opentelemetry.javaagent.instrumentation.grpc.v1_6.GrpcSingletons + import net.bytebuddy.asm.Advice; + import net.bytebuddy.description.type.TypeDescription; + import net.bytebuddy.matcher.ElementMatcher; + +public class ArmeriaRpcClientBuilderInstrumentation implements TypeInstrumentation { + + @Override + public ElementMatcher typeMatcher() { + // we need to update class being targeted + return named("com.linecorp.armeria.client.grpc.GrpcClientBuilder"); + } + + @Override + public void transform(TypeTransformer transformer) { + transformer.applyAdviceToMethod( + isMethod().and(isPublic()).and(named("build")), + // reference this class' build advice + ArmeriaRpcClientBuilderInstrumentation.class.getName() + "$BuildAdvice"); + } + + @SuppressWarnings("unused") + public static class BuildAdvice { + + @Advice.OnMethodEnter + // the the GrpcClientBuilder instead + public static void build(@Advice.This GrpcClientBuilder builder) { + builder.interceptor(GrpcSingletons.CLIENT_DECORATOR); + } + } +} diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaServerBuilderInstrumentation.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaServerBuilderInstrumentation.java similarity index 95% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaServerBuilderInstrumentation.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaServerBuilderInstrumentation.java index 3cf870fa6149..ddc8b292a163 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaServerBuilderInstrumentation.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaServerBuilderInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaSingletons.java similarity index 85% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaSingletons.java index 260d9f60763a..71189e14d3ed 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaSingletons.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.HttpClient; import com.linecorp.armeria.server.HttpService; import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientPeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaTelemetry; import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaHttpClientAttributesGetter; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; @@ -28,9 +28,9 @@ public final class ArmeriaSingletons { .setCapturedClientResponseHeaders(CommonConfig.get().getClientResponseHeaders()) .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods()) .addClientAttributeExtractor( - HttpClientPeerServiceAttributesExtractor.create( + PeerServiceAttributesExtractor.create( ArmeriaHttpClientAttributesGetter.INSTANCE, - CommonConfig.get().getPeerServiceResolver())) + CommonConfig.get().getPeerServiceMapping())) .setEmitExperimentalHttpClientMetrics( CommonConfig.get().shouldEmitExperimentalHttpClientMetrics()) .setEmitExperimentalHttpServerMetrics( diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaWebClientBuilderInstrumentation.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaWebClientBuilderInstrumentation.java similarity index 95% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaWebClientBuilderInstrumentation.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaWebClientBuilderInstrumentation.java index f72d14dd8341..5ed03331449c 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaWebClientBuilderInstrumentation.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaWebClientBuilderInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/CompletableFutureWrapper.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/CompletableFutureWrapper.java similarity index 94% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/CompletableFutureWrapper.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/CompletableFutureWrapper.java index 1815f7c3ca0b..6c225b2cd659 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/CompletableFutureWrapper.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/CompletableFutureWrapper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ServerDecorator.java similarity index 96% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ServerDecorator.java index fb3b7b0a3956..0a461ae738b7 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ServerDecorator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpResponse; diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/SubscriberWrapper.java similarity index 97% rename from instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java rename to instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/SubscriberWrapper.java index 2b1b5a1d30c8..f0df110c1d92 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java +++ b/instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/SubscriberWrapper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java b/instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java similarity index 92% rename from instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java rename to instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java index 83fa2e2da44d..ee0484252e38 100644 --- a/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java +++ b/instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.WebClientBuilder; import io.opentelemetry.instrumentation.armeria.v1_3.AbstractArmeriaHttpClientTest; diff --git a/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java b/instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java similarity index 94% rename from instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java rename to instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java index 930e42b217b6..180260b3e2ab 100644 --- a/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java +++ b/instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; +package io.opentelemetry.javaagent.instrumentation.armeria.v1_14; import com.linecorp.armeria.server.ServerBuilder; import io.opentelemetry.instrumentation.armeria.v1_3.AbstractArmeriaHttpServerTest; diff --git a/instrumentation/armeria-1.3/library/build.gradle.kts b/instrumentation/armeria-1.14/library/build.gradle.kts similarity index 76% rename from instrumentation/armeria-1.3/library/build.gradle.kts rename to instrumentation/armeria-1.14/library/build.gradle.kts index 3bcead4ddb68..33c7c642f9db 100644 --- a/instrumentation/armeria-1.3/library/build.gradle.kts +++ b/instrumentation/armeria-1.14/library/build.gradle.kts @@ -4,9 +4,9 @@ plugins { } dependencies { - library("com.linecorp.armeria:armeria:1.3.0") + library("com.linecorp.armeria:armeria:1.14.0") - testImplementation(project(":instrumentation:armeria-1.3:testing")) + testImplementation(project(":instrumentation:armeria-1.14:testing")) } tasks { diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerAttributesGetter.java similarity index 98% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerAttributesGetter.java index 7f8901563a6a..f11c8eab2276 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpStatus; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetry.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetry.java similarity index 97% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetry.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetry.java index 94accffa1a73..8d5f5a36d90c 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetry.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetry.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.ClientRequestContext; import com.linecorp.armeria.client.HttpClient; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetryBuilder.java similarity index 99% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetryBuilder.java index 11e916b99f13..8692884d2840 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetryBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.linecorp.armeria.client.ClientRequestContext; @@ -39,7 +39,7 @@ public final class ArmeriaTelemetryBuilder { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.armeria-1.3"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.armeria-1.14"; private final OpenTelemetry openTelemetry; @Nullable private String peerService; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ClientRequestContextSetter.java similarity index 90% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ClientRequestContextSetter.java index 91ce53e54805..c68263fd8792 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ClientRequestContextSetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.ClientRequestContext; import io.opentelemetry.context.propagation.TextMapSetter; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryClient.java similarity index 96% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryClient.java index d62aad83b7cd..d4b52af38bc5 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryClient.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.ClientRequestContext; import com.linecorp.armeria.client.HttpClient; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryService.java similarity index 96% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryService.java index 5b53fd872f0b..1695ca9359f6 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryService.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpResponse; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/RequestContextGetter.java similarity index 94% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/RequestContextGetter.java index 5163333591a0..965817cb7117 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java +++ b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/RequestContextGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.server.ServiceRequestContext; import io.netty.util.AsciiString; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/internal/ArmeriaHttpClientAttributesGetter.java similarity index 100% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/internal/ArmeriaHttpClientAttributesGetter.java diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/RequestContextAccess.java b/instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/internal/RequestContextAccess.java similarity index 100% rename from instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/RequestContextAccess.java rename to instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/internal/RequestContextAccess.java diff --git a/instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java b/instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpClientTest.java similarity index 96% rename from instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java rename to instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpClientTest.java index eb35610d5023..8ffeae159a98 100644 --- a/instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java +++ b/instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.client.WebClientBuilder; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java b/instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerTest.java similarity index 96% rename from instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java rename to instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerTest.java index 283261595fa8..076bc1da83bb 100644 --- a/instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java +++ b/instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import com.linecorp.armeria.server.ServerBuilder; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/armeria-1.14/testing/build.gradle.kts b/instrumentation/armeria-1.14/testing/build.gradle.kts new file mode 100644 index 000000000000..5f271f0e7cef --- /dev/null +++ b/instrumentation/armeria-1.14/testing/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("otel.java-conventions") +} + +dependencies { + api(project(":testing-common")) + + api("com.linecorp.armeria:armeria:1.14.0") + api("com.linecorp.armeria:armeria-junit4:1.14.0") +} diff --git a/instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.java b/instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpClientTest.java similarity index 98% rename from instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.java rename to instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpClientTest.java index 804189cb66e5..0864958ec5ed 100644 --- a/instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.java +++ b/instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java b/instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpServerTest.java similarity index 99% rename from instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java rename to instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpServerTest.java index 4f8e008ba6ef..c005b6e10b5c 100644 --- a/instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java +++ b/instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpServerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.armeria.v1_3; +package io.opentelemetry.instrumentation.armeria.v1_14; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR; diff --git a/instrumentation/armeria-1.3/testing/build.gradle.kts b/instrumentation/armeria-1.3/testing/build.gradle.kts deleted file mode 100644 index 6de80756b45e..000000000000 --- a/instrumentation/armeria-1.3/testing/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -plugins { - id("otel.java-conventions") -} - -dependencies { - api(project(":testing-common")) - - api("com.linecorp.armeria:armeria:1.3.0") - api("com.linecorp.armeria:armeria-junit4:1.3.0") -}