From 4ab32b0b9520fc38169f1158bd3fc9d49f6cf1be Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler@newrelic.com>
Date: Fri, 13 Oct 2017 15:52:44 +0200
Subject: [PATCH] Add test for setting service/resource name via tag.

---
 .../com/datadoghq/trace/SpanFactory.groovy    |  2 +-
 .../datadoghq/trace/writer/DDApiTest.groovy   | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

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 7565b058a7..45970d33f5 100644
--- a/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
+++ b/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
@@ -14,7 +14,7 @@ class SpanFactory {
       "fakeType",
       Collections.emptyMap(),
       null,
-      null)
+      new DDTracer())
     return new DDSpan(timestampMicro, context)
   }
 
diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy b/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy
index ffe21673ac..c5c55655c2 100644
--- a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy
+++ b/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy
@@ -1,6 +1,5 @@
 package com.datadoghq.trace.writer
 
-import com.datadoghq.trace.DDTags
 import com.datadoghq.trace.Service
 import com.datadoghq.trace.SpanFactory
 import com.fasterxml.jackson.core.type.TypeReference
@@ -85,28 +84,28 @@ class DDApiTest extends Specification {
 
     // Populate thread info dynamically as it is different when run via gradle vs idea.
     where:
-    traces                        | expectedRequestBody
-    []                            | []
-    [SpanFactory.newSpanOf(1L)]   | [new TreeMap<>([
+    traces                                                               | expectedRequestBody
+    []                                                                   | []
+    [SpanFactory.newSpanOf(1L).setTag("service.name", "my-service")]     | [new TreeMap<>([
       "duration" : 0,
       "error"    : 0,
-      "meta"     : [(DDTags.THREAD_NAME): Thread.currentThread().getName(), (DDTags.THREAD_ID): "${Thread.currentThread().id}"],
+      "meta"     : ["thread.name": Thread.currentThread().getName(), "thread.id": "${Thread.currentThread().id}"],
       "name"     : "fakeOperation",
       "parent_id": 0,
       "resource" : "fakeResource",
-      "service"  : "fakeService",
+      "service"  : "my-service",
       "span_id"  : 1,
       "start"    : 1000,
       "trace_id" : 1,
       "type"     : "fakeType"
     ])]
-    [SpanFactory.newSpanOf(100L)] | [new TreeMap<>([
+    [SpanFactory.newSpanOf(100L).setTag("resource.name", "my-resource")] | [new TreeMap<>([
       "duration" : 0,
       "error"    : 0,
-      "meta"     : [(DDTags.THREAD_NAME): Thread.currentThread().getName(), (DDTags.THREAD_ID): "${Thread.currentThread().id}"],
+      "meta"     : ["thread.name": Thread.currentThread().getName(), "thread.id": "${Thread.currentThread().id}"],
       "name"     : "fakeOperation",
       "parent_id": 0,
-      "resource" : "fakeResource",
+      "resource" : "my-resource",
       "service"  : "fakeService",
       "span_id"  : 1,
       "start"    : 100000,
@@ -184,10 +183,10 @@ class DDApiTest extends Specification {
 
     // Populate thread info dynamically as it is different when run via gradle vs idea.
     where:
-    services                                                                          | expectedRequestBody
-    [:]                                                                               | [:]
-    ["my-service-name": new Service("my-service-name", "app-name", Service.AppType.CUSTOM)] | ["my-service-name": new TreeMap<>([
-      "app"     : "app-name",
+    services                                                                                   | expectedRequestBody
+    [:]                                                                                        | [:]
+    ["my-service-name": new Service("my-service-name", "my-app-name", Service.AppType.CUSTOM)] | ["my-service-name": new TreeMap<>([
+      "app"     : "my-app-name",
       "app_type": "custom"])
     ]
   }