Respond to PR comments

opentracing · May 11, 2017 · cde0b63 · cde0b63
1 parent e723a0b
commit cde0b63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/opentracing-api/src/main/java/io/opentracing/BaseSpan.java b/opentracing-api/src/main/java/io/opentracing/BaseSpan.java
@@ -38,7 +38,6 @@ public interface BaseSpan<S extends BaseSpan> {
     /**
      * Set a key:value tag on the Span.
      */
-    // overloaded 3x to support the BasicType concern
     S setTag(String key, String value);
 
     /** Same as {@link #setTag(String, String)}, but for boolean values. */
@@ -148,12 +147,15 @@ public interface BaseSpan<S extends BaseSpan> {
      * or
      * {@code span.log(timestampMicroseconds, Map.of("event", "exception", "payload", stackTrace))}
      **/
+    @Deprecated
     S log(String eventName, /* @Nullable */ Object payload);
+
     /**
      * @deprecated use {@link #log(Map)} like this
      * {@code span.log(timestampMicroseconds, Map.of("event", "timeout"))}
      * or
      * {@code span.log(timestampMicroseconds, Map.of("event", "exception", "payload", stackTrace))}
      **/
+    @Deprecated
     S log(long timestampMicroseconds, String eventName, /* @Nullable */ Object payload);
 }
diff --git a/opentracing-api/src/main/java/io/opentracing/Tracer.java b/opentracing-api/src/main/java/io/opentracing/Tracer.java
@@ -111,7 +111,7 @@ interface SpanBuilder {
          * <p>
          * If parent==null, this is a noop.
          */
-        SpanBuilder asChildOf(BaseSpan parent);
+        SpanBuilder asChildOf(BaseSpan<?> parent);
 
         /**
          * Add a reference from the Span being built to a distinct (usually parent) Span. May be called multiple times
@@ -201,6 +201,7 @@ interface SpanBuilder {
         /**
          * @deprecated use {@link #startManual} or {@link #startActive} instead.
          */
+        @Deprecated
         Span start();
     }
 }
diff --git a/opentracing-util/src/test/java/io/opentracing/util/ThreadLocalActiveSpanSourceTest.java b/opentracing-util/src/test/java/io/opentracing/util/ThreadLocalActiveSpanSourceTest.java
@@ -39,9 +39,7 @@ public void missingActiveSpan() throws Exception {
     public void makeActiveSpan() throws Exception {
         Span span = mock(Span.class);
 
-        // We can't use 1.7 features like try-with-resources in this repo -- argh.
-        //
-        // F*** IT, WE'LL DO IT LIVE!
+        // We can't use 1.7 features like try-with-resources in this repo without meddling with pom details for tests.
         ActiveSpan activeSpan = source.makeActive(span);
         try {
             assertNotNull(activeSpan);