From 93281f775a327751e4ccfe2625efe5c2edaf1f23 Mon Sep 17 00:00:00 2001
From: Andrew Kent <andrew.kent@datadoghq.com>
Date: Fri, 15 Jun 2018 13:42:29 -0700
Subject: [PATCH] Clean up akkahttp-server/lagom tests

---
 .../akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy     | 5 ++---
 .../src/test/groovy/AkkaHttpInstrumentationTest.groovy       | 2 +-
 .../play-2.4/src/latestDepTest/groovy/Play26Test.groovy      | 2 +-
 .../main/groovy/datadog/trace/agent/test/TagsAssert.groovy   | 4 ----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
index ac0cab207e..3cb6fcda8a 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
@@ -2,7 +2,6 @@ import akka.NotUsed
 import akka.stream.javadsl.Source
 import akka.stream.testkit.javadsl.TestSink
 import net.bytebuddy.utility.JavaModule
-import org.junit.After
 
 import static java.util.concurrent.TimeUnit.SECONDS
 import datadog.trace.agent.test.AgentTestRunner
@@ -34,9 +33,8 @@ class LagomTest extends AgentTestRunner {
 
       // Looks like a compiler/packaging issue on akka's end. Or maybe this interface is dynamically generated.
       return false
-    } else {
-      return super.onInstrumentationError(typeName, classLoader, module, loaded, throwable)
     }
+    return super.onInstrumentationError(typeName, classLoader, module, loaded, throwable)
   }
 
   def setupSpec() {
@@ -94,6 +92,7 @@ class LagomTest extends AgentTestRunner {
         }
         span(1) {
           childOf span(0)
+          operationName 'EchoServiceImpl.tracedMethod'
         }
       }
     }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy
index 386ce81503..0bfc78045a 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpInstrumentationTest.groovy
@@ -103,7 +103,7 @@ class AkkaHttpInstrumentationTest extends AgentTestRunner {
             "error" true
             "error.type" RuntimeException.name
             "error.msg" errorMessage
-            "error.stack" tag("error.stack")
+            "error.stack" String
           }
         }
       }
diff --git a/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy b/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
index bb7df46988..1f9cdcbb75 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
+++ b/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
@@ -177,7 +177,7 @@ class Play26Test extends AgentTestRunner {
             "error" true
             "error.msg" "oh no"
             "error.type" RuntimeException.getName()
-            "error.stack" tag("error.stack")
+            "error.stack" String
           }
         }
       }
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TagsAssert.groovy
index 955f3eb086..d3f4dbf7b6 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TagsAssert.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/TagsAssert.groovy
@@ -61,8 +61,4 @@ class TagsAssert {
   void assertTagsAllVerified() {
     assert tags.keySet() == assertedTags
   }
-
-  Object tag(String tagName) {
-    return tags[tagName]
-  }
 }