Skip to content

Commit 11286c8

Browse files
trasktrask
committed
Add base version to play-ws-common javaagent module
- instrumentation/play/play-ws/play-ws-common -> play-ws-common-1.0 (package io.opentelemetry.javaagent.instrumentation.playws -> io.opentelemetry.javaagent.instrumentation.playws.common.v1_0) Testing source set kept at io.opentelemetry.javaagent.instrumentation.playws, following the redisson-common-3.0 precedent from open-telemetry#18423.
1 parent f9fab4f commit 11286c8

25 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎.fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ targets:
11311131
target: ':instrumentation:play:play-ws:play-ws-2.1:javaagent'
11321132
- type: gradle
11331133
path: ./
1134-
target: ':instrumentation:play:play-ws:play-ws-common:javaagent'
1134+
target: ':instrumentation:play:play-ws:play-ws-common-1.0:javaagent'
11351135
- type: gradle
11361136
path: ./
11371137
target: ':instrumentation:reactor:reactor-netty:reactor-netty-0.9:javaagent'

‎instrumentation/play/play-ws/play-ws-1.0/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ val scalaVersion = "2.12"
2727
dependencies {
2828
library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.0.2")
2929

30-
implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
30+
implementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:javaagent"))
3131

32-
testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
32+
testImplementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:testing"))
3333

3434
// These are to ensure cross compatibility
3535
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWs10Singletons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.playws.v1_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientInstrumenterFactory;
9+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.PlayWsClientInstrumenterFactory;
1010
import play.shaded.ahc.org.asynchttpclient.Request;
1111
import play.shaded.ahc.org.asynchttpclient.Response;
1212

‎instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import io.opentelemetry.context.Scope;
1515
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
17-
import io.opentelemetry.javaagent.instrumentation.playws.AsyncHttpClientInstrumentation;
18-
import io.opentelemetry.javaagent.instrumentation.playws.HandlerPublisherInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.AsyncHttpClientInstrumentation;
18+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.HandlerPublisherInstrumentation;
1919
import java.util.List;
2020
import javax.annotation.Nullable;
2121
import net.bytebuddy.asm.Advice;

‎instrumentation/play/play-ws/play-ws-2.0/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ val scalaVersion = "2.12"
3434
dependencies {
3535
library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.0.0")
3636

37-
implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
37+
implementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:javaagent"))
3838

39-
testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
39+
testImplementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:testing"))
4040

4141
// These are to ensure cross compatibility
4242
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWs20Singletons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.playws.v2_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientInstrumenterFactory;
9+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.PlayWsClientInstrumenterFactory;
1010
import play.shaded.ahc.org.asynchttpclient.Request;
1111
import play.shaded.ahc.org.asynchttpclient.Response;
1212

‎instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
16-
import io.opentelemetry.javaagent.instrumentation.playws.AbstractBootstrapInstrumentation;
17-
import io.opentelemetry.javaagent.instrumentation.playws.AsyncHttpClientInstrumentation;
18-
import io.opentelemetry.javaagent.instrumentation.playws.HandlerPublisherInstrumentation;
16+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.AbstractBootstrapInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.AsyncHttpClientInstrumentation;
18+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.HandlerPublisherInstrumentation;
1919
import java.util.List;
2020
import javax.annotation.Nullable;
2121
import net.bytebuddy.asm.Advice;

‎instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ val scalaVersion = "2.12"
3232
dependencies {
3333
library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.1.0")
3434

35-
implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
35+
implementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:javaagent"))
3636

37-
testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
37+
testImplementation(project(":instrumentation:play:play-ws:play-ws-common-1.0:testing"))
3838

3939
// These are to ensure cross compatibility
4040
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWs21Singletons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.playws.v2_1;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientInstrumenterFactory;
9+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.PlayWsClientInstrumenterFactory;
1010
import play.shaded.ahc.org.asynchttpclient.Request;
1111
import play.shaded.ahc.org.asynchttpclient.Response;
1212

‎instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
16-
import io.opentelemetry.javaagent.instrumentation.playws.AbstractBootstrapInstrumentation;
17-
import io.opentelemetry.javaagent.instrumentation.playws.AsyncHttpClientInstrumentation;
18-
import io.opentelemetry.javaagent.instrumentation.playws.HandlerPublisherInstrumentation;
16+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.AbstractBootstrapInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.AsyncHttpClientInstrumentation;
18+
import io.opentelemetry.javaagent.instrumentation.playws.common.v1_0.HandlerPublisherInstrumentation;
1919
import java.util.List;
2020
import javax.annotation.Nullable;
2121
import net.bytebuddy.asm.Advice;

0 commit comments

Comments
 (0)