Skip to content

Commit 552cb60

Browse files
trasktrask
committed
Add missing vN_N suffix to javaagent instrumentation packages
Move the single package of 25 javaagent modules into a `vN_N` subpackage so the package name matches the module's base version, per the instrumentation package naming convention. Modules: activej-http-6.0, akka-actor-2.3, apache-httpasyncclient-4.1, dropwizard-metrics-4.0, dropwizard-views-0.7, finatra-2.9, geode-1.4, google-http-client-1.19, grails-3.0, grizzly-2.3, gwt-2.0, hystrix-1.4, jsp-2.3, kafka-streams-0.11, kubernetes-client-7.0, liberty-20.0, rabbitmq-2.7, ratpack-1.4, rediscala-1.8, spymemcached-2.12, tapestry-5.4, twilio-6.6, undertow-1.4, vaadin-14.2, wicket-8.0 No behavior changes; only `git mv` of sources (main, test, and variant test source sets) plus fully-qualified name updates in imports and package declarations across javaagent, testing, common-testing, and javaagent-unit-tests source sets.
1 parent c80068c commit 552cb60

274 files changed

Lines changed: 362 additions & 362 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejAsyncServletInstrumentation.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejAsyncServletInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
1010
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
11-
import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
11+
import static io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0.ActivejHttpServerSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
1414
import static net.bytebuddy.matcher.ElementMatchers.not;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerAttributesGetter.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerAttributesGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import io.activej.http.HttpHeader;
99
import io.activej.http.HttpHeaderValue;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerInstrumentationModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Collections.singletonList;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerRequestGetter.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerRequestGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static java.util.Collections.emptyIterator;
99

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerSingletons.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import io.activej.http.HttpRequest;
99
import io.activej.http.HttpResponse;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/PromiseWrapper.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/PromiseWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
8+
import static io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0.ActivejHttpServerSingletons.instrumenter;
99

1010
import io.activej.http.HttpRequest;
1111
import io.activej.http.HttpResponse;

instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerTest.java renamed to instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.activej.common.exception.FatalErrorHandlers.logging;
99
import static io.activej.http.HttpMethod.GET;

instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java renamed to instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaActorCellInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaactor.v2_3;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java renamed to instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaActorInstrumentationModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaactor.v2_3;
77

88
import static java.util.Arrays.asList;
99

instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java renamed to instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaDefaultSystemMessageQueueInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaactor.v2_3;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;

0 commit comments

Comments
 (0)