Fixed TODOs

zalando · Nov 27, 2019 · d13de35 · d13de35
1 parent 2e2ea91
commit d13de35
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/...cing-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/AutoBaggage.java b/...cing-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/AutoBaggage.java
@@ -7,7 +7,6 @@
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
-// TODO doesn't work for tagging of builders...
 @API(status = EXPERIMENTAL)
 @AllArgsConstructor
 public final class AutoBaggage implements TagListener {

diff --git a/...cing-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/AutoTagging.java b/...cing-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/AutoTagging.java
@@ -4,25 +4,31 @@
 import lombok.AllArgsConstructor;
 import org.apiguardian.api.API;
 
+import java.util.Map;
 import java.util.Optional;
 
+import static java.util.Collections.singletonMap;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 @API(status = EXPERIMENTAL)
 @AllArgsConstructor
 public final class AutoTagging implements SpanListener, BaggageListener {
 
-    private final String baggageKey;
-    private final String tagKey;
+    private final Map<String, String> mapping;
 
     public AutoTagging(final String key) {
         this(key, key);
     }
 
+    public AutoTagging(final String baggageKey, final String tagKey) {
+        this(singletonMap(baggageKey, tagKey));
+    }
+
     @Override
     public void onStarted(final Span span) {
-        Optional.ofNullable(span.getBaggageItem(baggageKey))
-                .ifPresent(value -> tag(span, value));
+        mapping.forEach((baggageKey, tagKey) ->
+                Optional.ofNullable(span.getBaggageItem(baggageKey))
+                .ifPresent(value -> span.setTag(tagKey, value)));
     }
 
     @Override
@@ -31,13 +37,8 @@ public void onBaggage(
             final String key,
             final String value) {
 
-        if (baggageKey.equals(key)) {
-            tag(span, value);
-        }
-    }
-
-    private void tag(final Span span, final String baggageItem) {
-        span.setTag(tagKey, baggageItem);
+        Optional.ofNullable(mapping.get(key))
+                .ifPresent(tagKey -> span.setTag(tagKey, value));
     }
 
     @Override

diff --git a/...g-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/TagPropagation.java b/...g-proxy/opentracing-proxy/src/main/java/org/zalando/opentracing/proxy/TagPropagation.java
@@ -10,10 +10,11 @@
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -25,11 +26,10 @@
 @AllArgsConstructor
 public final class TagPropagation implements SpanBuilderInterceptor {
 
-    // TODO Set!
-    private final Collection<String> keys;
+    private final Set<String> keys;
 
     public TagPropagation(final String... keys) {
-        this(Arrays.asList(keys));
+        this(new HashSet<>(Arrays.asList(keys)));
     }
 
     @Override
@@ -64,7 +64,7 @@ private <T> void with(final Tag<T> tag, final T value) {
 
         @Override
         public SpanBuilder asChildOf(@Nullable final Span parent) {
-            runIfPropagating(parent, span ->
+            ifPropagating(parent, span ->
                     span.propagateTo(this));
 
             return super.asChildOf(parent);
@@ -92,13 +92,13 @@ public Span start() {
                 return span;
             }
 
-            runIfPropagating(unwrap(active), parent ->
+            ifPropagating(unwrap(active), parent ->
                     parent.propagateTo(span));
 
             return span;
         }
 
-        private void runIfPropagating(
+        private void ifPropagating(
                 @Nullable final Span span,
                 final Consumer<PropagatingSpan> action) {
             Optional.ofNullable(span)