From 1fb6c26f4f2178381a32cdd60d99af212a5a7c67 Mon Sep 17 00:00:00 2001 From: Aaron Ai Date: Tue, 27 Sep 2022 14:39:20 +0800 Subject: [PATCH] Move rocketmq-client-4.8 to 'rocketmq-clients' --- docs/standalone-library-instrumentation.md | 2 +- .../rocketmq-clients}/rocketmq-client-4.8/README.md | 0 .../rocketmq-client-4.8/javaagent/build.gradle.kts | 4 ++-- .../rocketmqclient}/RocketMqClientHooks.java | 4 ++-- .../rocketmqclient}/RocketMqConsumerInstrumentation.java | 2 +- .../rocketmqclient}/RocketMqInstrumentationModule.java | 2 +- .../rocketmqclient}/RocketMqProducerInstrumentation.java | 2 +- .../rocketmqclient}/RocketMqClientTest.groovy | 2 +- .../rocketmq-client-4.8/library/build.gradle.kts | 2 +- .../instrumentation/rocketmqclient}/ContextAndScope.java | 2 +- .../instrumentation/rocketmqclient}/MapSetter.java | 2 +- .../rocketmqclient}/RocketMqConsumerAttributeGetter.java | 2 +- .../RocketMqConsumerExperimentalAttributeExtractor.java | 2 +- .../rocketmqclient}/RocketMqConsumerInstrumenter.java | 2 +- .../rocketmqclient}/RocketMqInstrumenterFactory.java | 2 +- .../rocketmqclient}/RocketMqProducerAttributeGetter.java | 2 +- .../RocketMqProducerExperimentalAttributeExtractor.java | 2 +- .../rocketmqclient}/RocketMqTelemetry.java | 2 +- .../rocketmqclient}/RocketMqTelemetryBuilder.java | 2 +- .../rocketmqclient}/TextMapExtractAdapter.java | 2 +- .../rocketmqclient}/TracingConsumeMessageHookImpl.java | 2 +- .../rocketmqclient}/TracingSendMessageHookImpl.java | 2 +- .../rocketmqclient}/RocketMqClientTest.groovy | 2 +- .../rocketmq-client-4.8/testing/build.gradle.kts | 0 .../rocketmqclient}/AbstractRocketMqClientTest.groovy | 2 +- .../rocketmqclient}/TracingMessageListener.groovy | 2 +- .../testing/src/main/java/base/BaseConf.java | 0 .../testing/src/main/java/base/IntegrationTestBase.java | 0 settings.gradle.kts | 8 +++++--- 29 files changed, 31 insertions(+), 29 deletions(-) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/README.md (100%) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/javaagent/build.gradle.kts (72%) rename instrumentation/{rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient}/RocketMqClientHooks.java (90%) rename instrumentation/{rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient}/RocketMqConsumerInstrumentation.java (96%) rename instrumentation/{rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient}/RocketMqInstrumentationModule.java (91%) rename instrumentation/{rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient}/RocketMqProducerInstrumentation.java (95%) rename instrumentation/{rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqClientTest.groovy (90%) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/library/build.gradle.kts (80%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/ContextAndScope.java (89%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/MapSetter.java (89%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqConsumerAttributeGetter.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqConsumerExperimentalAttributeExtractor.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqConsumerInstrumenter.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqInstrumenterFactory.java (99%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqProducerAttributeGetter.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqProducerExperimentalAttributeExtractor.java (96%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqTelemetry.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqTelemetryBuilder.java (97%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/TextMapExtractAdapter.java (91%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/TracingConsumeMessageHookImpl.java (96%) rename instrumentation/{rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient}/TracingSendMessageHookImpl.java (96%) rename instrumentation/{rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient}/RocketMqClientTest.groovy (95%) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/testing/build.gradle.kts (100%) rename instrumentation/{rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient}/AbstractRocketMqClientTest.groovy (99%) rename instrumentation/{rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq => rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient}/TracingMessageListener.groovy (95%) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java (100%) rename instrumentation/{ => rocketmq/rocketmq-clients}/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java (100%) diff --git a/docs/standalone-library-instrumentation.md b/docs/standalone-library-instrumentation.md index 0db1709f9395..a2ed37604c31 100644 --- a/docs/standalone-library-instrumentation.md +++ b/docs/standalone-library-instrumentation.md @@ -24,7 +24,7 @@ that can be used if you prefer that over using the Java agent: * [Oracle UCP](../instrumentation/oracle-ucp-11.2/library) * [OSHI](../instrumentation/oshi/library) * [Reactor](../instrumentation/reactor/reactor-3.1/library) -* [RocketMQ](../instrumentation/rocketmq-client-4.8/library) +* [RocketMQ](../instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library) * [Runtime metrics](../instrumentation/runtime-metrics/library) * [RxJava 1.0](../instrumentation/rxjava/rxjava-1.0/library) * [RxJava 2.0](../instrumentation/rxjava/rxjava-2.0/library) diff --git a/instrumentation/rocketmq-client-4.8/README.md b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/README.md similarity index 100% rename from instrumentation/rocketmq-client-4.8/README.md rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/README.md diff --git a/instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/build.gradle.kts similarity index 72% rename from instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/build.gradle.kts index b5a7dd46a8f0..33bcd3df526c 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/build.gradle.kts @@ -14,9 +14,9 @@ muzzle { dependencies { library("org.apache.rocketmq:rocketmq-client:4.8.0") - implementation(project(":instrumentation:rocketmq-client-4.8:library")) + implementation(project(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:library")) - testImplementation(project(":instrumentation:rocketmq-client-4.8:testing")) + testImplementation(project(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:testing")) testLibrary("org.apache.rocketmq:rocketmq-test:4.8.0") } diff --git a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqClientHooks.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqClientHooks.java similarity index 90% rename from instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqClientHooks.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqClientHooks.java index 6c7b9a00672a..e63daa80952d 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqClientHooks.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqClientHooks.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.rocketmq; +package io.opentelemetry.javaagent.instrumentation.rocketmqclient; import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.rocketmq.RocketMqTelemetry; +import io.opentelemetry.instrumentation.rocketmqclient.RocketMqTelemetry; import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import org.apache.rocketmq.client.hook.ConsumeMessageHook; diff --git a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqConsumerInstrumentation.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqConsumerInstrumentation.java similarity index 96% rename from instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqConsumerInstrumentation.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqConsumerInstrumentation.java index c9fab486c157..1be2dfb122d8 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqConsumerInstrumentation.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqConsumerInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.rocketmq; +package io.opentelemetry.javaagent.instrumentation.rocketmqclient; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqInstrumentationModule.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqInstrumentationModule.java similarity index 91% rename from instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqInstrumentationModule.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqInstrumentationModule.java index 40ba9a0c3311..dddf8b7e4ac4 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqInstrumentationModule.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.rocketmq; +package io.opentelemetry.javaagent.instrumentation.rocketmqclient; import static java.util.Arrays.asList; diff --git a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqProducerInstrumentation.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqProducerInstrumentation.java similarity index 95% rename from instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqProducerInstrumentation.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqProducerInstrumentation.java index dd49cf44695f..0b1860ee4a75 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmq/RocketMqProducerInstrumentation.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/RocketMqProducerInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.rocketmq; +package io.opentelemetry.javaagent.instrumentation.rocketmqclient; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy similarity index 90% rename from instrumentation/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy index 61167aaf4a3a..d11b5818106b 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq +package io.opentelemetry.instrumentation.rocketmqclient import io.opentelemetry.instrumentation.test.AgentTestTrait import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer diff --git a/instrumentation/rocketmq-client-4.8/library/build.gradle.kts b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/build.gradle.kts similarity index 80% rename from instrumentation/rocketmq-client-4.8/library/build.gradle.kts rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/build.gradle.kts index b0a60b388cd9..13fb911c871c 100644 --- a/instrumentation/rocketmq-client-4.8/library/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testLibrary("org.apache.rocketmq:rocketmq-test:4.8.0") - testImplementation(project(":instrumentation:rocketmq-client-4.8:testing")) + testImplementation(project(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:testing")) } tasks.withType().configureEach { diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/ContextAndScope.java similarity index 89% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/ContextAndScope.java index 1acebf32f2e1..a33e7f07417c 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/ContextAndScope.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import com.google.auto.value.AutoValue; import io.opentelemetry.context.Context; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/MapSetter.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/MapSetter.java similarity index 89% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/MapSetter.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/MapSetter.java index 5b481d4591ec..805005615bc4 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/MapSetter.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/MapSetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.context.propagation.TextMapSetter; import org.apache.rocketmq.client.hook.SendMessageContext; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerAttributeGetter.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerAttributeGetter.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerAttributeGetter.java index 6d3f12c38d36..dc4b4de0499e 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerAttributeGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerExperimentalAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerExperimentalAttributeExtractor.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerExperimentalAttributeExtractor.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerExperimentalAttributeExtractor.java index 5b4f5b5b86ff..f918342df43d 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerExperimentalAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerExperimentalAttributeExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerInstrumenter.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerInstrumenter.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerInstrumenter.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerInstrumenter.java index 6d5bb13d1f2b..4863f91ce9f7 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerInstrumenter.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqConsumerInstrumenter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqInstrumenterFactory.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqInstrumenterFactory.java similarity index 99% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqInstrumenterFactory.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqInstrumenterFactory.java index 84a43684b7fb..432cb747a6db 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqInstrumenterFactory.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import static io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor.constant; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerAttributeGetter.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerAttributeGetter.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerAttributeGetter.java index 6d76bb249a01..180e6461aeb4 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerAttributeGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerExperimentalAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerExperimentalAttributeExtractor.java similarity index 96% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerExperimentalAttributeExtractor.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerExperimentalAttributeExtractor.java index 459a408e06d2..21bfe181184c 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerExperimentalAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqProducerExperimentalAttributeExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetry.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetry.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetry.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetry.java index 2430caae141d..99215d883587 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetry.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetry.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetryBuilder.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetryBuilder.java similarity index 97% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetryBuilder.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetryBuilder.java index 7ee5a7aac589..4b7bd9ab8edc 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqTelemetryBuilder.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/RocketMqTelemetryBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import static java.util.Collections.emptyList; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TextMapExtractAdapter.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TextMapExtractAdapter.java similarity index 91% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TextMapExtractAdapter.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TextMapExtractAdapter.java index 3c9ce2d856b2..e4ecb8a4b9ae 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TextMapExtractAdapter.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TextMapExtractAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.context.propagation.TextMapGetter; import javax.annotation.Nullable; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingConsumeMessageHookImpl.java similarity index 96% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingConsumeMessageHookImpl.java index dc05a22980d5..94146011eb46 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingConsumeMessageHookImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.context.Context; import org.apache.rocketmq.client.hook.ConsumeMessageContext; diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingSendMessageHookImpl.java similarity index 96% rename from instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingSendMessageHookImpl.java index 9d027d7c3dac..eeeaae578274 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/TracingSendMessageHookImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq; +package io.opentelemetry.instrumentation.rocketmqclient; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; diff --git a/instrumentation/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy similarity index 95% rename from instrumentation/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy index 1ef224c2b1a1..1fa3418b7af2 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmqclient/RocketMqClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq +package io.opentelemetry.instrumentation.rocketmqclient import io.opentelemetry.instrumentation.test.LibraryTestTrait diff --git a/instrumentation/rocketmq-client-4.8/testing/build.gradle.kts b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/build.gradle.kts similarity index 100% rename from instrumentation/rocketmq-client-4.8/testing/build.gradle.kts rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/build.gradle.kts diff --git a/instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/AbstractRocketMqClientTest.groovy similarity index 99% rename from instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/AbstractRocketMqClientTest.groovy index 0eda9a5aa0bb..1272b2fcc0bc 100644 --- a/instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/AbstractRocketMqClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq +package io.opentelemetry.instrumentation.rocketmqclient import base.BaseConf import io.opentelemetry.instrumentation.test.InstrumentationSpecification diff --git a/instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/TracingMessageListener.groovy b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/TracingMessageListener.groovy similarity index 95% rename from instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/TracingMessageListener.groovy rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/TracingMessageListener.groovy index 21a67c509cc4..a61d5fac1416 100644 --- a/instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmq/TracingMessageListener.groovy +++ b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/TracingMessageListener.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rocketmq +package io.opentelemetry.instrumentation.rocketmqclient import java.util.concurrent.TimeUnit import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext diff --git a/instrumentation/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java similarity index 100% rename from instrumentation/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java diff --git a/instrumentation/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java b/instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java similarity index 100% rename from instrumentation/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java rename to instrumentation/rocketmq/rocketmq-clients/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java diff --git a/settings.gradle.kts b/settings.gradle.kts index e991b837ca47..c8195a677817 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -404,9 +404,9 @@ include(":instrumentation:restlet:restlet-2.0:library") include(":instrumentation:restlet:restlet-2.0:testing") include(":instrumentation:rmi:bootstrap") include(":instrumentation:rmi:javaagent") -include(":instrumentation:rocketmq-client-4.8:javaagent") -include(":instrumentation:rocketmq-client-4.8:library") -include(":instrumentation:rocketmq-client-4.8:testing") +include(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:javaagent") +include(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:library") +include(":instrumentation:rocketmq:rocketmq-clients:rocketmq-client-4.8:testing") include(":instrumentation:runtime-metrics:javaagent") include(":instrumentation:runtime-metrics:library") include(":instrumentation:rxjava:rxjava-1.0:library") @@ -483,3 +483,5 @@ include(":instrumentation:wicket-8.0:javaagent") // benchmark include(":benchmark-overhead-jmh") include(":benchmark-jfr-analyzer") +include("instrumentation:rocketmq") +findProject(":instrumentation:rocketmq")?.name = "rocketmq"