From 861e0a7cacc75e323df16b7e28a17fbb2b0b19c6 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <gpolaert@gmail.com>
Date: Thu, 20 Jul 2017 17:11:40 +0200
Subject: [PATCH] Format and renaming issues

---
 .../java/com/datadoghq/trace/resolver/DDTracerFactory.java   | 3 +--
 .../java/com/datadoghq/trace/resolver/DDTracerResolver.java  | 1 -
 .../src/test/groovy/com/datadoghq/trace/SpanFactory.groovy   | 4 ++--
 .../com/datadoghq/trace/integration/SpanDecoratorTest.groovy | 5 ++---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java
index 10deb74716..ac5a24d52b 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java
@@ -10,11 +10,10 @@ import com.datadoghq.trace.writer.DDAgentWriter;
 import com.datadoghq.trace.writer.DDApi;
 import com.datadoghq.trace.writer.LoggingWriter;
 import com.datadoghq.trace.writer.Writer;
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
 
 /** Create a tracer from a configuration file */
 @Slf4j
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
index ee524cb7cd..77e3a11714 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
@@ -21,7 +21,6 @@ public class DDTracerResolver extends TracerResolver {
     //Create tracer from resource files
     tracer = DDTracerFactory.createFromConfigurationFile();
 
-
     return tracer;
   }
 
diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy b/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
index 151d6c5658..7565b058a7 100644
--- a/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
+++ b/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
@@ -18,7 +18,7 @@ class SpanFactory {
     return new DDSpan(timestampMicro, context)
   }
 
-  static newSpanTracer(DDTracer tracer) {
+  static newSpanOf(DDTracer tracer) {
     def context = new DDSpanContext(
       1L,
       1L,
@@ -32,6 +32,6 @@ class SpanFactory {
       Collections.emptyMap(),
       null,
       tracer)
-    return new DDSpan(0, context)
+    return new DDSpan(1, context)
   }
 }
diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy b/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
index 2a2b61cdd9..8efaf390c7 100644
--- a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
+++ b/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
@@ -25,12 +25,11 @@ class SpanDecoratorTest extends Specification {
     decorator.setSetValue("newBar")
     tracer.addDecorator(decorator)
 
-    def span = SpanFactory.newSpanTracer(tracer)
+    def span = SpanFactory.newSpanOf(tracer)
     new StringTag("foo").set(span, "bar")
 
     expect:
     span.getTags().containsKey("newFoo")
-    ((String) span.getTags().get("newFoo")) == "newBar"
-
+    span.getTags().get("newFoo") == "newBar"
   }
 }