Rename 'rocketmq-client-java' to 'rocketmq-client'

open-telemetry · Oct 26, 2022 · cf3d2dc · cf3d2dc
1 parent ac018ad
commit cf3d2dc
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/...lient-java-5.0/javaagent/build.gradle.kts → ...tmq-client-5.0/javaagent/build.gradle.kts b/...lient-java-5.0/javaagent/build.gradle.kts → ...tmq-client-5.0/javaagent/build.gradle.kts
@@ -14,5 +14,5 @@ muzzle {
 dependencies {
   library("org.apache.rocketmq:rocketmq-client-java:5.0.0")
 
-  testImplementation(project(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-java-5.0:testing"))
+  testImplementation(project(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-5.0:testing"))
 }
diff --git a/...on/rocketmqclientjava/v5_0/MapSetter.java → ...tation/rocketmqclient/v5_0/MapSetter.java b/...on/rocketmqclientjava/v5_0/MapSetter.java → ...tation/rocketmqclient/v5_0/MapSetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.util.VirtualField;

diff --git a/...a/v5_0/RocketMqInstrumentationModule.java → ...t/v5_0/RocketMqInstrumentationModule.java b/...a/v5_0/RocketMqInstrumentationModule.java → ...t/v5_0/RocketMqInstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import static java.util.Arrays.asList;
 
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public final class RocketMqInstrumentationModule extends InstrumentationModule {
   public RocketMqInstrumentationModule() {
-    super("rocketmq-client-java", "rocketmq-client-java-5.0");
+    super("rocketmq-client", "rocketmq-client-5.0");
   }
 
   @Override

diff --git a/...ava/v5_0/RocketMqInstrumenterFactory.java → ...ent/v5_0/RocketMqInstrumenterFactory.java b/...ava/v5_0/RocketMqInstrumenterFactory.java → ...ent/v5_0/RocketMqInstrumenterFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.StatusCode;
@@ -19,7 +19,7 @@
 import org.apache.rocketmq.client.java.message.PublishingMessageImpl;
 
 final class RocketMqInstrumenterFactory {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.rocketmq-client-java-5.0";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.rocketmq-client-5.0";
 
   private RocketMqInstrumenterFactory() {}
 

diff --git a/...0/RocketMqProducerAttributeExtractor.java → ...0/RocketMqProducerAttributeExtractor.java b/...0/RocketMqProducerAttributeExtractor.java → ...0/RocketMqProducerAttributeExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG;

diff --git a/...v5_0/RocketMqProducerAttributeGetter.java → ...v5_0/RocketMqProducerAttributeGetter.java b/...v5_0/RocketMqProducerAttributeGetter.java → ...v5_0/RocketMqProducerAttributeGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;

diff --git a/...v5_0/RocketMqProducerInstrumentation.java → ...v5_0/RocketMqProducerInstrumentation.java b/...v5_0/RocketMqProducerInstrumentation.java → ...v5_0/RocketMqProducerInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPrivate;

diff --git a/...PublishingMessageImplInstrumentation.java → ...PublishingMessageImplInstrumentation.java b/...PublishingMessageImplInstrumentation.java → ...PublishingMessageImplInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;

diff --git a/...mqclientjava/v5_0/RocketMqSingletons.java → ...cketmqclient/v5_0/RocketMqSingletons.java b/...mqclientjava/v5_0/RocketMqSingletons.java → ...cketmqclient/v5_0/RocketMqSingletons.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;

diff --git a/...mqclientjava/v5_0/RocketMqClientTest.java → ...cketmqclient/v5_0/RocketMqClientTest.java b/...mqclientjava/v5_0/RocketMqClientTest.java → ...cketmqclient/v5_0/RocketMqClientTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.instrumentation.rocketmqclient.v5_0;
 
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

diff --git a/...-client-java-5.0/testing/build.gradle.kts → ...ketmq-client-5.0/testing/build.gradle.kts b/...-client-java-5.0/testing/build.gradle.kts → ...ketmq-client-5.0/testing/build.gradle.kts
diff --git a/...java/v5_0/AbstractRocketMqClientTest.java → ...ient/v5_0/AbstractRocketMqClientTest.java b/...java/v5_0/AbstractRocketMqClientTest.java → ...ient/v5_0/AbstractRocketMqClientTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rocketmqclientjava.v5_0;
+package io.opentelemetry.instrumentation.rocketmqclient.v5_0;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -404,8 +404,8 @@ include(":instrumentation:rmi:javaagent")
 include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-4.8:javaagent")
 include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-4.8:library")
 include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-4.8:testing")
-include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-java-5.0:javaagent")
-include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-java-5.0:testing")
+include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-5.0:javaagent")
+include(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-5.0:testing")
 include(":instrumentation:runtime-metrics:javaagent")
 include(":instrumentation:runtime-metrics:library")
 include(":instrumentation:rxjava:rxjava-1.0:library")