Skip to content

Commit 8a01999

Browse files
committed
move classes to incubator package
1 parent 99c2937 commit 8a01999

File tree

20 files changed

+51
-45
lines changed

20 files changed

+51
-45
lines changed

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/Counted.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/Counted.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Retention;

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/MetricAttribute.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/MetricAttribute.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Retention;

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/StaticMetricAttribute.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticMetricAttribute.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Repeatable;

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/StaticMetricAttributes.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/StaticMetricAttributes.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Retention;

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/Timed.java instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/Timed.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Retention;

instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/CountedUsageExamples.java instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/incubator/CountedUsageExamples.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
public class CountedUsageExamples {
99

instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/TimedUsageExamples.java instrumentation-annotations-incubator/src/test/java/io/opentelemetry/instrumentation/annotations/incubator/TimedUsageExamples.java

+1-1
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.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.annotations.incubator;
77

88
public class TimedUsageExamples {
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tasks {
3535
}
3636
test {
3737
jvmArgs(
38-
"-Dotel.instrumentation.opentelemetry-instrumentation-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted.CountedExample[exampleIgnore];io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.timed.TimedExample[exampleIgnore]"
38+
"-Dotel.instrumentation.opentelemetry-instrumentation-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted.CountedExample[exampleIgnore];io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed.TimedExample[exampleIgnore]"
3939
)
4040
}
4141
}
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.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

8-
import application.io.opentelemetry.instrumentation.annotations.Counted;
8+
import application.io.opentelemetry.instrumentation.annotations.incubator.Counted;
99
import io.opentelemetry.api.metrics.LongCounter;
1010
import io.opentelemetry.context.Context;
1111
import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport;
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.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

88
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.KotlinCoroutineUtil.isKotlinSuspendMethod;
99
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
@@ -34,13 +34,14 @@ public class CountedInstrumentation implements TypeInstrumentation {
3434

3535
CountedInstrumentation() {
3636
annotatedMethodMatcher =
37-
isAnnotatedWith(named("application.io.opentelemetry.instrumentation.annotations.Counted"));
37+
isAnnotatedWith(
38+
named("application.io.opentelemetry.instrumentation.annotations.incubator.Counted"));
3839
annotatedParametersMatcher =
3940
hasParameters(
4041
whereAny(
4142
isAnnotatedWith(
4243
named(
43-
"application.io.opentelemetry.instrumentation.annotations.MetricAttribute"))));
44+
"application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute"))));
4445
// exclude all kotlin suspend methods, these are handle in kotlinx-coroutines instrumentation
4546
excludedMethodsMatcher =
4647
AnnotationExcludedMethods.configureExcludedMethods().or(isKotlinSuspendMethod());
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

8-
import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
9-
import application.io.opentelemetry.instrumentation.annotations.StaticMetricAttribute;
8+
import application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute;
9+
import application.io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
1010
import io.opentelemetry.api.GlobalOpenTelemetry;
1111
import io.opentelemetry.api.common.Attributes;
1212
import io.opentelemetry.api.common.AttributesBuilder;
@@ -21,7 +21,7 @@
2121

