From 33c54f86366aea9758bc672f72101d7eb8f7cf64 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 30 Apr 2026 17:43:16 -0700 Subject: [PATCH] Add base version to clickhouse-client-common javaagent module - instrumentation/clickhouse/clickhouse-client-common -> clickhouse-client-common-0.5 (package io.opentelemetry.javaagent.instrumentation.clickhouse.common -> io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5) Follows the pattern established in #18423. --- .fossa.yml | 2 +- .../javaagent/build.gradle.kts | 0 .../client/common/v0_5}/ClickHouseAttributesGetter.java | 2 +- .../clickhouse/client/common/v0_5}/ClickHouseDbRequest.java | 2 +- .../client/common/v0_5}/ClickHouseInstrumenterFactory.java | 2 +- .../clickhouse/client/common/v0_5}/ClickHouseScope.java | 2 +- .../clickhouse-client-v1-0.5/javaagent/build.gradle.kts | 2 +- .../clientv1/v0_5/ClickHouseClientV1Instrumentation.java | 4 ++-- .../clientv1/v0_5/ClickHouseClientV1Singletons.java | 4 ++-- .../clickhouse-client-v2-0.8/javaagent/build.gradle.kts | 2 +- .../clientv2/v0_8/ClickHouseClientV2Instrumentation.java | 4 ++-- .../clientv2/v0_8/ClickHouseClientV2Singletons.java | 4 ++-- settings.gradle.kts | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename instrumentation/clickhouse/{clickhouse-client-common => clickhouse-client-common-0.5}/javaagent/build.gradle.kts (100%) rename instrumentation/clickhouse/{clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common => clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5}/ClickHouseAttributesGetter.java (96%) rename instrumentation/clickhouse/{clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common => clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5}/ClickHouseDbRequest.java (88%) rename instrumentation/clickhouse/{clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common => clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5}/ClickHouseInstrumenterFactory.java (94%) rename instrumentation/clickhouse/{clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common => clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5}/ClickHouseScope.java (94%) diff --git a/.fossa.yml b/.fossa.yml index 1e447d6a7a7f..b5480672e369 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -420,7 +420,7 @@ targets: target: ':instrumentation:cassandra:cassandra-4.4:library' - type: gradle path: ./ - target: ':instrumentation:clickhouse:clickhouse-client-common:javaagent' + target: ':instrumentation:clickhouse:clickhouse-client-common-0.5:javaagent' - type: gradle path: ./ target: ':instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent' diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/build.gradle.kts b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/clickhouse/clickhouse-client-common/javaagent/build.gradle.kts rename to instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/build.gradle.kts diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseAttributesGetter.java b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseAttributesGetter.java similarity index 96% rename from instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseAttributesGetter.java rename to instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseAttributesGetter.java index 63a149c35ef9..2c56a077fdcc 100644 --- a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseAttributesGetter.java +++ b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.clickhouse.common; +package io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5; import static io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlDialect.DOUBLE_QUOTES_ARE_IDENTIFIERS; import static java.util.Collections.singletonList; diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseDbRequest.java b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseDbRequest.java similarity index 88% rename from instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseDbRequest.java rename to instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseDbRequest.java index 8eb58046a887..869464e8a436 100644 --- a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseDbRequest.java +++ b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseDbRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.clickhouse.common; +package io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5; import com.google.auto.value.AutoValue; import javax.annotation.Nullable; diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseInstrumenterFactory.java b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseInstrumenterFactory.java similarity index 94% rename from instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseInstrumenterFactory.java rename to instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseInstrumenterFactory.java index 1d094a069974..44a4f2a346b1 100644 --- a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseInstrumenterFactory.java +++ b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.clickhouse.common; +package io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientMetrics; diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseScope.java b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseScope.java similarity index 94% rename from instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseScope.java rename to instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseScope.java index b0f5746634e6..962c2e6cf09a 100644 --- a/instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseScope.java +++ b/instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/common/v0_5/ClickHouseScope.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.clickhouse.common; +package io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/build.gradle.kts b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/build.gradle.kts index 9ea3a433b03d..3a4e899882cd 100644 --- a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/build.gradle.kts +++ b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/build.gradle.kts @@ -12,7 +12,7 @@ muzzle { } dependencies { - implementation(project(":instrumentation:clickhouse:clickhouse-client-common:javaagent")) + implementation(project(":instrumentation:clickhouse:clickhouse-client-common-0.5:javaagent")) compileOnly("com.clickhouse:clickhouse-client:0.5.0") testImplementation("com.google.guava:guava") diff --git a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Instrumentation.java b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Instrumentation.java index 1993f68ccc06..ccd5497ffe05 100644 --- a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Instrumentation.java +++ b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Instrumentation.java @@ -20,8 +20,8 @@ import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseDbRequest; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseScope; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Singletons.java b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Singletons.java index fcf058d8716e..adca7698abbf 100644 --- a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Singletons.java +++ b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Singletons.java @@ -7,8 +7,8 @@ import com.clickhouse.client.ClickHouseException; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseDbRequest; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseInstrumenterFactory; public class ClickHouseClientV1Singletons { diff --git a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/build.gradle.kts b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/build.gradle.kts index e85c2fcef072..1e0c6c8c5eac 100644 --- a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/build.gradle.kts +++ b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/build.gradle.kts @@ -12,7 +12,7 @@ muzzle { } dependencies { - implementation(project(":instrumentation:clickhouse:clickhouse-client-common:javaagent")) + implementation(project(":instrumentation:clickhouse:clickhouse-client-common-0.5:javaagent")) library("com.clickhouse:client-v2:0.8.0") testInstrumentation(project(":instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent")) } diff --git a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java index 75f08cbd2df2..8093de77f504 100644 --- a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java +++ b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java @@ -18,8 +18,8 @@ import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseDbRequest; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseScope; import java.util.Map; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java index 25d549cfdd8e..14a3d655c004 100644 --- a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java +++ b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java @@ -11,8 +11,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.semconv.network.internal.AddressAndPort; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest; -import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseDbRequest; +import io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5.ClickHouseInstrumenterFactory; import javax.annotation.Nullable; public class ClickHouseClientV2Singletons { diff --git a/settings.gradle.kts b/settings.gradle.kts index b4a3af5de8d1..b0eca0014848 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -248,7 +248,7 @@ include(":instrumentation:cassandra:cassandra-4.4:library") include(":instrumentation:cassandra:cassandra-4.4:testing") include(":instrumentation:cassandra:cassandra-common-4.0:testing") include(":instrumentation:cdi-testing") -include(":instrumentation:clickhouse:clickhouse-client-common:javaagent") +include(":instrumentation:clickhouse:clickhouse-client-common-0.5:javaagent") include(":instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent") include(":instrumentation:clickhouse:clickhouse-client-v2-0.8:javaagent") include(":instrumentation:couchbase:couchbase-2.0:javaagent")