-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add instrumentation for rocketmq #2263
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 16 commits
535b95b
0d1fbed
cb059ab
2f2cfcf
d3fd46b
bce0921
924b2e3
fb41154
451d3a5
24d1d4a
fd9f3a4
06ea7bc
f40b086
bad5c16
73bbefb
06175b2
fb3dc3d
a7f764c
66617dc
4094f4a
558acf7
310c268
c98b828
1ea63af
449b8e2
55aa9f2
a92c9b3
b5ba2ca
0887762
48de0f7
ad8cbc7
f28eee6
81c3720
1c2c71f
0ed11a0
c32bc40
460092a
0489ef9
963e012
00aa1fa
5419081
8419db8
aa2c7b5
8c606f6
4a00e83
11aa520
9ffde5d
6ad79eb
24de0ca
3aac1a5
b4eb7c3
58801ed
398246b
5b45a6a
f873db7
c0c4c9d
28f30fc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| apply from: "$rootDir/gradle/instrumentation.gradle" | ||
|
|
||
| muzzle { | ||
| pass { | ||
| group = "org.apache.rocketmq" | ||
| module = 'rocketmq-client' | ||
| versions = "[4.8.0,)" | ||
| } | ||
| } | ||
| dependencies { | ||
| library group: 'org.apache.rocketmq', name: 'rocketmq-client', version: '4.8.0' | ||
| implementation project(':instrumentation:rocketmq-client-4.8:library') | ||
| testImplementation project(':instrumentation:rocketmq-client-4.8:testing') | ||
|
|
||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.rocketmq; | ||
|
|
||
| import static io.opentelemetry.instrumentation.rocketmq.RocketMqProducerTracer.tracer; | ||
| import static io.opentelemetry.instrumentation.rocketmq.TextMapInjectAdapter.SETTER; | ||
| import static java.util.Collections.singletonMap; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isMethod; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
| import static net.bytebuddy.matcher.ElementMatchers.takesArguments; | ||
|
|
||
| import io.opentelemetry.api.trace.Span; | ||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.Scope; | ||
| import io.opentelemetry.instrumentation.rocketmq.SendCallbackWrapper; | ||
| import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge; | ||
| import io.opentelemetry.javaagent.tooling.TypeInstrumentation; | ||
| import java.util.Map; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.method.MethodDescription; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
| import org.apache.rocketmq.client.producer.SendCallback; | ||
| import org.apache.rocketmq.common.message.Message; | ||
| import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; | ||
|
|
||
| public class RocketMqClientApiImplInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| return named("org.apache.rocketmq.client.impl.MQClientAPIImpl"); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() { | ||
| return singletonMap( | ||
| isMethod().and(named("sendMessage")).and(takesArguments(12)), | ||
| RocketMqClientApiImplInstrumentation.class.getName() + "$SendMessageAdvice"); | ||
| } | ||
|
|
||
| public static class SendMessageAdvice { | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void onEnter( | ||
| @Advice.Argument(value = 0, readOnly = false) String addr, | ||
| @Advice.Argument(value = 2, readOnly = false) Message msg, | ||
| @Advice.Argument(value = 3, readOnly = false) SendMessageRequestHeader requestHeader, | ||
| @Advice.Argument(value = 6, readOnly = false) SendCallback sendCallback, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
|
|
||
| Context parent = Java8BytecodeBridge.currentContext(); | ||
| span = tracer().startProducerSpan(addr, msg); | ||
| Context newContext = parent.with(span); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's a lot of examples in this repo that still return |
||
| try { | ||
| Java8BytecodeBridge.getGlobalPropagators() | ||
| .getTextMapPropagator() | ||
| .inject(newContext, requestHeader, SETTER); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, wouldn't it be worth it to check |
||
| } catch (IllegalStateException e) { | ||
| requestHeader = new SendMessageRequestHeader(); | ||
| requestHeader.getBornTimestamp(); | ||
| requestHeader.getDefaultTopic(); | ||
| requestHeader.getDefaultTopicQueueNums(); | ||
| requestHeader.getFlag(); | ||
| requestHeader.getProducerGroup(); | ||
| requestHeader.getMaxReconsumeTimes(); | ||
| requestHeader.getProperties(); | ||
| requestHeader.getSysFlag(); | ||
| requestHeader.getTopic(); | ||
| requestHeader.getQueueId(); | ||
| requestHeader.getReconsumeTimes(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it safe to override the header this way? Won't the users lose some information? |
||
| Java8BytecodeBridge.getGlobalPropagators() | ||
| .getTextMapPropagator() | ||
| .inject(newContext, requestHeader, SETTER); | ||
| } | ||
|
|
||
| scope = newContext.makeCurrent(); | ||
| if (sendCallback != null) { | ||
| sendCallback = new SendCallbackWrapper(sendCallback, span); | ||
| } | ||
| } | ||
|
|
||
| @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) | ||
| public static void stopSpan( | ||
| @Advice.Thrown Throwable throwable, | ||
| @Advice.Argument(value = 6, readOnly = false) SendCallback sendCallback, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
| if (scope == null) { | ||
| return; | ||
| } | ||
| scope.close(); | ||
| if (sendCallback == null) { | ||
| if (throwable == null) { | ||
| tracer().end(span); | ||
| } else { | ||
| tracer().endExceptionally(span, throwable); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.rocketmq; | ||
|
|
||
| import static io.opentelemetry.instrumentation.rocketmq.RocketMqConsumerTracer.tracer; | ||
| import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; | ||
| import static java.util.Collections.singletonMap; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isMethod; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
|
|
||
| import io.opentelemetry.api.trace.Span; | ||
| import io.opentelemetry.context.Scope; | ||
| import io.opentelemetry.javaagent.tooling.TypeInstrumentation; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.method.MethodDescription; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
| import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; | ||
| import org.apache.rocketmq.common.message.MessageExt; | ||
|
|
||
| public class RocketMqConcurrentlyConsumeInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| return implementsInterface( | ||
| named("org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently")); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() { | ||
| return singletonMap( | ||
| isMethod().and(named("consumeMessage")), | ||
| RocketMqConcurrentlyConsumeInstrumentation.class.getName() + "$ConcurrentlyConsumeAdvice"); | ||
| } | ||
|
|
||
| public static class ConcurrentlyConsumeAdvice { | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void onEnter( | ||
| @Advice.Argument(0) List<MessageExt> msgs, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
|
|
||
| span = tracer().startSpan(msgs); | ||
| scope = span.makeCurrent(); | ||
| } | ||
|
|
||
| @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) | ||
| public static void stopSpan( | ||
| @Advice.Return ConsumeConcurrentlyStatus status, | ||
| @Advice.Thrown Throwable throwable, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
| if (scope == null) { | ||
| return; | ||
| } | ||
| tracer().endConcurrentlySpan(span, status); | ||
| scope.close(); | ||
| if (throwable == null) { | ||
| tracer().end(span); | ||
| } else { | ||
| tracer().endExceptionally(span, throwable); | ||
| } | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,28 @@ | ||||||
| /* | ||||||
| * Copyright The OpenTelemetry Authors | ||||||
| * SPDX-License-Identifier: Apache-2.0 | ||||||
| */ | ||||||
|
|
||||||
| package io.opentelemetry.javaagent.instrumentation.rocketmq; | ||||||
|
|
||||||
| import static java.util.Arrays.asList; | ||||||
|
|
||||||
| import com.google.auto.service.AutoService; | ||||||
| import io.opentelemetry.javaagent.tooling.InstrumentationModule; | ||||||
| import io.opentelemetry.javaagent.tooling.TypeInstrumentation; | ||||||
| import java.util.List; | ||||||
|
|
||||||
| @AutoService(InstrumentationModule.class) | ||||||
| public class RocketMqInstrumentationModule extends InstrumentationModule { | ||||||
| public RocketMqInstrumentationModule() { | ||||||
| super("rocketmq", "rockemq-client-4.3"); | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Isn't the name of the lib
Suggested change
|
||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public List<TypeInstrumentation> typeInstrumentations() { | ||||||
| return asList( | ||||||
| new RocketMqClientApiImplInstrumentation(), | ||||||
| new RocketMqConcurrentlyConsumeInstrumentation(), | ||||||
| new RocketMqOrderlyConsumeInstrumentation()); | ||||||
| } | ||||||
| } | ||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.rocketmq; | ||
|
|
||
| import static io.opentelemetry.instrumentation.rocketmq.RocketMqConsumerTracer.tracer; | ||
| import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; | ||
| import static java.util.Collections.singletonMap; | ||
| import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
|
|
||
| import io.opentelemetry.api.trace.Span; | ||
| import io.opentelemetry.context.Scope; | ||
| import io.opentelemetry.javaagent.tooling.TypeInstrumentation; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.method.MethodDescription; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
| import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyStatus; | ||
| import org.apache.rocketmq.common.message.MessageExt; | ||
|
|
||
| public class RocketMqOrderlyConsumeInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| return implementsInterface( | ||
| named("org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly")); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Whenever we use implements/extends type matcher we always add a |
||
| } | ||
|
|
||
| @Override | ||
| public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() { | ||
| return singletonMap( | ||
| nameStartsWith("consumeMessage"), | ||
| RocketMqOrderlyConsumeInstrumentation.class.getName() + "$OrderlyConsumeAdvice"); | ||
| } | ||
|
|
||
| public static class OrderlyConsumeAdvice { | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void onEnter( | ||
| @Advice.Argument(0) List<MessageExt> msgs, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
|
|
||
| span = tracer().startSpan(msgs); | ||
| scope = span.makeCurrent(); | ||
| } | ||
|
|
||
| @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) | ||
| public static void stopSpan( | ||
| @Advice.Return ConsumeOrderlyStatus status, | ||
| @Advice.Thrown Throwable throwable, | ||
| @Advice.Local("otelSpan") Span span, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
| if (scope == null) { | ||
| return; | ||
| } | ||
| tracer().endOrderlySpan(span, status); | ||
| scope.close(); | ||
| if (throwable == null) { | ||
| tracer().end(span); | ||
| } else { | ||
| tracer().endExceptionally(span, throwable); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.rocketmq | ||
|
|
||
| import io.opentelemetery.instrumentation.rocketmq.AbstractRocketMqClientTest | ||
| import io.opentelemetry.instrumentation.test.AgentTestTrait | ||
|
|
||
| class RocketMqClientTest extends AbstractRocketMqClientTest implements AgentTestTrait { | ||
|
|
||
|
|
||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apply from: "$rootDir/gradle/instrumentation-library.gradle" | ||
|
|
||
|
|
||
| dependencies { | ||
| library group: 'org.apache.rocketmq', name: 'rocketmq-client', version: '4.8.0' | ||
| testImplementation project(':instrumentation:rocketmq-client-4.8:testing') | ||
|
|
||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.rocketmq; | ||
|
|
||
| import io.opentelemetry.instrumentation.api.config.Config; | ||
|
|
||
| public final class RocketMqClientConfig { | ||
|
|
||
| public static boolean isPropagationEnabled() { | ||
| return Config.get() | ||
| .getBooleanProperty("otel.instrumentation.rocketmq.client-propagation", true); | ||
| } | ||
|
|
||
| private RocketMqClientConfig() {} | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.