Skip to content

Commit 4fd52c5

Browse files
Mateusz Rzeszutektrask
Mateusz Rzeszutek
and
trask
authored
Encode version in library instrumentations' package names (#7764)
Another part of #932 In this PR I changed all the library instrumentation packages -- these are breaking changes, so I figured the earlier we do this the less painful it'll be to the users. I know that at least some of them are actively used, so we'll need to spell this out in the release notes. --------- Co-authored-by: Trask Stalnaker <[email protected]>
1 parent b04bf88 commit 4fd52c5

File tree

134 files changed

+188
-174
lines changed

Some content is hidden

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

134 files changed

+188
-174
lines changed

‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/ApacheDbcpInstrumentationModule.java ‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationModule.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.javaagent.instrumentation.apachedbcp;
6+
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;
77

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

‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/ApacheDbcpSingletons.java ‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpSingletons.java

+2-2
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.apachedbcp;
6+
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9-
import io.opentelemetry.instrumentation.apachedbcp.ApacheDbcpTelemetry;
9+
import io.opentelemetry.instrumentation.apachedbcp.v2_0.ApacheDbcpTelemetry;
1010

1111
public final class ApacheDbcpSingletons {
1212

‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/BasicDataSourceInstrumentation.java ‎instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/BasicDataSourceInstrumentation.java

+2-2
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.apachedbcp;
6+
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.apachedbcp.ApacheDbcpSingletons.telemetry;
8+
import static io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0.ApacheDbcpSingletons.telemetry;
99
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1010
import static net.bytebuddy.matcher.ElementMatchers.named;
1111
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;

‎instrumentation/apache-dbcp-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/ApacheDbcpInstrumentationTest.java ‎instrumentation/apache-dbcp-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationTest.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.javaagent.instrumentation.apachedbcp;
6+
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;
77

88
import io.opentelemetry.instrumentation.apachedbcp.AbstractApacheDbcpInstrumentationTest;
99
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;

‎instrumentation/apache-dbcp-2.0/library/src/main/java/io/opentelemetry/instrumentation/apachedbcp/ApacheDbcpTelemetry.java ‎instrumentation/apache-dbcp-2.0/library/src/main/java/io/opentelemetry/instrumentation/apachedbcp/v2_0/ApacheDbcpTelemetry.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.apachedbcp;
6+
package io.opentelemetry.instrumentation.apachedbcp.v2_0;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import org.apache.commons.dbcp2.BasicDataSourceMXBean;

‎instrumentation/apache-dbcp-2.0/library/src/main/java/io/opentelemetry/instrumentation/apachedbcp/DataSourceMetrics.java ‎instrumentation/apache-dbcp-2.0/library/src/main/java/io/opentelemetry/instrumentation/apachedbcp/v2_0/DataSourceMetrics.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.apachedbcp;
6+
package io.opentelemetry.instrumentation.apachedbcp.v2_0;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.api.common.Attributes;

‎instrumentation/apache-dbcp-2.0/library/src/test/java/io/opentelemetry/instrumentation/apachedbcp/ApacheDbcpInstrumentationTest.java ‎instrumentation/apache-dbcp-2.0/library/src/test/java/io/opentelemetry/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationTest.java

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

6-
package io.opentelemetry.instrumentation.apachedbcp;
6+
package io.opentelemetry.instrumentation.apachedbcp.v2_0;
77

8+
import io.opentelemetry.instrumentation.apachedbcp.AbstractApacheDbcpInstrumentationTest;
89
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
910
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
1011
import org.apache.commons.dbcp2.BasicDataSource;

‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/AbstractPoolBackedDataSourceInstrumentation.java ‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/AbstractPoolBackedDataSourceInstrumentation.java

+2-2
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.c3p0;
6+
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;
77

8-
import static io.opentelemetry.javaagent.instrumentation.c3p0.C3p0Singletons.telemetry;
8+
import static io.opentelemetry.javaagent.instrumentation.c3p0.v0_9.C3p0Singletons.telemetry;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010

1111
import com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource;

‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/C3p0InstrumentationModule.java ‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationModule.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.javaagent.instrumentation.c3p0;
6+
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;
77

88
import com.google.auto.service.AutoService;
99
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;

‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/C3p0Singletons.java ‎instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0Singletons.java

+2-2
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.c3p0;
6+
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9-
import io.opentelemetry.instrumentation.c3p0.C3p0Telemetry;
9+
import io.opentelemetry.instrumentation.c3p0.v0_9.C3p0Telemetry;
1010

1111
public final class C3p0Singletons {
1212

‎instrumentation/c3p0-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/c3p0/C3p0InstrumentationTest.java ‎instrumentation/c3p0-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationTest.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.javaagent.instrumentation.c3p0;
6+
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;
77

88
import com.mchange.v2.c3p0.PooledDataSource;
99
import io.opentelemetry.instrumentation.c3p0.AbstractC3p0InstrumentationTest;

‎instrumentation/c3p0-0.9/library/src/main/java/io/opentelemetry/instrumentation/c3p0/C3p0Telemetry.java ‎instrumentation/c3p0-0.9/library/src/main/java/io/opentelemetry/instrumentation/c3p0/v0_9/C3p0Telemetry.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.c3p0;
6+
package io.opentelemetry.instrumentation.c3p0.v0_9;
77

88
import com.mchange.v2.c3p0.PooledDataSource;
99
import io.opentelemetry.api.OpenTelemetry;

‎instrumentation/c3p0-0.9/library/src/main/java/io/opentelemetry/instrumentation/c3p0/ConnectionPoolMetrics.java ‎instrumentation/c3p0-0.9/library/src/main/java/io/opentelemetry/instrumentation/c3p0/v0_9/ConnectionPoolMetrics.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.c3p0;
6+
package io.opentelemetry.instrumentation.c3p0.v0_9;
77

88
import com.mchange.v2.c3p0.PooledDataSource;
99
import io.opentelemetry.api.OpenTelemetry;

‎instrumentation/c3p0-0.9/library/src/test/java/io/opentelemetry/instrumentation/c3p0/C3p0InstrumentationTest.java ‎instrumentation/c3p0-0.9/library/src/test/java/io/opentelemetry/instrumentation/c3p0/v0_9/C3p0InstrumentationTest.java

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

6-
package io.opentelemetry.instrumentation.c3p0;
6+
package io.opentelemetry.instrumentation.c3p0.v0_9;
77

88
import com.mchange.v2.c3p0.PooledDataSource;
9+
import io.opentelemetry.instrumentation.c3p0.AbstractC3p0InstrumentationTest;
910
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1011
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
1112
import org.junit.jupiter.api.BeforeAll;

‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/GraphqlInstrumentation.java ‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java

+2-2
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.graphql;
6+
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.graphql.GraphqlSingletons.addInstrumentation;
8+
import static io.opentelemetry.javaagent.instrumentation.graphql.v12_0.GraphqlSingletons.addInstrumentation;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
1111
import static net.bytebuddy.matcher.ElementMatchers.returns;

‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/GraphqlInstrumentationModule.java ‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.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.javaagent.instrumentation.graphql;
6+
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;
77

88
import com.google.auto.service.AutoService;
99
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;

‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/GraphqlSingletons.java ‎instrumentation/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlSingletons.java

+2-2
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.graphql;
6+
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;
77

88
import graphql.execution.instrumentation.ChainedInstrumentation;
99
import graphql.execution.instrumentation.Instrumentation;
1010
import io.opentelemetry.api.GlobalOpenTelemetry;
11-
import io.opentelemetry.instrumentation.graphql.GraphQLTelemetry;
11+
import io.opentelemetry.instrumentation.graphql.v12_0.GraphQLTelemetry;
1212
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
1313
import java.util.ArrayList;
1414
import java.util.List;

‎instrumentation/graphql-java-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/graphql/GraphqlTest.java ‎instrumentation/graphql-java-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlTest.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.javaagent.instrumentation.graphql;
6+
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;
77

88
import graphql.GraphQL;
99
import io.opentelemetry.instrumentation.graphql.AbstractGraphqlTest;

‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/GraphQLTelemetry.java ‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.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.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import graphql.ExecutionResult;
99
import graphql.execution.instrumentation.Instrumentation;

‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/GraphQLTelemetryBuilder.java ‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetryBuilder.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.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;

‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/GraphqlAttributesExtractor.java ‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphqlAttributesExtractor.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.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import graphql.ExecutionResult;
99
import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;

‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/OpenTelemetryInstrumentation.java ‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/OpenTelemetryInstrumentation.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.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import graphql.ExecutionResult;
99
import graphql.GraphQLError;

‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/OpenTelemetryInstrumentationState.java ‎instrumentation/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/OpenTelemetryInstrumentationState.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.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import graphql.execution.instrumentation.InstrumentationState;
99
import graphql.language.OperationDefinition.Operation;

‎instrumentation/graphql-java-12.0/library/src/test/java/io/opentelemetry/instrumentation/graphql/GraphqlTest.java ‎instrumentation/graphql-java-12.0/library/src/test/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphqlTest.java

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

6-
package io.opentelemetry.instrumentation.graphql;
6+
package io.opentelemetry.instrumentation.graphql.v12_0;
77

88
import graphql.GraphQL;
9+
import io.opentelemetry.instrumentation.graphql.AbstractGraphqlTest;
910
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1011
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
1112
import org.junit.jupiter.api.extension.RegisterExtension;

‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/GuavaInstrumentationModule.java ‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaInstrumentationModule.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

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

‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/GuavaListenableFutureInstrumentation.java ‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaListenableFutureInstrumentation.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

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

‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationHelper.java ‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/InstrumentationHelper.java

+2-2
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.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

88
import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
9-
import io.opentelemetry.instrumentation.guava.GuavaAsyncOperationEndStrategy;
9+
import io.opentelemetry.instrumentation.guava.v10_0.GuavaAsyncOperationEndStrategy;
1010
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
1111

1212
public final class InstrumentationHelper {

‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/BaseGuavaWithSpanTest.java ‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/BaseGuavaWithSpanTest.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

88
import com.google.common.util.concurrent.Futures;
99
import com.google.common.util.concurrent.ListenableFuture;

‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/ExtensionAnnotationsGuavaWithSpanTest.java ‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/ExtensionAnnotationsGuavaWithSpanTest.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

88
import com.google.common.util.concurrent.Futures;
99
import com.google.common.util.concurrent.ListenableFuture;

‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationAnnotationsGuavaWithSpanTest.java ‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/InstrumentationAnnotationsGuavaWithSpanTest.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

88
import com.google.common.util.concurrent.Futures;
99
import com.google.common.util.concurrent.ListenableFuture;

‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/ListenableFutureTest.java ‎instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/ListenableFutureTest.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.javaagent.instrumentation.guava;
6+
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

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

‎instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategy.java ‎instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/v10_0/GuavaAsyncOperationEndStrategy.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.guava;
6+
package io.opentelemetry.instrumentation.guava.v10_0;
77

88
import static io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport.tryToGetResponse;
99

‎instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategyBuilder.java ‎instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/v10_0/GuavaAsyncOperationEndStrategyBuilder.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.guava;
6+
package io.opentelemetry.instrumentation.guava.v10_0;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99

‎instrumentation/guava-10.0/library/src/test/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategyTest.java ‎instrumentation/guava-10.0/library/src/test/java/io/opentelemetry/instrumentation/guava/v10_0/GuavaAsyncOperationEndStrategyTest.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.guava;
6+
package io.opentelemetry.instrumentation.guava.v10_0;
77

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

‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/HikariCpInstrumentationModule.java ‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.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.javaagent.instrumentation.hikaricp;
6+
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;
77

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

‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/HikariPoolInstrumentation.java ‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariPoolInstrumentation.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.javaagent.instrumentation.hikaricp;
6+
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;
77

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

‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/HikariSingletons.java ‎instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariSingletons.java

+2-2
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.hikaricp;
6+
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;
77

88
import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
99
import io.opentelemetry.api.GlobalOpenTelemetry;
10-
import io.opentelemetry.instrumentation.hikaricp.HikariTelemetry;
10+
import io.opentelemetry.instrumentation.hikaricp.v3_0.HikariTelemetry;
1111
import javax.annotation.Nullable;
1212

1313
public final class HikariSingletons {

‎instrumentation/hikaricp-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hikaricp/HikariInstrumentationTest.java ‎instrumentation/hikaricp-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariInstrumentationTest.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.javaagent.instrumentation.hikaricp;
6+
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;
77

88
import com.zaxxer.hikari.HikariConfig;
99
import com.zaxxer.hikari.metrics.MetricsTrackerFactory;

‎instrumentation/hikaricp-3.0/library/src/main/java/io/opentelemetry/instrumentation/hikaricp/HikariTelemetry.java ‎instrumentation/hikaricp-3.0/library/src/main/java/io/opentelemetry/instrumentation/hikaricp/v3_0/HikariTelemetry.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.hikaricp;
6+
package io.opentelemetry.instrumentation.hikaricp.v3_0;
77

88
import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
99
import io.opentelemetry.api.OpenTelemetry;

‎instrumentation/hikaricp-3.0/library/src/main/java/io/opentelemetry/instrumentation/hikaricp/OpenTelemetryMetricsTracker.java ‎instrumentation/hikaricp-3.0/library/src/main/java/io/opentelemetry/instrumentation/hikaricp/v3_0/OpenTelemetryMetricsTracker.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.hikaricp;
6+
package io.opentelemetry.instrumentation.hikaricp.v3_0;
77

88
import com.zaxxer.hikari.metrics.IMetricsTracker;
99
import io.opentelemetry.api.common.Attributes;

0 commit comments

Comments
 (0)