2222
public abstract class MetricsAnnotationHelper {
2323
private static final String INSTRUMENTATION_NAME =
24-
"io.opentelemetry.opentelemetry-instrumentation-annotations-2.6";
24+
"io.opentelemetry.opentelemetry-instrumentation-annotations-incubator";
2525
static final Meter METER = GlobalOpenTelemetry.get().getMeter(INSTRUMENTATION_NAME);
2626
static final ParameterAttributeNamesExtractor PARAMETER_ATTRIBUTE_NAMES_EXTRACTOR =
2727
(method, parameters) -> {
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
1010

11-
import application.io.opentelemetry.instrumentation.annotations.Counted;
12-
import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
13-
import application.io.opentelemetry.instrumentation.annotations.Timed;
11+
import application.io.opentelemetry.instrumentation.annotations.incubator.Counted;
12+
import application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute;
13+
import application.io.opentelemetry.instrumentation.annotations.incubator.Timed;
1414
import com.google.auto.service.AutoService;
1515
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
@@ -25,7 +25,10 @@
2525
public class MetricsAnnotationInstrumentationModule extends InstrumentationModule {
2626

2727
public MetricsAnnotationInstrumentationModule() {
28-
super("opentelemetry-instrumentation-annotations", "metrics-annotations");
28+
super(
29+
"opentelemetry-instrumentation-annotations",
30+
"opentelemetry-instrumentation-annotations-incubator",
31+
"metrics-annotations");
2932
}
3033

3134
@Override
@@ -37,7 +40,8 @@ public int order() {
3740

3841
@Override
3942
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
40-
return hasClassesNamed("application.io.opentelemetry.instrumentation.annotations.Counted");
43+
return hasClassesNamed(
44+
"application.io.opentelemetry.instrumentation.annotations.incubator.Counted");
4145
}
4246

4347
@Override
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

88
import static java.util.concurrent.TimeUnit.NANOSECONDS;
99

10-
import application.io.opentelemetry.instrumentation.annotations.Timed;
10+
import application.io.opentelemetry.instrumentation.annotations.incubator.Timed;
1111
import io.opentelemetry.api.metrics.DoubleHistogram;
1212
import io.opentelemetry.context.Context;
1313
import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport;
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.instrumentationannotations.v2_6;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
77

88
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.KotlinCoroutineUtil.isKotlinSuspendMethod;
99
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
@@ -34,13 +34,14 @@ public class TimedInstrumentation implements TypeInstrumentation {
3434

3535
TimedInstrumentation() {
3636
annotatedMethodMatcher =
37-
isAnnotatedWith(named("application.io.opentelemetry.instrumentation.annotations.Timed"));
37+
isAnnotatedWith(
38+
named("application.io.opentelemetry.instrumentation.annotations.incubator.Timed"));
3839
annotatedParametersMatcher =
3940
hasParameters(
4041
whereAny(
4142
isAnnotatedWith(
4243
named(
43-
"application.io.opentelemetry.instrumentation.annotations.MetricAttribute"))));
44+
"application.io.opentelemetry.instrumentation.annotations.incubator.MetricAttribute"))));
4445
// exclude all kotlin suspend methods, these are handle in kotlinx-coroutines instrumentation
4546
excludedMethodsMatcher =
4647
AnnotationExcludedMethods.configureExcludedMethods().or(isKotlinSuspendMethod());
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted;
77

8-
import io.opentelemetry.instrumentation.annotations.Counted;
9-
import io.opentelemetry.instrumentation.annotations.StaticMetricAttribute;
8+
import io.opentelemetry.instrumentation.annotations.incubator.Counted;
9+
import io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
1010
import java.util.concurrent.CompletableFuture;
1111

1212
public class CountedExample {
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted;
77

8-
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted.CountedExample.METRIC_DESCRIPTION;
9-
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted.CountedExample.METRIC_NAME;
10-
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.counted.CountedExample.METRIC_UNIT;
8+
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted.CountedExample.METRIC_DESCRIPTION;
9+
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted.CountedExample.METRIC_NAME;
10+
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted.CountedExample.METRIC_UNIT;
1111
import static org.assertj.core.api.Assertions.assertThat;
1212

1313
import io.opentelemetry.api.common.AttributeKey;
@@ -23,7 +23,7 @@ class CountedInstrumentationTest {
2323
AgentInstrumentationExtension.create();
2424

2525
private static final String INSTRUMENTATION_NAME =
26-
"io.opentelemetry.opentelemetry-instrumentation-annotations-2.6";
26+
"io.opentelemetry.opentelemetry-instrumentation-annotations-incubator";
2727

2828
@Test
2929
void testExampleWithAnotherName() {
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.timed;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed;
77

8-
import io.opentelemetry.instrumentation.annotations.StaticMetricAttribute;
9-
import io.opentelemetry.instrumentation.annotations.Timed;
8+
import io.opentelemetry.instrumentation.annotations.incubator.StaticMetricAttribute;
9+
import io.opentelemetry.instrumentation.annotations.incubator.Timed;
1010
import java.util.concurrent.CompletableFuture;
1111
import java.util.concurrent.TimeUnit;
1212

Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.timed;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed;
77

8-
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.timed.TimedExample.METRIC_DESCRIPTION;
9-
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v2_6.timed.TimedExample.METRIC_NAME;
8+
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed.TimedExample.METRIC_DESCRIPTION;
9+
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed.TimedExample.METRIC_NAME;
1010
import static org.assertj.core.api.Assertions.assertThat;
1111

1212
import io.opentelemetry.api.common.AttributeKey;
@@ -22,7 +22,7 @@ class TimedInstrumentationTest {
2222
AgentInstrumentationExtension.create();
2323

2424
private static final String TIMED_INSTRUMENTATION_NAME =
25-
"io.opentelemetry.opentelemetry-instrumentation-annotations-2.6";
25+
"io.opentelemetry.opentelemetry-instrumentation-annotations-incubator";
2626

2727
@Test
2828
void testExampleWithName() {

javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ dependencies {
7676
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
7777
baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-api:javaagent"))
7878
baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-1.16:javaagent"))
79-
baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-2.6:javaagent"))
79+
baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-incubator:javaagent"))
8080
baseJavaagentLibs(project(":instrumentation:executors:javaagent"))
8181
baseJavaagentLibs(project(":instrumentation:internal:internal-application-logger:javaagent"))
8282
baseJavaagentLibs(project(":instrumentation:internal:internal-class-loader:javaagent"))

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ include(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent")
459459
include(":instrumentation:opentelemetry-extension-annotations-1.0:javaagent")
460460
include(":instrumentation:opentelemetry-extension-kotlin-1.0:javaagent")
461461
include(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-1.16:javaagent")
462-
include(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-2.6:javaagent")
463462
include(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-common:javaagent")
463+
include(":instrumentation:opentelemetry-instrumentation-annotations:opentelemetry-instrumentation-annotations-incubator:javaagent")
464464
include(":instrumentation:opentelemetry-instrumentation-api:javaagent")
465465
include(":instrumentation:opentelemetry-instrumentation-api:testing")
466466
include(":instrumentation:oracle-ucp-11.2:javaagent")

0 commit comments

Comments
 (0)