Removes all deprecated things (Brave v5) (openzipkin#708)

Author: adriancole

brave/pom.xml

@@ -22,17 +22,6 @@
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.zipkin.java</groupId>
-      <artifactId>zipkin</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.zipkin.reporter</groupId>
-      <artifactId>zipkin-reporter</artifactId>
-      <version>1.1.2</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.zipkin.reporter2</groupId>
       <artifactId>zipkin-reporter</artifactId>

brave/src/it/nozipkin1/README.md

@@ -1,8 +1,8 @@
 package brave;
 
 /**
- * Epoch microseconds used for {@link zipkin.Span#timestamp} and {@link
- * zipkin.Annotation#timestamp}.
+ * Epoch microseconds used for {@link zipkin2.Span#timestamp} and {@link
+ * zipkin2.Annotation#timestamp}.
  *
  * <p>This should use the most precise value possible. For example, {@code gettimeofday} or
  * multiplying {@link System#currentTimeMillis} by 1000.

brave/src/it/nozipkin1/pom.xml

@@ -32,9 +32,4 @@ public static CurrentSpanCustomizer create(Tracing tracing) {
   @Override public SpanCustomizer annotate(String value) {
     return tracer.currentSpanCustomizer().annotate(value);
   }
-
-  /** @deprecated use {@link #annotate(String)} as this can result in clock skew */
-  @Deprecated @Override public SpanCustomizer annotate(long timestamp, String value) {
-    return tracer.currentSpanCustomizer().annotate(timestamp, value);
-  }
 }

brave/src/it/nozipkin1/src/test/java/brave/nozipkin1/DoesntRequireV1ClassesTest.java

@@ -19,9 +19,4 @@ public enum NoopSpanCustomizer implements SpanCustomizer {
   @Override public SpanCustomizer annotate(String value) {
     return this;
   }
-
-  /** @deprecated use {@link #annotate(String)} as this can result in clock skew */
-  @Deprecated @Override public SpanCustomizer annotate(long timestamp, String value) {
-    return this;
-  }
 }

brave/src/main/java/brave/Clock.java

@@ -25,12 +25,6 @@ static RealSpanCustomizer create(TraceContext context, Recorder recorder) {
     return this;
   }
 
