From 84f272445f0cbd8ec6cef4ec59289e624eaf6c8f Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 6 Sep 2024 21:32:32 +0300 Subject: [PATCH] Make rocketmq span status extractor delegate to default extractor (#12183) --- .../rocketmqclient/v5_0/RocketMqInstrumenterFactory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumenterFactory.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumenterFactory.java index 67cb65581e64..5164fc1dbeaa 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumenterFactory.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumenterFactory.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanLinksExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor; import java.util.List; import org.apache.rocketmq.client.apis.consumer.ConsumeResult; @@ -86,8 +87,11 @@ public static Instrumenter createConsumerProcessInst .addAttributesExtractor(RocketMqConsumerProcessAttributeExtractor.INSTANCE) .setSpanStatusExtractor( (spanStatusBuilder, messageView, consumeResult, error) -> { - if (error != null || consumeResult == ConsumeResult.FAILURE) { + if (consumeResult == ConsumeResult.FAILURE) { spanStatusBuilder.setStatus(StatusCode.ERROR); + } else { + SpanStatusExtractor.getDefault() + .extract(spanStatusBuilder, messageView, consumeResult, error); } });