Restore CloseableTracerTest

tracing/src/main/java/com/palantir/tracing/ExposedTrace.java

@@ -22,13 +22,17 @@
 public final class ExposedTrace {
     private ExposedTrace() {}
 
-    /** @deprecated this is purely for migration purposes, do not use this. */
+    /**
+     * @deprecated this is purely for migration purposes, do not use this.
+     */
     @Deprecated
     public static boolean isObservable(Trace trace) {
         return trace.isObservable();
     }
 
-    /** @deprecated this is purely for migration purposes, do not use this. */
+    /**
+     * @deprecated this is purely for migration purposes, do not use this.
+     */
     @Deprecated
     public static String getTraceId(Trace trace) {
         return trace.getTraceId();

tracing/src/test/java/com/palantir/remoting3/tracing/CloseableTracerTest.java

@@ -0,0 +1,61 @@
+/*
+ * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.remoting3.tracing;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import com.palantir.remoting.api.tracing.Span;
+import com.palantir.remoting.api.tracing.SpanObserver;
+import com.palantir.remoting.api.tracing.SpanType;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class CloseableTracerTest {
+
+    @Mock
+    SpanObserver spanObserver;
+
+    @Captor
+    ArgumentCaptor<Span> captor;
+
+    @Before
+    public void before() {
+        Tracer.getAndClearTrace();
+        Tracer.setSampler(AlwaysSampler.INSTANCE);
+        Tracer.subscribe("foo", spanObserver);
+    }
+
+    @Test
+    public void startsAndClosesSpan() {
+        try (CloseableTracer tracer = CloseableTracer.startSpan("foo")) {
+            // do some work
+        }
+
+        verify(spanObserver, times(1)).consume(captor.capture());
+        Span span = captor.getValue();
+        assertThat(span.getOperation()).isEqualTo("foo");
+        assertThat(span.type()).isEqualTo(SpanType.LOCAL);
+    }
+}

tracing/src/test/java/com/palantir/remoting3/tracing/TestConvert.java

@@ -23,7 +23,7 @@ public final class TestConvert {
     private TestConvert() {}
 
     /** Warning - this is NOT a lossless copy, it loses the stack of OpenSpans in the original trace */
-    public static Trace toRemotingTraceIncompleteCopy(com.palantir.tracing.Trace newTrace) {
+    public static Trace toRemotingTraceIncomplete(com.palantir.tracing.Trace newTrace) {
         if (newTrace == null) {
             return null;
         }

tracing/src/test/java/com/palantir/remoting3/tracing/TracerTest.java

@@ -185,7 +185,7 @@ public void testInitTraceCallsSampler() throws Exception {
 
     @Test
     public void testTraceCopyIsIndependent() throws Exception {
-        Trace trace = ExposedTracer.copyTrace();
+        Trace trace = ExposedTracer.copyTraceIncomplete();
         trace.push(mock(OpenSpan.class));
         assertThat(Tracer.completeSpan().isPresent()).isFalse();
     }

tracing/src/test/java/com/palantir/remoting3/tracing/TracersTest.java

@@ -375,7 +375,7 @@ public void run() {
     }
 
     private static List<OpenSpan> getCurrentFullTrace() {
-        Trace trace = ExposedTracer.copyTrace();
+        Trace trace = ExposedTracer.copyTraceIncomplete();
         List<OpenSpan> spans = Lists.newArrayList();
         while (!trace.isEmpty()) {
             spans.add(trace.pop().get());

tracing/src/test/java/com/palantir/tracing/ExposedTracer.java

@@ -21,8 +21,8 @@
 public final class ExposedTracer {
     private ExposedTracer() {}
 
-    public static com.palantir.remoting3.tracing.Trace copyTrace() {
-        return TestConvert.toRemotingTraceIncompleteCopy(Tracer.copyTrace());
+    public static com.palantir.remoting3.tracing.Trace copyTraceIncomplete() {
+        return TestConvert.toRemotingTraceIncomplete(Tracer.copyTrace());
     }
 
     public static void setTrace(boolean isObservable, String traceId) {