From df4e0eb76fb729ea89606575ca196b2439a5d805 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <guillaume@logmatic.io>
Date: Thu, 27 Apr 2017 18:45:20 +0200
Subject: [PATCH] adding some tests

---
 .../datadoghq/trace/impl/DDSpanContext.java   | 31 ------------
 .../com/datadoghq/trace/impl/DDTracer.java    |  2 -
 .../com/datadoghq/trace/impl/DDSpanTest.java  | 50 ++-----------------
 3 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java b/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
index 740b4c3694..4ca9666ec9 100644
--- a/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
+++ b/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
@@ -2,7 +2,6 @@ package com.datadoghq.trace.impl;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.opentracing.Span;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,7 +10,6 @@ import java.util.Map;
 
 public class DDSpanContext implements io.opentracing.SpanContext {
 
-    private static final String SPAN_TYPE_DEFAULT = "custom";
     // Opentracing attributes
     private final long traceId;
     private final long spanId;
@@ -21,11 +19,9 @@ public class DDSpanContext implements io.opentracing.SpanContext {
     private final String serviceName;
     private final String resourceName;
     private final boolean errorFlag;
-    private final Map<String, Object> metrics;
     private final String spanType;
     private final List<DDSpan> trace;
     // Others attributes
-    private boolean sampled;
     private DDTracer tracer;
 
 
@@ -37,9 +33,7 @@ public class DDSpanContext implements io.opentracing.SpanContext {
             String resourceName,
             Map<String, String> baggageItems,
             boolean errorFlag,
-            Map<String, Object> metrics,
             String spanType,
-            boolean sampled,
             List<DDSpan> trace,
             DDTracer tracer) {
 
@@ -55,9 +49,7 @@ public class DDSpanContext implements io.opentracing.SpanContext {
         this.serviceName = serviceName;
         this.resourceName = resourceName;
         this.errorFlag = errorFlag;
-        this.metrics = metrics;
         this.spanType = spanType;
-        this.sampled = sampled;
 
         if (trace == null) {
             this.trace = new ArrayList<DDSpan>();
@@ -68,22 +60,6 @@ public class DDSpanContext implements io.opentracing.SpanContext {
         this.tracer = tracer;
     }
 
-    protected static DDSpanContext newContext(long generateId, String serviceName, String resourceName) {
-        DDSpanContext context = new DDSpanContext(
-                // Opentracing attributes
-                generateId, generateId, 0L,
-                // DD attributes
-                serviceName, resourceName,
-                // Other stuff
-                null, false, null,
-                DDSpanContext.SPAN_TYPE_DEFAULT, true,
-                null, null
-
-        );
-        return context;
-    }
-
-
     public long getTraceId() {
         return this.traceId;
     }
@@ -108,18 +84,11 @@ public class DDSpanContext implements io.opentracing.SpanContext {
         return errorFlag;
     }
 
-    public Map<String, Object> getMetrics() {
-        return metrics;
-    }
 
     public String getSpanType() {
         return spanType;
     }
 
-    public boolean getSampled() {
-        return sampled;
-    }
-
     public void setBaggageItem(String key, String value) {
         this.baggageItems.put(key, value);
     }
diff --git a/src/main/java/com/datadoghq/trace/impl/DDTracer.java b/src/main/java/com/datadoghq/trace/impl/DDTracer.java
index b871437c67..8fbca6e456 100644
--- a/src/main/java/com/datadoghq/trace/impl/DDTracer.java
+++ b/src/main/java/com/datadoghq/trace/impl/DDTracer.java
@@ -159,9 +159,7 @@ public class DDTracer implements io.opentracing.Tracer {
                     this.resourceName,
                     this.parent == null ? null : p.getBaggageItems(),
                     errorFlag,
-                    null,
                     this.spanType,
-                    true,
                     this.parent == null ? null : p.getTrace(),
                     DDTracer.this
             );
diff --git a/src/test/java/com/datadoghq/trace/impl/DDSpanTest.java b/src/test/java/com/datadoghq/trace/impl/DDSpanTest.java
index c8693eaf82..8b2f6ef612 100644
--- a/src/test/java/com/datadoghq/trace/impl/DDSpanTest.java
+++ b/src/test/java/com/datadoghq/trace/impl/DDSpanTest.java
@@ -8,53 +8,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DDSpanTest {
 
 
-    @Test
-    public void testBaggageItem() {
-
-/*
-        DDSpanContext context = new DDSpanContext();
-
-        final String expectedBaggageItemKey = "fakeKey";
-        final String expectedBaggageItemValue = "fakeValue";
-
-
-        DDSpan span = new DDSpan(
-                null,
-                "fakeName",
-                null,
-                null,
-                null,
-                context
-        );
-
-        assertThat(span.context().baggageItems()).isEmpty();
-
-        span.setBaggageItem(expectedBaggageItemKey, expectedBaggageItemValue);
-
-        assertThat(span.getBaggageItem(expectedBaggageItemKey)).isEqualTo(expectedBaggageItemValue);*/
-
-    }
-
-    @Test
-    public void testGetSetOperationName() {
-
-       /* final String expectedOperationName1 = "fake";
-        final String expectedOperationName2 = "fake";
-
-        DDSpan span = new DDSpan(
-                null,
-                expectedOperationName1,
-                null,
-                null,
-                null,
-                null
-        );
-
-        assertThat(span.getOperationName()).isEqualTo(expectedOperationName1);
-
-        span.setOperationName(expectedOperationName2);
-        assertThat(span.getOperationName()).isEqualTo(expectedOperationName1);
-        */
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldHaveServiceName() {
+        new DDTracer().buildSpan("operationName").start();
     }
 
 }
\ No newline at end of file