Skip to content

Fix kafka plugin sometimes trace doesn't show span layer #5264

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.

Sign up for GitHub

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

Merged
wu-sheng merged 4 commits into from
Aug 8, 2020
Merged

Fix kafka plugin sometimes trace doesn't show span layer #5264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31873df
Fix kafka plugin sometimes trace doesn't show span layer
J-Cod3r Aug 7, 2020
ba6c9be
Merge branch 'master' into kafka-plugin-bugfix
kezhenxu94 Aug 7, 2020
f13860d
Merge branch 'master' into kafka-plugin-bugfix
wu-sheng Aug 7, 2020
12498d9
fix test
J-Cod3r Aug 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapterInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
import org.apache.skywalking.apm.agent.core.context.tag.Tags;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;

/**
Expand All @@ -44,6 +45,7 @@ public CallbackAdapterInterceptor(CallbackCache callbackCache) {
public void onCompletion(RecordMetadata metadata, Exception exception) {
ContextSnapshot snapshot = callbackCache.getSnapshot();
AbstractSpan activeSpan = ContextManager.createLocalSpan("Kafka/Producer/Callback");
SpanLayer.asMQ(activeSpan);
activeSpan.setComponent(ComponentsDefine.KAFKA_PRODUCER);
if (metadata != null) {
Tags.MQ_TOPIC.set(activeSpan, metadata.topic());
Expand Down
2 changes: 2 additions & 0 deletions ...afka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
import org.apache.skywalking.apm.agent.core.context.tag.Tags;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
Expand All @@ -43,6 +44,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
ContextSnapshot snapshot = getSnapshot(cache);
RecordMetadata metadata = (RecordMetadata) allArguments[0];
AbstractSpan activeSpan = ContextManager.createLocalSpan("Kafka/Producer/Callback");
SpanLayer.asMQ(activeSpan);
activeSpan.setComponent(ComponentsDefine.KAFKA_PRODUCER);
if (metadata != null) {
// Null if an error occurred during processing of this record
Expand Down
4 changes: 2 additions & 2 deletions test/plugin/scenarios/kafka-scenario/config/expectedData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ segmentItems:
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: Unknown
spanLayer: MQ
startTime: nq 0
endTime: nq 0
componentId: 40
Expand All @@ -43,7 +43,7 @@ segmentItems:
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: Unknown
spanLayer: MQ
startTime: nq 0
endTime: nq 0
componentId: 40
Expand Down