configs to test

openzipkin · Aug 31, 2020 · 985597b · 985597b
1 parent d0e3ec0
commit 985597b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml
@@ -43,7 +43,7 @@ services:
       # Uncomment to enable scribe
       # - SCRIBE_ENABLED=true
       # Uncomment to enable self-tracing
-      # - SELF_TRACING_ENABLED=true
+      - SELF_TRACING_ENABLED=true
       # Uncomment to enable debug logging
       # - JAVA_OPTS=-Dlogging.level.zipkin2=DEBUG
     ports:

diff --git a/zipkin-collector/kafka/src/main/java/zipkin2/collector/kafka/KafkaCollector.java b/zipkin-collector/kafka/src/main/java/zipkin2/collector/kafka/KafkaCollector.java
@@ -15,15 +15,13 @@
 
 import java.time.Duration;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.consumer.Consumer;

diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ConditionalOnSelfTracing.java b/zipkin-server/src/main/java/zipkin2/server/internal/ConditionalOnSelfTracing.java
@@ -60,7 +60,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
       String selfTracingEnabled = context.getEnvironment()
           .getProperty("zipkin.self-tracing.enabled");
 
-      if (!Boolean.valueOf(selfTracingEnabled)) {
+      if (!Boolean.parseBoolean(selfTracingEnabled)) {
         return ConditionOutcome.noMatch("zipkin.self-tracing.enabled isn't true");
       }
 

diff --git a/...in-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java b/...in-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java
@@ -108,6 +108,7 @@ public class ZipkinSelfTracingConfiguration {
       // Reduce the impact on untraced downstream http services such as Elasticsearch
       .propagationFactory(B3Propagation.newFactoryBuilder()
         .injectFormat(brave.Span.Kind.CLIENT, B3Propagation.Format.SINGLE)
+        .injectFormat(brave.Span.Kind.CONSUMER, B3Propagation.Format.SINGLE)
         .build())
       .addSpanHandler(zipkinSpanHandler)
       .build();

diff --git a/...server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java b/...server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java
@@ -47,9 +47,14 @@ public class ZipkinKafkaCollectorConfiguration { // makes simple type name uniqu
       CollectorMetrics metrics,
       StorageComponent storage,
       Optional<Tracing> maybeTracing) {
-    KafkaCollector.Builder builder = properties.toBuilder().sampler(sampler).metrics(metrics).storage(storage);
+    final KafkaCollector.Builder builder = properties.toBuilder()
+      .sampler(sampler)
+      .metrics(metrics)
+      .storage(storage);
     if (maybeTracing.isPresent()) {
-      KafkaTracing kafkaTracing = KafkaTracing.newBuilder(maybeTracing.get()).build();
+      final KafkaTracing kafkaTracing = KafkaTracing.newBuilder(maybeTracing.get())
+        .remoteServiceName("zipkin-kafka")
+        .build();
       builder.consumerSupplier(props -> kafkaTracing.consumer(new KafkaConsumer<>(props)));
     }
     return builder.build();