This is an automated email from the ASF dual-hosted git repository. midnight2104 pushed a commit to branch midnight2104 in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
commit e3bcb8f758cccd200e41b629e356b6f21e404a28 Author: LL2104 <[email protected]> AuthorDate: Mon Feb 28 21:27:53 2022 +0800 feature shenyu-agent : update SHENYU_AGENT in exchange to distinguish between different plugins. --- .../agent/plugin/tracing/common/constant/TracingConstants.java | 7 ++++++- .../plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java | 8 ++++---- .../plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java | 8 ++++---- .../agent/plugin/tracing/jaeger/span/JaegerSpanManager.java | 2 +- .../opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java | 8 ++++---- .../opentelemetry/handler/OpenTelemetryPluginCommonHandler.java | 8 ++++---- .../tracing/opentelemetry/span/OpenTelemetrySpanManager.java | 4 ++-- .../plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java | 8 ++++---- .../plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java | 8 ++++---- .../agent/plugin/tracing/zipkin/span/ZipkinSpanManager.java | 2 +- 10 files changed, 34 insertions(+), 29 deletions(-) diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-common/src/main/java/org/apache/shenyu/agent/plugin/tracing/common/constant/TracingConstants.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-common/src/main/java/org/apache/shenyu/agent/plugin/tracing/common/constant/TracingConstants.java index 4a5844e..b09464e 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-common/src/main/java/org/apache/shenyu/agent/plugin/tracing/common/constant/TracingConstants.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-common/src/main/java/org/apache/shenyu/agent/plugin/tracing/common/constant/TracingConstants.java @@ -38,7 +38,12 @@ public final class TracingConstants { public static final String HTTP_METHOD = "http.method"; - public static final String SHENYU_AGENT = "shenyu-agent"; + public static final String SHENYU_AGENT_TRACE_JAEGER = "shenyu-agent-trace-jaeger"; + + public static final String SHENYU_AGENT_TRACE_OPENTELEMETRY = "shenyu-agent-trace-opentelemetry"; + + public static final String SHENYU_AGENT_TRACE_ZIPKIN = "shenyu-agent-trace-zipkin"; + /** * The type Error log tags. diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java index 80b748b..32a57b6 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java @@ -41,7 +41,7 @@ public final class JaegerGlobalPluginHandler implements InstanceMethodHandler { public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final JaegerSpanManager jaegerSpanManager = (JaegerSpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.SHENYU_AGENT, new JaegerSpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_JAEGER, new JaegerSpanManager()); Map<String, String> tagMap = new HashMap<>(4); tagMap.put(TracingConstants.COMPONENT, TracingConstants.NAME); @@ -49,7 +49,7 @@ public final class JaegerGlobalPluginHandler implements InstanceMethodHandler { .ifPresent(v -> tagMap.put(Tags.HTTP_METHOD.getKey(), v.toString())); Span span = jaegerSpanManager.add(TracingConstants.ROOT_SPAN, tagMap); - exchange.getAttributes().put(TracingConstants.SHENYU_AGENT, jaegerSpanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_JAEGER, jaegerSpanManager); target.setContext(span); } @@ -58,7 +58,7 @@ public final class JaegerGlobalPluginHandler implements InstanceMethodHandler { Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_JAEGER); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> { @@ -75,7 +75,7 @@ public final class JaegerGlobalPluginHandler implements InstanceMethodHandler { Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.ROOT_SPAN); + JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_JAEGER); manager.error(span, exchange, throwable); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java index 1184148..c80fcf5 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java @@ -40,13 +40,13 @@ public final class JaegerPluginCommonHandler implements InstanceMethodHandler { public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final JaegerSpanManager jaegerSpanManager = (JaegerSpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.ROOT_SPAN, new JaegerSpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_JAEGER, new JaegerSpanManager()); Map<String, String> tagMap = new HashMap<>(2, 1); tagMap.put(Tags.COMPONENT.getKey(), TracingConstants.NAME); Span span = jaegerSpanManager.add(method.getDeclaringClass().getSimpleName(), tagMap); - exchange.getAttributes().put(TracingConstants.ROOT_SPAN, jaegerSpanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_JAEGER, jaegerSpanManager); target.setContext(span); } @@ -55,7 +55,7 @@ public final class JaegerPluginCommonHandler implements InstanceMethodHandler { Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.ROOT_SPAN); + JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_JAEGER); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> { @@ -72,7 +72,7 @@ public final class JaegerPluginCommonHandler implements InstanceMethodHandler { Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.ROOT_SPAN); + JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_JAEGER); manager.error(span, exchange, throwable); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/span/JaegerSpanManager.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/span/JaegerSpanManager.java index 5065b6e..4dfea67 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/span/JaegerSpanManager.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-jaeger/src/main/java/org/apache/shenyu/agent/plugin/tracing/jaeger/span/JaegerSpanManager.java @@ -84,7 +84,7 @@ public class JaegerSpanManager { span.finish(); if (count.decrementAndGet() == 0) { scopeList.forEach(Scope::close); - exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT); + exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT_TRACE_JAEGER); } } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java index dd22ca9..934a4df 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java @@ -41,7 +41,7 @@ public final class OpenTelemetryGlobalPluginHandler implements InstanceMethodHan public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final OpenTelemetrySpanManager spanManager = (OpenTelemetrySpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.SHENYU_AGENT, new OpenTelemetrySpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY, new OpenTelemetrySpanManager()); Map<String, String> attributesMap = new HashMap<>(4); attributesMap.put(TracingConstants.COMPONENT, TracingConstants.NAME); @@ -50,7 +50,7 @@ public final class OpenTelemetryGlobalPluginHandler implements InstanceMethodHan .ifPresent(v -> attributesMap.put(TracingConstants.HTTP_METHOD, v.toString())); Span span = spanManager.startAndRecord(TracingConstants.ROOT_SPAN, attributesMap); - exchange.getAttributes().put(TracingConstants.SHENYU_AGENT, spanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY, spanManager); target.setContext(span); } @@ -59,7 +59,7 @@ public final class OpenTelemetryGlobalPluginHandler implements InstanceMethodHan Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> manager.finish(span, exchange)); @@ -75,7 +75,7 @@ public final class OpenTelemetryGlobalPluginHandler implements InstanceMethodHan span.setStatus(StatusCode.ERROR).recordException(throwable); ServerWebExchange exchange = (ServerWebExchange) args[0]; - OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY); manager.finish(span, exchange); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java index d228627..922e1a3 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java @@ -40,13 +40,13 @@ public class OpenTelemetryPluginCommonHandler implements InstanceMethodHandler { public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final OpenTelemetrySpanManager spanManager = (OpenTelemetrySpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.SHENYU_AGENT, new OpenTelemetrySpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY, new OpenTelemetrySpanManager()); Map<String, String> attributesMap = new HashMap<>(2, 1); attributesMap.put(TracingConstants.COMPONENT, TracingConstants.NAME); Span span = spanManager.startAndRecord(method.getDeclaringClass().getSimpleName(), attributesMap); - exchange.getAttributes().put(TracingConstants.SHENYU_AGENT, spanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY, spanManager); target.setContext(span); } @@ -55,7 +55,7 @@ public class OpenTelemetryPluginCommonHandler implements InstanceMethodHandler { Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> manager.finish(span, exchange)); @@ -71,7 +71,7 @@ public class OpenTelemetryPluginCommonHandler implements InstanceMethodHandler { span.setStatus(StatusCode.ERROR).recordException(throwable); ServerWebExchange exchange = (ServerWebExchange) args[0]; - OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY); manager.finish(span, exchange); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/span/OpenTelemetrySpanManager.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/span/OpenTelemetrySpanManager.java index 5dd1a6c..1b961d9 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/span/OpenTelemetrySpanManager.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-opentelemetry/src/main/java/org/apache/shenyu/agent/plugin/tracing/opentelemetry/span/OpenTelemetrySpanManager.java @@ -47,7 +47,7 @@ public class OpenTelemetrySpanManager { * @return {@linkplain Span} */ public Span startAndRecord(final String spanName, final Map<String, String> attributesMap) { - SpanBuilder spanBuilder = GlobalOpenTelemetry.getTracer(TracingConstants.SHENYU_AGENT) + SpanBuilder spanBuilder = GlobalOpenTelemetry.getTracer(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY) .spanBuilder(spanName) .setSpanKind(SpanKind.INTERNAL); Optional.ofNullable(attributesMap).ifPresent(attributes -> attributes.forEach(spanBuilder::setAttribute)); @@ -69,7 +69,7 @@ public class OpenTelemetrySpanManager { public void finish(final Span span, final ServerWebExchange exchange) { span.end(); if (count.decrementAndGet() == 0) { - exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT); + exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT_TRACE_OPENTELEMETRY); } } } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java index ad1f75f..f745b01 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java @@ -40,7 +40,7 @@ public final class ZipkinGlobalPluginHandler implements InstanceMethodHandler { public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final ZipkinSpanManager zipkinSpanManager = (ZipkinSpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.SHENYU_AGENT, new ZipkinSpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN, new ZipkinSpanManager()); Map<String, String> tagMap = new HashMap<>(4); tagMap.put(TracingConstants.COMPONENT, TracingConstants.NAME); @@ -49,7 +49,7 @@ public final class ZipkinGlobalPluginHandler implements InstanceMethodHandler { .ifPresent(v -> tagMap.put(TracingConstants.HTTP_METHOD, v.toString())); Span span = zipkinSpanManager.start(TracingConstants.ROOT_SPAN, tagMap); - exchange.getAttributes().put(TracingConstants.SHENYU_AGENT, zipkinSpanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN, zipkinSpanManager); target.setContext(span); } @@ -58,7 +58,7 @@ public final class ZipkinGlobalPluginHandler implements InstanceMethodHandler { Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> manager.finish(span, exchange)); @@ -74,7 +74,7 @@ public final class ZipkinGlobalPluginHandler implements InstanceMethodHandler { span.error(throwable); ServerWebExchange exchange = (ServerWebExchange) args[0]; - ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN); manager.finish(span, exchange); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java index 9ffe5b0..a1d225c 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java @@ -39,13 +39,13 @@ public final class ZipkinPluginCommonHandler implements InstanceMethodHandler { public void before(final TargetObject target, final Method method, final Object[] args, final MethodResult result) { final ServerWebExchange exchange = (ServerWebExchange) args[0]; final ZipkinSpanManager zipkinSpanManager = (ZipkinSpanManager) exchange.getAttributes() - .getOrDefault(TracingConstants.SHENYU_AGENT, new ZipkinSpanManager()); + .getOrDefault(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN, new ZipkinSpanManager()); Map<String, String> tagMap = new HashMap<>(2, 1); tagMap.put(TracingConstants.COMPONENT, TracingConstants.NAME); Span span = zipkinSpanManager.start(method.getDeclaringClass().getSimpleName(), tagMap); - exchange.getAttributes().put(TracingConstants.SHENYU_AGENT, zipkinSpanManager); + exchange.getAttributes().put(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN, zipkinSpanManager); target.setContext(span); } @@ -54,7 +54,7 @@ public final class ZipkinPluginCommonHandler implements InstanceMethodHandler { Object result = methodResult.getResult(); Span span = (Span) target.getContext(); ServerWebExchange exchange = (ServerWebExchange) args[0]; - ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN); if (result instanceof Mono) { return ((Mono) result).doFinally(s -> manager.finish(span, exchange)); @@ -70,7 +70,7 @@ public final class ZipkinPluginCommonHandler implements InstanceMethodHandler { span.error(throwable); ServerWebExchange exchange = (ServerWebExchange) args[0]; - ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT); + ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN); manager.finish(span, exchange); } diff --git a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/span/ZipkinSpanManager.java b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/span/ZipkinSpanManager.java index 48d8eb0..8836f3b 100644 --- a/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/span/ZipkinSpanManager.java +++ b/shenyu-agent/shenyu-agent-plugins/shenyu-agent-plugin-tracing/shenyu-agent-plugin-tracing-zipkin/src/main/java/org/apache/shenyu/agent/plugin/tracing/zipkin/span/ZipkinSpanManager.java @@ -69,7 +69,7 @@ public class ZipkinSpanManager { public void finish(final Span span, final ServerWebExchange exchange) { span.finish(); if (count.decrementAndGet() == 0) { - exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT); + exchange.getAttributes().remove(TracingConstants.SHENYU_AGENT_TRACE_ZIPKIN); } } }
