[camel] branch main updated: CAMEL-16605 camel-zipkin custom tags should be attached to exchange automatically (#5756)

[davsclaus]

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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 4d6a74a  CAMEL-16605 camel-zipkin custom tags should be attached to 
exchange automatically (#5756)
4d6a74a is described below

commit 4d6a74afae90e1ccac77666f608ed61c9d1d7d32
Author: electrosaur <sramamoor...@guidewire.com>
AuthorDate: Sun Jun 27 21:57:01 2021 -0700

    CAMEL-16605 camel-zipkin custom tags should be attached to exchange 
automatically (#5756)
    
    Added method ZipkinTracer#setClientCustomTags() to allow specifying custim 
tags which should be attached to all spans
    automatically by ZipkinClientRequestAdapter.
---
 .../camel/zipkin/ZipkinClientRequestAdapter.java   |  2 ++
 .../java/org/apache/camel/zipkin/ZipkinTracer.java | 25 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git 
a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
 
b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
index 68390b3..506d429 100644
--- 
a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
+++ 
b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
@@ -57,6 +57,8 @@ final class ZipkinClientRequestAdapter {
             }
         }
 
+        eventNotifier.getClientCustomTags().forEach((key, value) -> 
span.tag("custom." + key, value));
+
         Map<String, String> customTags = 
exchange.getProperty("camel.client.customtags", Map.class);
         if (customTags != null && !customTags.isEmpty()) {
             for (Map.Entry<String, String> tag : customTags.entrySet()) {
diff --git 
a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
 
b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
index 6fb0b2e..a6e3f82 100644
--- 
a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
+++ 
b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
@@ -17,6 +17,7 @@
 package org.apache.camel.zipkin;
 
 import java.io.Closeable;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -24,6 +25,7 @@ import java.util.Set;
 
 import brave.Span;
 import brave.Span.Kind;
+import brave.SpanCustomizer;
 import brave.Tracing;
 import brave.context.slf4j.MDCScopeDecorator;
 import brave.propagation.B3Propagation;
@@ -139,6 +141,8 @@ public class ZipkinTracer extends ServiceSupport implements 
RoutePolicyFactory,
     private Set<String> excludePatterns = new HashSet<>();
     private boolean includeMessageBody;
     private boolean includeMessageBodyStreams;
+    private Map<String, String> clientCustomTags = Collections.emptyMap();
+
     private final Map<String, Span.Kind> producerComponentToSpanKind = new 
HashMap<>();
     private final Map<String, Span.Kind> consumerComponentToSpanKind = new 
HashMap<>();
 
@@ -361,6 +365,27 @@ public class ZipkinTracer extends ServiceSupport 
implements RoutePolicyFactory,
         this.includeMessageBodyStreams = includeMessageBodyStreams;
     }
 
+    /**
+     * Custom tags that should be included on all client requests, in addition 
to the tags specified on the Exchange via
+     * <code>camel.client.customtags</code>.
+     *
+     * @param clientCustomTags custom tags to be added for all client requests
+     * @see                    ZipkinClientRequestAdapter#onRequest(Exchange, 
SpanCustomizer)
+     */
+    public void setClientCustomTags(Map<String, String> clientCustomTags) {
+        this.clientCustomTags = clientCustomTags == null ? 
Collections.emptyMap() : new HashMap<>(clientCustomTags);
+    }
+
+    /**
+     * Custom tags that are added for all client requests.
+     *
+     * @return custom tags added for all client requests
+     * @see    ZipkinClientRequestAdapter#onRequest(Exchange, SpanCustomizer)
+     */
+    public Map<String, String> getClientCustomTags() {
+        return clientCustomTags;
+    }
+
     @Override
     protected void doInit() throws Exception {
         ObjectHelper.notNull(camelContext, "CamelContext", this);