Skip to content

Commit

Permalink
Rearrange the file structure of RocketMQ instrumentation (open-teleme…
Browse files Browse the repository at this point in the history 
…try#6762)

Fixes open-telemetry#6761
  • Loading branch information
@aaron-ai
aaron-ai committed Sep 28, 2022
1 parent 73cadd3 commit 4e59f10
Show file tree
Hide file tree
Showing 29 changed files with 33 additions and 32 deletions.
2 changes: 1 addition & 1 deletion docs/standalone-library-instrumentation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-client/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)
Expand Down
0 ...rumentation/rocketmq-client-4.8/README.md → ...etmq-client/rocketmq-client-4.8/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tmq-client-4.8/javaagent/build.gradle.kts → ...tmq-client-4.8/javaagent/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-client:rocketmq-client-4.8:library"))

testImplementation(project(":instrumentation:rocketmq-client-4.8:testing"))
testImplementation(project(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-4.8:testing"))

testLibrary("org.apache.rocketmq:rocketmq-test:4.8.0")
}
Expand Down
4 changes: 2 additions & 2 deletions ...ntation/rocketmq/RocketMqClientHooks.java → ...ketmqclient/v4_8/RocketMqClientHooks.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.rocketmq;
package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.rocketmq.RocketMqTelemetry;
import io.opentelemetry.instrumentation.rocketmqclient.v4_8.RocketMqTelemetry;
import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
import org.apache.rocketmq.client.hook.ConsumeMessageHook;
Expand Down
2 changes: 1 addition & 1 deletion ...etmq/RocketMqConsumerInstrumentation.java → ...v4_8/RocketMqConsumerInstrumentation.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.rocketmq;
package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v4_8;

import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named;
Expand Down
2 changes: 1 addition & 1 deletion ...cketmq/RocketMqInstrumentationModule.java → ...t/v4_8/RocketMqInstrumentationModule.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.rocketmq;
package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v4_8;

import static java.util.Arrays.asList;

Expand Down
2 changes: 1 addition & 1 deletion ...etmq/RocketMqProducerInstrumentation.java → ...v4_8/RocketMqProducerInstrumentation.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.rocketmq;
package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v4_8;

import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named;
Expand Down
3 changes: 2 additions & 1 deletion ...tation/rocketmq/RocketMqClientTest.groovy → ...etmqclient/v4_8/RocketMqClientTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.rocketmq
package io.opentelemetry.instrumentation.rocketmqclient.v4_8


import io.opentelemetry.instrumentation.test.AgentTestTrait
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer
Expand Down
2 changes: 1 addition & 1 deletion ...ketmq-client-4.8/library/build.gradle.kts → ...ketmq-client-4.8/library/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-client:rocketmq-client-4.8:testing"))
}

tasks.withType<Test>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion ...rumentation/rocketmq/ContextAndScope.java → .../rocketmqclient/v4_8/ContextAndScope.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import com.google.auto.value.AutoValue;
import io.opentelemetry.context.Context;
Expand Down
2 changes: 1 addition & 1 deletion ...y/instrumentation/rocketmq/MapSetter.java → ...tation/rocketmqclient/v4_8/MapSetter.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.context.propagation.TextMapSetter;
import org.apache.rocketmq.client.hook.SendMessageContext;
Expand Down
2 changes: 1 addition & 1 deletion ...etmq/RocketMqConsumerAttributeGetter.java → ...v4_8/RocketMqConsumerAttributeGetter.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
Expand Down
2 changes: 1 addition & 1 deletion ...nsumerExperimentalAttributeExtractor.java → ...nsumerExperimentalAttributeExtractor.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ocketmq/RocketMqConsumerInstrumenter.java → ...nt/v4_8/RocketMqConsumerInstrumenter.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
Expand Down
2 changes: 1 addition & 1 deletion ...rocketmq/RocketMqInstrumenterFactory.java → ...ent/v4_8/RocketMqInstrumenterFactory.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import static io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor.constant;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
Expand Down
2 changes: 1 addition & 1 deletion ...etmq/RocketMqProducerAttributeGetter.java → ...v4_8/RocketMqProducerAttributeGetter.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
Expand Down
2 changes: 1 addition & 1 deletion ...oducerExperimentalAttributeExtractor.java → ...oducerExperimentalAttributeExtractor.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/rocketmq/RocketMqTelemetry.java → ...ocketmqclient/v4_8/RocketMqTelemetry.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
Expand Down
2 changes: 1 addition & 1 deletion ...on/rocketmq/RocketMqTelemetryBuilder.java → ...client/v4_8/RocketMqTelemetryBuilder.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import static java.util.Collections.emptyList;

Expand Down
2 changes: 1 addition & 1 deletion ...ation/rocketmq/TextMapExtractAdapter.java → ...tmqclient/v4_8/TextMapExtractAdapter.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.context.propagation.TextMapGetter;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...cketmq/TracingConsumeMessageHookImpl.java → ...t/v4_8/TracingConsumeMessageHookImpl.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.context.Context;
import org.apache.rocketmq.client.hook.ConsumeMessageContext;
Expand Down
2 changes: 1 addition & 1 deletion .../rocketmq/TracingSendMessageHookImpl.java → ...ient/v4_8/TracingSendMessageHookImpl.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.rocketmq;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8;

import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
Expand Down
2 changes: 1 addition & 1 deletion ...tation/rocketmq/RocketMqClientTest.groovy → ...etmqclient/v4_8/RocketMqClientTest.groovy
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.rocketmq
package io.opentelemetry.instrumentation.rocketmqclient.v4_8


import io.opentelemetry.instrumentation.test.LibraryTestTrait
Expand Down
0 ...ketmq-client-4.8/testing/build.gradle.kts → ...ketmq-client-4.8/testing/build.gradle.kts
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ocketmq/AbstractRocketMqClientTest.groovy → ...nt/v4_8/AbstractRocketMqClientTest.groovy
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.instrumentation.rocketmq
package io.opentelemetry.instrumentation.rocketmqclient.v4_8

import base.BaseConf
import io.opentelemetry.instrumentation.rocketmqclient.v4_8.base.BaseConf
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import java.util.concurrent.CompletableFuture
Expand Down
2 changes: 1 addition & 1 deletion ...on/rocketmq/TracingMessageListener.groovy → ...client/v4_8/TracingMessageListener.groovy
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.rocketmq
package io.opentelemetry.instrumentation.rocketmqclient.v4_8

import java.util.concurrent.TimeUnit
import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext
Expand Down
2 changes: 1 addition & 1 deletion .../testing/src/main/java/base/BaseConf.java → ...on/rocketmqclient/v4_8/base/BaseConf.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 base;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8.base;

import java.util.UUID;
import org.apache.rocketmq.broker.BrokerController;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/base/IntegrationTestBase.java → ...client/v4_8/base/IntegrationTestBase.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 base;
package io.opentelemetry.instrumentation.rocketmqclient.v4_8.base;

import static java.util.Collections.emptyMap;

Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-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:runtime-metrics:javaagent")
include(":instrumentation:runtime-metrics:library")
include(":instrumentation:rxjava:rxjava-1.0:library")
Expand Down

0 comments on commit 4e59f10

Please sign in to comment.