Skip to content

Commit

Permalink
Encode version in library instrumentations' package names (#7764)
Browse files Browse the repository at this point in the history 
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 <trask.stalnaker@gmail.com>
  • Loading branch information
@trask
Mateusz Rzeszutek and trask committed Feb 14, 2023
1 parent b04bf88 commit 4fd52c5
Show file tree
Hide file tree
Showing 134 changed files with 188 additions and 174 deletions.
2 changes: 1 addition & 1 deletion ...dbcp/ApacheDbcpInstrumentationModule.java → ...v2_0/ApacheDbcpInstrumentationModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.apachedbcp;
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;

import static java.util.Collections.singletonList;

Expand Down
4 changes: 2 additions & 2 deletions ...tion/apachedbcp/ApacheDbcpSingletons.java → ...apachedbcp/v2_0/ApacheDbcpSingletons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.apachedbcp;
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.apachedbcp.ApacheDbcpTelemetry;
import io.opentelemetry.instrumentation.apachedbcp.v2_0.ApacheDbcpTelemetry;

public final class ApacheDbcpSingletons {

Expand Down
4 changes: 2 additions & 2 deletions ...edbcp/BasicDataSourceInstrumentation.java → .../v2_0/BasicDataSourceInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.apachedbcp;
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;

import static io.opentelemetry.javaagent.instrumentation.apachedbcp.ApacheDbcpSingletons.telemetry;
import static io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0.ApacheDbcpSingletons.telemetry;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
Expand Down
2 changes: 1 addition & 1 deletion ...hedbcp/ApacheDbcpInstrumentationTest.java → ...p/v2_0/ApacheDbcpInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.apachedbcp;
package io.opentelemetry.javaagent.instrumentation.apachedbcp.v2_0;

import io.opentelemetry.instrumentation.apachedbcp.AbstractApacheDbcpInstrumentationTest;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
Expand Down
2 changes: 1 addition & 1 deletion ...ation/apachedbcp/ApacheDbcpTelemetry.java → .../apachedbcp/v2_0/ApacheDbcpTelemetry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.apachedbcp;
package io.opentelemetry.instrumentation.apachedbcp.v2_0;

import io.opentelemetry.api.OpenTelemetry;
import org.apache.commons.dbcp2.BasicDataSourceMXBean;
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/apachedbcp/DataSourceMetrics.java → ...on/apachedbcp/v2_0/DataSourceMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.apachedbcp;
package io.opentelemetry.instrumentation.apachedbcp.v2_0;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
Expand Down
3 changes: 2 additions & 1 deletion ...hedbcp/ApacheDbcpInstrumentationTest.java → ...p/v2_0/ApacheDbcpInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.apachedbcp;
package io.opentelemetry.instrumentation.apachedbcp.v2_0;

import io.opentelemetry.instrumentation.apachedbcp.AbstractApacheDbcpInstrumentationTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.apache.commons.dbcp2.BasicDataSource;
Expand Down
4 changes: 2 additions & 2 deletions ...tPoolBackedDataSourceInstrumentation.java → ...tPoolBackedDataSourceInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.c3p0;
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;

import static io.opentelemetry.javaagent.instrumentation.c3p0.C3p0Singletons.telemetry;
import static io.opentelemetry.javaagent.instrumentation.c3p0.v0_9.C3p0Singletons.telemetry;
import static net.bytebuddy.matcher.ElementMatchers.named;

import com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource;
Expand Down
2 changes: 1 addition & 1 deletion ...ation/c3p0/C3p0InstrumentationModule.java → .../c3p0/v0_9/C3p0InstrumentationModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.c3p0;
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
Expand Down
4 changes: 2 additions & 2 deletions .../instrumentation/c3p0/C3p0Singletons.java → ...rumentation/c3p0/v0_9/C3p0Singletons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.c3p0;
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.c3p0.C3p0Telemetry;
import io.opentelemetry.instrumentation.c3p0.v0_9.C3p0Telemetry;

public final class C3p0Singletons {

Expand Down
2 changes: 1 addition & 1 deletion ...ntation/c3p0/C3p0InstrumentationTest.java → ...on/c3p0/v0_9/C3p0InstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.c3p0;
package io.opentelemetry.javaagent.instrumentation.c3p0.v0_9;

import com.mchange.v2.c3p0.PooledDataSource;
import io.opentelemetry.instrumentation.c3p0.AbstractC3p0InstrumentationTest;
Expand Down
2 changes: 1 addition & 1 deletion ...y/instrumentation/c3p0/C3p0Telemetry.java → ...trumentation/c3p0/v0_9/C3p0Telemetry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.c3p0;
package io.opentelemetry.instrumentation.c3p0.v0_9;

import com.mchange.v2.c3p0.PooledDataSource;
import io.opentelemetry.api.OpenTelemetry;
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/c3p0/ConnectionPoolMetrics.java → ...tion/c3p0/v0_9/ConnectionPoolMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.c3p0;
package io.opentelemetry.instrumentation.c3p0.v0_9;

import com.mchange.v2.c3p0.PooledDataSource;
import io.opentelemetry.api.OpenTelemetry;
Expand Down
3 changes: 2 additions & 1 deletion ...ntation/c3p0/C3p0InstrumentationTest.java → ...on/c3p0/v0_9/C3p0InstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.c3p0;
package io.opentelemetry.instrumentation.c3p0.v0_9;

import com.mchange.v2.c3p0.PooledDataSource;
import io.opentelemetry.instrumentation.c3p0.AbstractC3p0InstrumentationTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.BeforeAll;
Expand Down
4 changes: 2 additions & 2 deletions ...ation/graphql/GraphqlInstrumentation.java → ...graphql/v12_0/GraphqlInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.graphql;
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;

import static io.opentelemetry.javaagent.instrumentation.graphql.GraphqlSingletons.addInstrumentation;
import static io.opentelemetry.javaagent.instrumentation.graphql.v12_0.GraphqlSingletons.addInstrumentation;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.returns;
Expand Down
2 changes: 1 addition & 1 deletion ...graphql/GraphqlInstrumentationModule.java → ...l/v12_0/GraphqlInstrumentationModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.graphql;
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
Expand Down
4 changes: 2 additions & 2 deletions ...umentation/graphql/GraphqlSingletons.java → ...tion/graphql/v12_0/GraphqlSingletons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.graphql;
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;

import graphql.execution.instrumentation.ChainedInstrumentation;
import graphql.execution.instrumentation.Instrumentation;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.graphql.GraphQLTelemetry;
import io.opentelemetry.instrumentation.graphql.v12_0.GraphQLTelemetry;
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion .../instrumentation/graphql/GraphqlTest.java → ...umentation/graphql/v12_0/GraphqlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.graphql;
package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;

import graphql.GraphQL;
import io.opentelemetry.instrumentation.graphql.AbstractGraphqlTest;
Expand Down
2 changes: 1 addition & 1 deletion ...rumentation/graphql/GraphQLTelemetry.java → ...ation/graphql/v12_0/GraphQLTelemetry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import graphql.ExecutionResult;
import graphql.execution.instrumentation.Instrumentation;
Expand Down
2 changes: 1 addition & 1 deletion ...tion/graphql/GraphQLTelemetryBuilder.java → ...raphql/v12_0/GraphQLTelemetryBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
Expand Down
2 changes: 1 addition & 1 deletion ...n/graphql/GraphqlAttributesExtractor.java → ...hql/v12_0/GraphqlAttributesExtractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import graphql.ExecutionResult;
import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
Expand Down
2 changes: 1 addition & 1 deletion ...graphql/OpenTelemetryInstrumentation.java → ...l/v12_0/OpenTelemetryInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import graphql.ExecutionResult;
import graphql.GraphQLError;
Expand Down
2 changes: 1 addition & 1 deletion ...ql/OpenTelemetryInstrumentationState.java → ..._0/OpenTelemetryInstrumentationState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import graphql.execution.instrumentation.InstrumentationState;
import graphql.language.OperationDefinition.Operation;
Expand Down
3 changes: 2 additions & 1 deletion .../instrumentation/graphql/GraphqlTest.java → ...umentation/graphql/v12_0/GraphqlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.graphql;
package io.opentelemetry.instrumentation.graphql.v12_0;

import graphql.GraphQL;
import io.opentelemetry.instrumentation.graphql.AbstractGraphqlTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/guava/GuavaInstrumentationModule.java → ...ava/v10_0/GuavaInstrumentationModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import static java.util.Collections.singletonList;

Expand Down
2 changes: 1 addition & 1 deletion ...GuavaListenableFutureInstrumentation.java → ...GuavaListenableFutureInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.named;
Expand Down
4 changes: 2 additions & 2 deletions ...entation/guava/InstrumentationHelper.java → ...on/guava/v10_0/InstrumentationHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
import io.opentelemetry.instrumentation.guava.GuavaAsyncOperationEndStrategy;
import io.opentelemetry.instrumentation.guava.v10_0.GuavaAsyncOperationEndStrategy;
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;

public final class InstrumentationHelper {
Expand Down
2 changes: 1 addition & 1 deletion ...entation/guava/BaseGuavaWithSpanTest.java → ...on/guava/v10_0/BaseGuavaWithSpanTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
Expand Down
2 changes: 1 addition & 1 deletion ...xtensionAnnotationsGuavaWithSpanTest.java → ...xtensionAnnotationsGuavaWithSpanTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
Expand Down
2 changes: 1 addition & 1 deletion ...entationAnnotationsGuavaWithSpanTest.java → ...entationAnnotationsGuavaWithSpanTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/guava/ListenableFutureTest.java → ...ion/guava/v10_0/ListenableFutureTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.guava;
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;

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

Expand Down
2 changes: 1 addition & 1 deletion ...guava/GuavaAsyncOperationEndStrategy.java → ...v10_0/GuavaAsyncOperationEndStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.guava;
package io.opentelemetry.instrumentation.guava.v10_0;

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

Expand Down
2 changes: 1 addition & 1 deletion ...uavaAsyncOperationEndStrategyBuilder.java → ...uavaAsyncOperationEndStrategyBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.guava;
package io.opentelemetry.instrumentation.guava.v10_0;

import com.google.errorprone.annotations.CanIgnoreReturnValue;

Expand Down
2 changes: 1 addition & 1 deletion ...a/GuavaAsyncOperationEndStrategyTest.java → ...0/GuavaAsyncOperationEndStrategyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.guava;
package io.opentelemetry.instrumentation.guava.v10_0;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
Expand Down
2 changes: 1 addition & 1 deletion ...karicp/HikariCpInstrumentationModule.java → ...p/v3_0/HikariCpInstrumentationModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.hikaricp;
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;

import static java.util.Collections.singletonList;

Expand Down
2 changes: 1 addition & 1 deletion ...n/hikaricp/HikariPoolInstrumentation.java → ...aricp/v3_0/HikariPoolInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.hikaricp;
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
Expand Down
4 changes: 2 additions & 2 deletions ...umentation/hikaricp/HikariSingletons.java → ...ation/hikaricp/v3_0/HikariSingletons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.hikaricp;
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;

import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.hikaricp.HikariTelemetry;
import io.opentelemetry.instrumentation.hikaricp.v3_0.HikariTelemetry;
import javax.annotation.Nullable;

public final class HikariSingletons {
Expand Down
2 changes: 1 addition & 1 deletion ...n/hikaricp/HikariInstrumentationTest.java → ...aricp/v3_0/HikariInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.hikaricp;
package io.opentelemetry.javaagent.instrumentation.hikaricp.v3_0;

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...rumentation/hikaricp/HikariTelemetry.java → ...tation/hikaricp/v3_0/HikariTelemetry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.hikaricp;
package io.opentelemetry.instrumentation.hikaricp.v3_0;

import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
import io.opentelemetry.api.OpenTelemetry;
Expand Down
2 changes: 1 addition & 1 deletion ...hikaricp/OpenTelemetryMetricsTracker.java → ...icp/v3_0/OpenTelemetryMetricsTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.hikaricp;
package io.opentelemetry.instrumentation.hikaricp.v3_0;

import com.zaxxer.hikari.metrics.IMetricsTracker;
import io.opentelemetry.api.common.Attributes;
Expand Down
Loading

0 comments on commit 4fd52c5

Please sign in to comment.