(servicecomb-java-chassis) branch master updated: [#4035] fix invocation context loss issue (#4087)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new f30571695 [#4035] fix invocation context loss issue (#4087)
f30571695 is described below

commit f3057169528c686501f6cd2595c45b75579dd1d0
Author: yanghao <73...@users.noreply.github.com>
AuthorDate: Mon Dec 11 09:32:13 2023 +0800

    [#4035] fix invocation context loss issue (#4087)
---
 .../servicecomb/tracing/zipkin/ZipkinTracingFilter.java   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java
index 9f162f648..4bc8f415e 100644
--- a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java
+++ b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java
@@ -37,21 +37,14 @@ import brave.http.HttpTracing;
 public class ZipkinTracingFilter extends AbstractFilter implements ConsumerFilter, ProviderFilter {
   public static final String NAME = "zipkin";
 
-  private ZipkinConsumerDelegate consumer;
-
-  private ZipkinProviderDelegate producer;
+  @Autowired
+  private HttpTracing httpTracing;
 
   @Override
   public String getName() {
     return NAME;
   }
 
-  @Autowired
-  public void setHttpTracing(HttpTracing httpTracing) {
-    this.consumer = new ZipkinConsumerDelegate(httpTracing);
-    this.producer = new ZipkinProviderDelegate(httpTracing);
-  }
-
   @SuppressWarnings({"try", "unused"})
   @Override
   public CompletableFuture<Response> onFilter(Invocation invocation, FilterNode nextNode) {
@@ -66,9 +59,9 @@ public class ZipkinTracingFilter extends AbstractFilter implements ConsumerFilte
 
   private ZipkinTracingDelegate collectTracing(Invocation invocation) {
     if (PROVIDER.equals(invocation.getInvocationType())) {
-      return producer;
+      return new ZipkinProviderDelegate(httpTracing);
     }
 
-    return consumer;
+    return new ZipkinConsumerDelegate(httpTracing);
   }
 }