Skip to content

Commit 13073bb

Browse files
trasktrask
committed
Rename opentelemetry-instrumentation-api module to v1.14 and add v1_14 subpackage
Renames the directory to introduce a base version (`opentelemetry-instrumentation-api-1.14`, matching the muzzle floor of `1.14.0-alpha`) and moves the javaagent classes into a `v1_14` subpackage, bringing this module in line with the convention used by the other self-instrumentation modules (`opentelemetry-extension-annotations-1.0`, `opentelemetry-instrumentation-annotations-1.16`).
1 parent cfc967f commit 13073bb

17 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎.fossa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ targets:
220220
- type: gradle
221221
path: ./
222222
target: ':instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent'
223-
- type: gradle
224-
path: ./
225-
target: ':instrumentation:opentelemetry-instrumentation-api:javaagent'
226223
- type: gradle
227224
path: ./
228225
target: ':instrumentation:oracle-ucp-11.2:javaagent'
@@ -847,6 +844,9 @@ targets:
847844
- type: gradle
848845
path: ./
849846
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.59:javaagent'
847+
- type: gradle
848+
path: ./
849+
target: ':instrumentation:opentelemetry-instrumentation-api:opentelemetry-instrumentation-api-1.14:javaagent'
850850
- type: gradle
851851
path: ./
852852
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies {
2525
compileOnly(project(":opentelemetry-instrumentation-api-shaded-for-instrumenting", configuration = "shadow"))
2626

2727
testImplementation(project(":instrumentation-api-incubator"))
28-
testImplementation(project(":instrumentation:opentelemetry-instrumentation-api:testing"))
29-
testInstrumentation(project(":instrumentation:opentelemetry-instrumentation-api:testing"))
28+
testImplementation(project(":instrumentation:opentelemetry-instrumentation-api:opentelemetry-instrumentation-api-1.14:testing"))
29+
testInstrumentation(project(":instrumentation:opentelemetry-instrumentation-api:opentelemetry-instrumentation-api-1.14:testing"))
3030
}
3131

3232
// version 1.13.0 contains the old ServerSpan implementation that uses SERVER_KEY context key
@@ -38,7 +38,7 @@ testing {
3838
dependencies {
3939
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:$oldServerSpanVersion")
4040
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
41-
implementation(project(":instrumentation:opentelemetry-instrumentation-api:testing"))
41+
implementation(project(":instrumentation:opentelemetry-instrumentation-api:opentelemetry-instrumentation-api-1.14:testing"))
4242
}
4343
}
4444
}

instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/HttpRouteStateInstrumentation.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/HttpRouteStateInstrumentation.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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

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

instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/InstrumentationApiInstrumentationModule.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java

Lines changed: 2 additions & 2 deletions
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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

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

@@ -18,7 +18,7 @@ public class InstrumentationApiInstrumentationModule extends InstrumentationModu
1818
implements ExperimentalInstrumentationModule {
1919

2020
public InstrumentationApiInstrumentationModule() {
21-
super("opentelemetry-instrumentation-api");
21+
super("opentelemetry-instrumentation-api", "opentelemetry-instrumentation-api-1.14");
2222
}
2323

2424
@Override

instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyBridging.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/SpanKeyBridging.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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

88
import io.opentelemetry.instrumentation.api.internal.SpanKey;
99
import java.util.HashMap;

instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/SpanKeyInstrumentation.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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

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

instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/ContextBridgeTest.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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;

instrumentation/opentelemetry-instrumentation-api/javaagent/src/testOldServerSpan/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/LegacyServerSpanContextBridgeTest.java renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/testOldServerSpan/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/LegacyServerSpanContextBridgeTest.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.instrumentationapi;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

instrumentation/opentelemetry-instrumentation-api/metadata.yaml renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/metadata.yaml

File renamed without changes.

instrumentation/opentelemetry-instrumentation-api/testing/build.gradle.kts renamed to instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/build.gradle.kts

File renamed without changes.

0 commit comments

Comments
 (0)