-  /** @deprecated use {@link #annotate(String)} as this can result in clock skew */
-  @Override @Deprecated public SpanCustomizer annotate(long timestamp, String value) {
-    recorder().annotate(context(), timestamp, value);
-    return this;
-  }
-
   @Override public SpanCustomizer tag(String key, String value) {
     recorder().tag(context(), key, value);
     return this;

brave/src/main/java/brave/CurrentSpanCustomizer.java

@@ -28,7 +28,7 @@
 // Design note: this does not require a builder as the span is mutable anyway. Having a single
 // mutation interface is less code to maintain. Those looking to prepare a span before starting it
 // can simply call start when they are ready.
-// BRAVE5: do not inherit SpanCustomizer, rather just return it. This will prevent accidentally
+// BRAVE6: do not inherit SpanCustomizer, rather just return it. This will prevent accidentally
 // leaking lifecycle methods
 public abstract class Span implements SpanCustomizer {
   public enum Kind {
@@ -102,7 +102,7 @@ public enum Kind {
    * <p>Take extreme care with this feature as it is easy to have incorrect timestamps. If you must
    * use this, generate the timestamp using {@link Tracing#clock(TraceContext)}.
    */
-  @Override public abstract Span annotate(long timestamp, String value);
+  public abstract Span annotate(long timestamp, String value);
 
   /** {@inheritDoc} */
   @Override public abstract Span tag(String key, String value);
@@ -112,15 +112,6 @@ public enum Kind {
   // multi-catch. In practice, you should always at least catch RuntimeException and Error.
   public abstract Span error(Throwable throwable);
 
-  /**
-   * @deprecated use {@link #remoteEndpoint(Endpoint)}, possibly with {@link zipkin.Endpoint#toV2()}
-   */
-  @Deprecated
-  public final Span remoteEndpoint(zipkin.Endpoint endpoint) {
-    if (isNoop()) return this;
-    return remoteEndpoint(endpoint.toV2());
-  }
-
   /**
    * For a client span, this would be the server's address.
    *
@@ -137,7 +128,7 @@ public final Span remoteEndpoint(zipkin.Endpoint endpoint) {
   /**
    * Like {@link #finish()}, except with a given timestamp in microseconds.
    *
-   * <p>{@link zipkin.Span#duration Zipkin's span duration} is derived by subtracting the start
+   * <p>{@link zipkin2.Span#duration Zipkin's span duration} is derived by subtracting the start
    * timestamp from this, and set when appropriate.
    *
    * <p>Take extreme care with this feature as it is easy to have incorrect timestamps. If you must

brave/src/main/java/brave/NoopSpanCustomizer.java

@@ -19,8 +19,8 @@
  */
 // Note: this is exposed to users. We cannot add methods to this until Java 8 is required or we do a
 // major version bump
-// BRAVE5: add isNoop to avoid instanceof checks
-// BRAVE5: add error to support error handling
+// BRAVE6: add isNoop to avoid instanceof checks
+// BRAVE6: add error to support error handling
 public interface SpanCustomizer {
   /**
    * Sets the string name for the logical operation this span represents.
@@ -43,9 +43,4 @@ public interface SpanCustomizer {
    * @param value A short tag indicating the event, like "finagle.retry"
    */
   SpanCustomizer annotate(String value);
-
-  /** @deprecated use {@link #annotate(String)} as this can result in clock skew */
-  // BRAVE5: remove this: backdating ops should only be available on Span, as it isn't reasonable
-  // for those only having a reference to SpanCustomizer to have a correct clock for the trace.
-  @Deprecated SpanCustomizer annotate(long timestamp, String value);
 }

brave/src/main/java/brave/RealSpanCustomizer.java

@@ -16,7 +16,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import zipkin2.Endpoint;
 import zipkin2.reporter.Reporter;
 
 /**
@@ -60,87 +59,6 @@
  * @see Propagation
  */
 public class Tracer {
-  /** @deprecated Please use {@link Tracing#newBuilder()} */
-  @Deprecated public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  /** @deprecated Please use {@link Tracing.Builder} */
-  @Deprecated public static final class Builder {
-    final Tracing.Builder delegate = new Tracing.Builder();
-
-    /** @see Tracing.Builder#localServiceName(String) */
-    public Builder localServiceName(String localServiceName) {
-      delegate.localServiceName(localServiceName);
-      return this;
-    }
-
-    /** @deprecated use {@link #endpoint(Endpoint)}, possibly with {@link zipkin.Endpoint#toV2()} */
-    @Deprecated
-    public Builder localEndpoint(zipkin.Endpoint localEndpoint) {
-      return endpoint(localEndpoint.toV2());
-    }
-
-    /** @deprecated use {@link #endpoint(Endpoint)} */
-    @Deprecated
-    public Builder localEndpoint(Endpoint localEndpoint) {
-      delegate.endpoint(localEndpoint);
-      return this;
-    }
-
-    /** @see Tracing.Builder#endpoint(Endpoint) */
-    public Builder endpoint(Endpoint endpoint) {
-      delegate.endpoint(endpoint);
-      return this;
-    }
-
-    /** @deprecated use {@link #spanReporter(Reporter)} */
-    @Deprecated
-    public Builder reporter(zipkin.reporter.Reporter<zipkin.Span> reporter) {
-      delegate.reporter(reporter);
-      return this;
-    }
-
-    /** @see Tracing.Builder#spanReporter(Reporter) */
-    public Builder spanReporter(Reporter<zipkin2.Span> reporter) {
-      delegate.spanReporter(reporter);
-      return this;
-    }
-
-    /** @see Tracing.Builder#clock(Clock) */
-    public Builder clock(Clock clock) {
-      delegate.clock(clock);
-      return this;
-    }
-
-    /** @see Tracing.Builder#sampler(Sampler) */
-    public Builder sampler(Sampler sampler) {
-      delegate.sampler(sampler);
-      return this;
-    }
-
-    /** @see Tracing.Builder#currentTraceContext(CurrentTraceContext) */
-    public Builder currentTraceContext(CurrentTraceContext currentTraceContext) {
-      delegate.currentTraceContext(currentTraceContext);
-      return this;
-    }
-
-    /** @see Tracing.Builder#traceId128Bit(boolean) */
-    public Builder traceId128Bit(boolean traceId128Bit) {
-      delegate.traceId128Bit(traceId128Bit);
-      return this;
-    }
-
-    /** @see Tracing.Builder#supportsJoin(boolean) */
-    public Builder supportsJoin(boolean supportsJoin) {
-      delegate.supportsJoin(supportsJoin);
-      return this;
-    }
-
-    public Tracer build() {
-      return delegate.build().tracer();
-    }
-  }
 
   final Clock clock;
   final Propagation.Factory propagationFactory;
@@ -204,11 +122,6 @@ public Tracer withSampler(Sampler sampler) {
     );
   }
 
-  /** @deprecated use {@link Tracing#clock(TraceContext)} */
-  @Deprecated public Clock clock() {
-    return clock;
-  }
-
   /**
    * Explicitly creates a new trace. The result will be a root span (no parent span ID).
    *
@@ -329,11 +242,6 @@ public Span nextSpan(TraceContextOrSamplingFlags extracted) {
     throw new AssertionError("should not reach here");
   }
 
-  /** @deprecated Prefer {@link #withSampler(Sampler)} */
-  @Deprecated public Span newTrace(SamplingFlags samplingFlags) {
-    return toSpan(newContextBuilder(null, samplingFlags).build());
-  }
-
   /** Converts the context as-is to a Span object */
   public Span toSpan(TraceContext context) {
     if (context == null) throw new NullPointerException("context == null");
@@ -397,7 +305,7 @@ public SpanInScope withSpanInScope(@Nullable Span span) {
    *
    * <p>Unlike {@link CurrentSpanCustomizer}, this represents a single span. Accordingly, this
    * reference should not be saved as a field. That said, it is more efficient to save this result
-   * as a method-local variable vs repeated calls to {@link #currentSpanCustomizer()}.
+   * as a method-local variable vs repeated calls.
    */
   public SpanCustomizer currentSpanCustomizer() {
     TraceContext currentContext = currentTraceContext.get();