suggestions and compare resource name

Author: amarziali

dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java

@@ -9,7 +9,6 @@
 import datadog.trace.common.writer.ListWriter;
 import datadog.trace.common.writer.Writer;
 import datadog.trace.context.TraceScope;
-import datadog.trace.core.DDSpan;
 import datadog.trace.test.util.DDJavaSpecification;
 import io.opentracing.Scope;
 import java.util.HashMap;
@@ -86,10 +85,9 @@ void shouldProduceBlackholeScopes() throws Exception {
     assertEquals(1, writer.size());
     assertEquals(2, writer.firstTrace().size());
     assertEquals(
-        Long.toString(((DDSpan) span.getDelegate()).context().getSpanId()),
-        span.context().toSpanId());
+        Long.toString(writer.firstTrace().get(0).context().getSpanId()), span.context().toSpanId());
     assertEquals(
-        Long.toString(((DDSpan) ((OTSpan) visibleSpan).getDelegate()).context().getSpanId()),
+        Long.toString(writer.firstTrace().get(1).context().getSpanId()),
         visibleSpan.context().toSpanId());
 
     tracer.close();

dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java

@@ -211,8 +211,10 @@ void nestedSpans() throws Exception {
     DDSpan childSpan = trace.get(1);
     assertEquals("someService", parentSpan.getServiceName());
     assertEquals("someOperation", parentSpan.getOperationName().toString());
+    assertEquals("someOperation", parentSpan.getResourceName().toString());
     assertEquals("someService", childSpan.getServiceName());
     assertEquals("someOperation2", childSpan.getOperationName().toString());
+    assertEquals("someOperation2", childSpan.getResourceName().toString());
     assertEquals(parentSpan.getSpanId(), childSpan.getParentId());
   }
 
@@ -248,6 +250,7 @@ void spanWithAsyncPropagation() throws Exception {
     DDSpan span = trace.get(0);
     assertEquals("someService", span.getServiceName());
     assertEquals("someOperation", span.getOperationName().toString());
+    assertEquals("someOperation", span.getResourceName().toString());
   }
 
   @Test
@@ -281,6 +284,14 @@ void spanInheritsAsyncPropagation() throws Exception {
     assertEquals(1, writer.size());
     List<DDSpan> trace = writer.get(0);
     assertEquals(2, trace.size());
+    DDSpan outerSpan = trace.get(0);
+    DDSpan innerSpan = trace.get(1);
+    assertEquals("someService", outerSpan.getServiceName());
+    assertEquals("someOperation", outerSpan.getOperationName().toString());
+    assertEquals("someOperation", outerSpan.getResourceName().toString());
+    assertEquals("otherService", innerSpan.getServiceName());
+    assertEquals("otherOperation", innerSpan.getOperationName().toString());
+    assertEquals("otherOperation", innerSpan.getResourceName().toString());
   }
 
   @Test
@@ -308,6 +319,7 @@ void spanContextIdsEqualTracerIds() throws Exception {
     DDSpan span = trace.get(0);
     assertEquals("someService", span.getServiceName());
     assertEquals("someOperation", span.getOperationName().toString());
+    assertEquals("someOperation", span.getResourceName().toString());
   }
 
   @Test
@@ -331,6 +343,8 @@ void closingScopeWhenNotOnTop() throws Exception {
     // then: 2 * scopeListener.afterScopeClosed(), 1 * traceInterceptor.onTraceComplete(...)
     verify(scopeListener, times(2)).afterScopeClosed();
     verify(traceInterceptor).onTraceComplete(any());
+    assertEquals(1, writer.size());
+    assertEquals(2, writer.get(0).size());
     verifyNoMoreInteractions(scopeListener, traceInterceptor);
     clearInvocations(scopeListener, traceInterceptor);
 
@@ -374,6 +388,8 @@ void closingScopeWhenNotOnTopInStrictMode() throws Exception {
     // 1 * scopeListener.afterScopeActivated() (scope restoration after strict mode exception)
     verify(scopeListener).afterScopeClosed();
     verify(traceInterceptor).onTraceComplete(any());
+    assertEquals(1, writer.size());
+    assertEquals(2, writer.get(0).size());
     verify(scopeListener).afterScopeActivated();
     verifyNoMoreInteractions(scopeListener, traceInterceptor);
     clearInvocations(scopeListener, traceInterceptor);
@@ -422,8 +438,10 @@ void injectAndExtractContext() throws Exception {
     DDSpan serverSpanDD = sortedTraces.get(1).get(0);
     assertEquals("someClientService", clientSpan.getServiceName());
     assertEquals("clientOperation", clientSpan.getOperationName().toString());
+    assertEquals("clientOperation", clientSpan.getResourceName().toString());
     assertEquals("someService", serverSpanDD.getServiceName());
     assertEquals("serverOperation", serverSpanDD.getOperationName().toString());
+    assertEquals("serverOperation", serverSpanDD.getResourceName().toString());
     assertEquals(clientSpan.context().getSpanId(), serverSpanDD.getParentId());
   }
 
@@ -456,5 +474,6 @@ void tolerateNullSpanActivation() throws Exception {
     DDSpan span = trace.get(0);
     assertEquals("someService", span.getServiceName());
     assertEquals("someOperation", span.getOperationName().toString());
+    assertEquals("someOperation", span.getResourceName().toString());
   }
 }