diff --git a/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java b/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java index f03a527b9a..5829464bc8 100644 --- a/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java +++ b/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java @@ -7,8 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.r2dbc.v1_0.R2dbcTelemetry; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.R2dbcNetAttributesGetter; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.R2dbcNetAttributesGetter; public final class R2dbcSingletons { diff --git a/instrumentation/r2dbc-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java b/instrumentation/r2dbc-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java index c0dd528b0d..0c1729adb3 100644 --- a/instrumentation/r2dbc-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +import io.opentelemetry.instrumentation.r2dbc.v1_0.AbstractR2dbcStatementTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java similarity index 84% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java index f0ff389641..bdeecbcf8d 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetry.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +package io.opentelemetry.instrumentation.r2dbc.v1_0; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.DbExecution; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.TraceProxyListener; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.DbExecution; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.TraceProxyListener; import io.r2dbc.proxy.ProxyConnectionFactory; import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java similarity index 86% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java index 72e3e98f56..16627220bb 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +package io.opentelemetry.instrumentation.r2dbc.v1_0; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.DbExecution; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.R2dbcInstrumenterBuilder; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.DbExecution; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.R2dbcInstrumenterBuilder; /** A builder of {@link R2dbcTelemetry}. */ public final class R2dbcTelemetryBuilder { diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/DbExecution.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/DbExecution.java similarity index 98% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/DbExecution.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/DbExecution.java index 8c26aba41c..bf2a11f666 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/DbExecution.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/DbExecution.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal; +package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java similarity index 96% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java index 4d7569b7d3..77de2bca2d 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal; +package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java similarity index 91% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java index 2071d0c7f1..9b8cfe2e6f 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal; +package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import javax.annotation.Nullable; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java similarity index 93% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java index b39d971231..e5b46319ac 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal; +package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesGetter; import javax.annotation.Nullable; diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java similarity index 95% rename from instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java rename to instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java index c222a0108d..2d6f3c59f2 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/TraceProxyListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal; +package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; diff --git a/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/DbExecutionTest.java b/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/DbExecutionTest.java similarity index 85% rename from instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/DbExecutionTest.java rename to instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/DbExecutionTest.java index 1930c91266..b7de3b7c05 100644 --- a/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/DbExecutionTest.java +++ b/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/DbExecutionTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +package io.opentelemetry.instrumentation.r2dbc.v1_0; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; -import io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.DbExecution; +import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.DbExecution; import io.r2dbc.proxy.core.QueryExecutionInfo; import io.r2dbc.proxy.core.QueryInfo; import io.r2dbc.proxy.test.MockConnectionInfo; @@ -38,8 +38,7 @@ class DbExecutionTest { .build(); ConnectionFactoryOptions factoryOptions = ConnectionFactoryOptions.parse("r2dbc:mariadb://root:root@localhost:3306/db"); - io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0.internal.DbExecution dbExecution = - new DbExecution(queryExecutionInfo, factoryOptions); + DbExecution dbExecution = new DbExecution(queryExecutionInfo, factoryOptions); assertEquals("testdb", dbExecution.getSystem()); assertEquals("root", dbExecution.getUser()); assertEquals("db", dbExecution.getName()); diff --git a/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java b/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java similarity index 95% rename from instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java rename to instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java index 93afe451b3..6e57459ee1 100644 --- a/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +package io.opentelemetry.instrumentation.r2dbc.v1_0; import io.opentelemetry.instrumentation.reactor.v3_1.ContextPropagationOperator; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java similarity index 99% rename from instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java rename to instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index c669ae85be..2d289e1371 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.r2dbc.v1_0; +package io.opentelemetry.instrumentation.r2dbc.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DB_CONNECTION_STRING;