Merge pull request #9 from beckje01/execInit

Add ExecInitializer

pom.xml

@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.zipkin.brave.ratpack</groupId>
   <artifactId>brave-ratpack</artifactId>
-  <version>2.3.3-SNAPSHOT</version>
+  <version>2.4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>brave-ratpack</name>
   <description>Brave instrumentation for Ratpack</description>
@@ -50,7 +50,7 @@
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
 
     <brave.version>5.1.5</brave.version>
-    <ratpack.version>1.4.6</ratpack.version>
+    <ratpack.version>1.6.0</ratpack.version>
 
   </properties>
 

src/main/java/ratpack/zipkin/ServerTracingModule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenZipkin Authors
+ * Copyright 2016-2019 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -33,10 +33,7 @@
 import ratpack.handling.HandlerDecorator;
 import ratpack.http.client.HttpClient;
 import ratpack.server.ServerConfig;
-import ratpack.zipkin.internal.DefaultServerTracingHandler;
-import ratpack.zipkin.internal.RatpackCurrentTraceContext;
-import ratpack.zipkin.internal.RatpackHttpServerParser;
-import ratpack.zipkin.internal.ZipkinHttpClientImpl;
+import ratpack.zipkin.internal.*;
 import zipkin2.Endpoint;
 import zipkin2.Span;
 import zipkin2.reporter.Reporter;
@@ -59,6 +56,9 @@ protected void configure() {
 
     bind(ZipkinHttpClientImpl.class);
 
+    bind(RatpackCurrentTraceContext.TracingPropagationExecInitializer.class)
+            .in(Singleton.class);
+
     Provider<ServerTracingHandler> serverTracingHandlerProvider =
         getProvider(ServerTracingHandler.class);
 

src/main/java/ratpack/zipkin/TracedParallelBatch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenZipkin Authors
+ * Copyright 2016-2019 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -27,8 +27,13 @@
  * which do not "inherit" registries from the calling execution. Consequently,
  * the trace context must be passed explicitly to the forked executions.
  *
+ * @deprecated As of 2.4 brave-ratpack is now providing an {@link ratpack.exec.ExecInitializer} bound in guice by {@link ServerTracingModule}
+ * which will deal with passing tracing contexts around Ratpack executions. The propagation is done in {@link ratpack.zipkin.internal.RatpackCurrentTraceContext.TracingPropagationExecInitializer},
+ * this kind of propagation is only possible with Ratpack version 1.6 and above as the parent execution is now avaialble.
+ *
  * @param <T> the type of value produced by each promise in the batch.
  */
+@Deprecated
 public final class TracedParallelBatch<T> {
 
   private final Iterable<? extends Promise<T>> promises;

src/main/java/ratpack/zipkin/internal/RatpackCurrentTraceContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenZipkin Authors
+ * Copyright 2016-2019 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -13,10 +13,12 @@
  */
 package ratpack.zipkin.internal;
 
+import brave.http.HttpTracing;
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.TraceContext;
 import java.util.function.Supplier;
 import org.slf4j.MDC;
+import ratpack.exec.ExecInitializer;
 import ratpack.exec.Execution;
 import ratpack.registry.MutableRegistry;
 
@@ -90,4 +92,24 @@ private TraceContextHolder(final TraceContext context) {
     }
   }
 
+  /**
+   * ExecInitializer that will propagate the tracing context into any new execution created.
+   */
+  public static class TracingPropagationExecInitializer implements ExecInitializer {
+
+    @Override
+    public void init(Execution execution) {
+      execution.maybeParent().ifPresent(parent -> {
+        parent.maybeGet(HttpTracing.class).ifPresent(httpTracing -> {
+          TraceContext traceContext = httpTracing.tracing().currentTraceContext().get();
+          if (traceContext == null) {
+            execution.add(RatpackCurrentTraceContext.TraceContextHolder.EMPTY);
+          } else {
+            execution.add(new RatpackCurrentTraceContext.TraceContextHolder(traceContext));
+          }
+        });
+      });
+    }
+  }
+
 }

src/main/java/ratpack/zipkin/internal/ZipkinHttpClientImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenZipkin Authors
+ * Copyright 2016-2019 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -31,16 +31,15 @@
 import java.util.function.BiFunction;
 import javax.inject.Inject;
 import javax.net.ssl.SSLContext;
+
+import io.netty.handler.ssl.SslContext;
 import ratpack.exec.Promise;
 import ratpack.exec.Result;
 import ratpack.func.Action;
 import ratpack.func.Function;
 import ratpack.http.HttpMethod;
 import ratpack.http.MutableHeaders;
-import ratpack.http.client.HttpClient;
-import ratpack.http.client.ReceivedResponse;
-import ratpack.http.client.RequestSpec;
-import ratpack.http.client.StreamedResponse;
+import ratpack.http.client.*;
 
 /**
  * Decorator that adds Zipkin client logging around {@link HttpClient}.
@@ -74,21 +73,41 @@ public int getPoolSize() {
         return delegate.getPoolSize();
     }
 
+    @Override
+    public int getPoolQueueSize() {
+        return delegate.getPoolQueueSize();
+    }
+
     @Override
     public Duration getReadTimeout() {
         return delegate.getReadTimeout();
     }
 
+    @Override
+    public Duration getConnectTimeout() {
+        return delegate.getConnectTimeout();
+    }
+
     @Override
     public int getMaxContentLength() {
         return delegate.getMaxContentLength();
     }
 
+    @Override
+    public int getMaxResponseChunkSize() {
+        return delegate.getMaxResponseChunkSize();
+    }
+
     @Override
     public void close() {
         delegate.close();
     }
 
+    @Override
+    public HttpClient copyWith(Action<? super HttpClientSpec> action) throws Exception {
+        return delegate.copyWith(action);
+    }
+
     @Override
     public Promise<ReceivedResponse> request(URI uri, Action<? super RequestSpec> action) {
         // save off the current span as the parent of a future client span
@@ -222,6 +241,11 @@ public RequestSpec redirects(int maxRedirects) {
             return this;
         }
 
+        @Override
+        public int getRedirects() {
+            return delegate.getRedirects();
+        }
+
         @Override
         public RequestSpec onRedirect(Function<? super ReceivedResponse, Action<? super RequestSpec>> function) {
 
@@ -238,6 +262,16 @@ public RequestSpec sslContext(SSLContext sslContext) {
             return this;
         }
 
+        @Override
+        public SslContext getSslContext() {
+            return delegate.getSslContext();
+        }
+
+        @Override
+        public RequestSpec sslContext(SslContext sslContext) {
+            return delegate.sslContext(sslContext);
+        }
+
         @Override
         public MutableHeaders getHeaders() {
             return this.delegate.getHeaders();
@@ -249,6 +283,17 @@ public RequestSpec maxContentLength(int numBytes) {
             return this;
         }
 
+        @Override
+        public int getMaxContentLength() {
+            return delegate.getMaxContentLength();
+        }
+
+        @Override
+        public RequestSpec responseMaxChunkSize(int i) {
+             this.delegate.responseMaxChunkSize(i);
+             return this;
+        }
+
         @Override
         public RequestSpec headers(Action<? super MutableHeaders> action) throws Exception {
             this.delegate.headers(action);
@@ -264,12 +309,22 @@ public RequestSpec method(HttpMethod method) {
             return this;
         }
 
+        @Override
+        public HttpMethod getMethod() {
+            return delegate.getMethod();
+        }
+
         @Override
         public RequestSpec decompressResponse(boolean shouldDecompress) {
             this.delegate.decompressResponse(shouldDecompress);
             return this;
         }
 
+        @Override
+        public boolean getDecompressResponse() {
+            return delegate.getDecompressResponse();
+        }
+
         @Override
         public URI getUri() {
             return this.delegate.getUri();
@@ -281,12 +336,22 @@ public RequestSpec connectTimeout(Duration duration) {
             return this;
         }
 
+        @Override
+        public Duration getConnectTimeout() {
+            return delegate.getConnectTimeout();
+        }
+
         @Override
         public RequestSpec readTimeout(Duration duration) {
             this.delegate.readTimeout(duration);
             return this;
         }
 
+        @Override
+        public Duration getReadTimeout() {
+            return delegate.getReadTimeout();
+        }
+
         @Override
         public Body getBody() {
             return this.delegate.getBody();