From 346e8bddf5cdfe3ed4716e26f37899609c2850af Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 9 Dec 2019 18:35:02 -0800 Subject: [PATCH 1/2] Remove thread name and thread id tags --- .../src/lagomTest/groovy/LagomTest.groovy | 3 -- .../AkkaHttpClientInstrumentationTest.groovy | 1 - .../AkkaHttpServerInstrumentationTest.groovy | 1 - .../src/test/groovy/AWSClientTest.groovy | 7 ---- .../groovy/AWSClientTest.groovy | 7 ---- .../src/test/groovy/AwsClientTest.groovy | 6 ---- .../groovy/util/AbstractCouchbaseTest.groovy | 1 - .../src/test/groovy/CouchbaseSpanUtil.groovy | 1 - .../test/groovy/CassandraClientTest.groovy | 1 - .../src/test/groovy/ViewRenderTest.groovy | 1 - .../src/test/groovy/DropwizardTest.groovy | 2 -- .../Elasticsearch6RestClientTest.groovy | 2 -- .../Elasticsearch5RestClientTest.groovy | 2 -- .../Elasticsearch6RestClientTest.groovy | 2 -- .../Elasticsearch6RestClientTest.groovy | 2 -- .../Elasticsearch2NodeClientTest.groovy | 8 ----- .../Elasticsearch2TransportClientTest.groovy | 8 ----- .../Elasticsearch2SpringRepositoryTest.groovy | 10 ------ .../Elasticsearch2SpringTemplateTest.groovy | 9 ----- .../Elasticsearch2NodeClientTest.groovy | 8 ----- .../Elasticsearch2TransportClientTest.groovy | 8 ----- .../Elasticsearch2SpringRepositoryTest.groovy | 10 ------ .../Elasticsearch2SpringTemplateTest.groovy | 9 ----- .../Elasticsearch53NodeClientTest.groovy | 8 ----- .../Elasticsearch53TransportClientTest.groovy | 7 ---- ...Elasticsearch53SpringRepositoryTest.groovy | 18 ---------- .../Elasticsearch53SpringTemplateTest.groovy | 9 ----- .../Elasticsearch5NodeClientTest.groovy | 8 ----- .../Elasticsearch5TransportClientTest.groovy | 7 ---- .../Elasticsearch6NodeClientTest.groovy | 7 ---- .../Elasticsearch6TransportClientTest.groovy | 7 ---- .../test/groovy/GlassFishServerTest.groovy | 1 - .../AbstractGoogleHttpClientTest.groovy | 1 - .../src/test/groovy/GrpcStreamingTest.groovy | 4 --- .../grpc-1.5/src/test/groovy/GrpcTest.groovy | 10 ------ .../src/test/groovy/CriteriaTest.groovy | 4 --- .../core-3.3/src/test/groovy/QueryTest.groovy | 11 ------ .../src/test/groovy/SessionTest.groovy | 35 ------------------- .../src/test/groovy/CriteriaTest.groovy | 4 --- .../core-4.0/src/test/groovy/QueryTest.groovy | 11 ------ .../src/test/groovy/SessionTest.groovy | 32 ----------------- .../src/test/groovy/ProcedureCallTest.groovy | 7 ---- .../src/test/groovy/SpringJpaTest.groovy | 8 ----- .../test/groovy/HttpUrlConnectionTest.groovy | 10 ------ .../src/test/groovy/UrlConnectionTest.groovy | 5 --- .../groovy/HystrixObservableChainTest.groovy | 5 --- .../test/groovy/HystrixObservableTest.groovy | 9 ----- .../src/test/groovy/HystrixTest.groovy | 6 ---- .../src/slickTest/groovy/SlickTest.groovy | 2 -- ...JaxRsAnnotationsInstrumentationTest.groovy | 4 --- ...JaxRsAnnotationsInstrumentationTest.groovy | 4 --- .../groovy/JDBCInstrumentationTest.groovy | 9 ----- .../src/test/groovy/JedisClientTest.groovy | 5 --- .../src/test/groovy/JettyHandlerTest.groovy | 1 - .../src/latestDepTest/groovy/JMS2Test.groovy | 4 --- .../jms/src/test/groovy/JMS1Test.groovy | 5 --- .../JSPInstrumentationBasicTests.groovy | 24 ------------- .../JSPInstrumentationForwardTests.groovy | 31 ---------------- .../src/test/groovy/KafkaClientTest.groovy | 4 --- .../src/test/groovy/KafkaStreamsTest.groovy | 5 --- .../test/groovy/LettuceAsyncClientTest.groovy | 12 ------- .../groovy/LettuceReactiveClientTest.groovy | 8 ----- .../test/groovy/LettuceSyncClientTest.groovy | 11 ------ .../src/test/groovy/MongoClientTest.groovy | 1 - .../test/groovy/MongoAsyncClientTest.groovy | 1 - .../src/test/groovy/Netty40ClientTest.groovy | 1 - .../src/test/groovy/Netty41ClientTest.groovy | 2 -- .../test/groovy/server/PlayServerTest.groovy | 1 - .../test/groovy/server/PlayServerTest.groovy | 2 -- .../src/test/groovy/RabbitMQTest.groovy | 2 -- .../src/test/groovy/RatpackOtherTest.groovy | 2 -- .../server/RatpackHttpServerTest.groovy | 2 -- .../src/test/groovy/ReactorCoreTest.groovy | 10 ------ .../src/test/groovy/JettyServlet2Test.groovy | 1 - .../test/groovy/AbstractServlet3Test.groovy | 1 - .../src/test/groovy/JettyServlet3Test.groovy | 1 - .../src/test/groovy/TomcatServlet3Test.groovy | 1 - .../src/test/groovy/SparkJavaBasedTest.groovy | 1 - .../src/test/groovy/SpringJpaTest.groovy | 13 ------- .../src/test/groovy/SpringWebfluxTest.groovy | 18 ---------- .../client/SpringWebfluxHttpClientTest.groovy | 1 - .../groovy/test/SpringBootBasedTest.groovy | 3 -- .../spymemcached/SpymemcachedTest.groovy | 3 -- .../ConfiguredTraceAnnotationsTest.groovy | 1 - .../test/groovy/TraceAnnotationsTest.groovy | 18 ---------- .../src/test/groovy/TraceConfigTest.groovy | 1 - .../test/groovy/test/TwilioClientTest.groovy | 25 ------------- .../agent/test/asserts/TagsAssert.groovy | 13 +------ .../agent/test/base/HttpClientTest.groovy | 1 - .../agent/test/base/HttpServerTest.groovy | 2 -- .../test/server/http/TestHttpServer.groovy | 1 - .../trace/agent/test/utils/TraceUtils.groovy | 1 - .../main/java/datadog/trace/api/DDTags.java | 2 -- .../datadog/opentracing/DDSpanContext.java | 8 ----- .../opentracing/DDSpanBuilderTest.groovy | 14 -------- .../datadog/trace/DDSpanContextTest.groovy | 15 ++++---- 96 files changed, 7 insertions(+), 634 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 ea7e10276cd7..cfb33c21ebd2 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 @@ -69,7 +69,6 @@ class LagomTest extends AgentTestRunner { "$Tags.HTTP_URL" "ws://localhost:${server.port()}/echo" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 101 - defaultTags() } } span(1) { @@ -78,7 +77,6 @@ class LagomTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" 'EchoServiceImpl.tracedMethod' "$Tags.COMPONENT" "trace" - defaultTags() } } } @@ -110,7 +108,6 @@ class LagomTest extends AgentTestRunner { "$Tags.HTTP_URL" "ws://localhost:${server.port()}/error" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 500 - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy index 075cd02b923c..683b73d4382f 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy @@ -75,7 +75,6 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest { "error.type" { it == null || it == Exception.name } "error.stack" { it == null || it instanceof String } } - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy b/dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy index f984b7c948dc..1dd0b4668fbe 100644 --- a/dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy +++ b/dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy @@ -68,7 +68,6 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest { parent() errored false tags { - defaultTags() } } span(1) { @@ -104,7 +103,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } span(2) { @@ -122,7 +120,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } } @@ -171,7 +168,6 @@ class HttpUrlConnectionTest extends HttpClientTest { parent() errored false tags { - defaultTags() } } span(1) { @@ -189,7 +185,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } span(2) { @@ -207,7 +202,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } } @@ -241,7 +235,6 @@ class HttpUrlConnectionTest extends HttpClientTest { parent() errored false tags { - defaultTags() } } span(1) { @@ -259,7 +252,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } } @@ -309,7 +301,6 @@ class HttpUrlConnectionTest extends HttpClientTest { parent() errored false tags { - defaultTags() } } span(1) { @@ -327,7 +318,6 @@ class HttpUrlConnectionTest extends HttpClientTest { "$Tags.HTTP_URL" "$url" "$Tags.HTTP_METHOD" "POST" "$Tags.HTTP_STATUS" STATUS - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy b/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy index b77caab9f07e..5707e37f907b 100644 --- a/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy +++ b/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy @@ -38,7 +38,6 @@ class UrlConnectionTest extends AgentTestRunner { errored true tags { errorTags ConnectException, String - defaultTags() } } span(1) { @@ -55,7 +54,6 @@ class UrlConnectionTest extends AgentTestRunner { "$Tags.HTTP_URL" "$url/" "$Tags.HTTP_METHOD" "GET" errorTags ConnectException, String - defaultTags() } } } @@ -92,7 +90,6 @@ class UrlConnectionTest extends AgentTestRunner { errored true tags { errorTags IllegalArgumentException, String - defaultTags() } } span(1) { @@ -107,7 +104,6 @@ class UrlConnectionTest extends AgentTestRunner { // FIXME: These tags really make no sense for non-http connections, why do we set them? "$Tags.HTTP_URL" "$url" errorTags IllegalArgumentException, String - defaultTags() } } } @@ -139,7 +135,6 @@ class UrlConnectionTest extends AgentTestRunner { errored true tags { errorTags ClassNotFoundException, String - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy index ae9c26379401..9da7643843ca 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy @@ -78,7 +78,6 @@ class HystrixObservableChainTest extends AgentTestRunner { errored false tags { "$DDTags.SPAN_TYPE" null - defaultTags() } } span(1) { @@ -92,7 +91,6 @@ class HystrixObservableChainTest extends AgentTestRunner { "hystrix.command" "HystrixObservableChainTest\$2" "hystrix.group" "OtherGroup" "hystrix.circuit-open" false - defaultTags() } } span(2) { @@ -103,7 +101,6 @@ class HystrixObservableChainTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "HystrixObservableChainTest\$2.tracedMethod" "$DDTags.SPAN_TYPE" null "$Tags.COMPONENT" "trace" - defaultTags() } } span(3) { @@ -117,7 +114,6 @@ class HystrixObservableChainTest extends AgentTestRunner { "hystrix.command" "HystrixObservableChainTest\$1" "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false - defaultTags() } } span(4) { @@ -128,7 +124,6 @@ class HystrixObservableChainTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "HystrixObservableChainTest\$1.tracedMethod" "$DDTags.SPAN_TYPE" null "$Tags.COMPONENT" "trace" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy index b4ee0fb9c3b1..6dbfef738c71 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy @@ -70,7 +70,6 @@ class HystrixObservableTest extends AgentTestRunner { errored false tags { "$DDTags.SPAN_TYPE" null - defaultTags() } } span(1) { @@ -84,7 +83,6 @@ class HystrixObservableTest extends AgentTestRunner { "hystrix.command" "HystrixObservableTest\$1" "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false - defaultTags() } } span(2) { @@ -95,7 +93,6 @@ class HystrixObservableTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "HystrixObservableTest\$1.tracedMethod" "$DDTags.SPAN_TYPE" null "$Tags.COMPONENT" "trace" - defaultTags() } } } @@ -176,7 +173,6 @@ class HystrixObservableTest extends AgentTestRunner { errored false tags { "$DDTags.SPAN_TYPE" null - defaultTags() } } span(1) { @@ -191,7 +187,6 @@ class HystrixObservableTest extends AgentTestRunner { "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false errorTags(IllegalArgumentException) - defaultTags() } } span(2) { @@ -205,7 +200,6 @@ class HystrixObservableTest extends AgentTestRunner { "hystrix.command" "HystrixObservableTest\$2" "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false - defaultTags() } } } @@ -292,7 +286,6 @@ class HystrixObservableTest extends AgentTestRunner { tags { "$DDTags.SPAN_TYPE" null errorTags(HystrixRuntimeException, "HystrixObservableTest\$3 failed and no fallback available.") - defaultTags() } } span(1) { @@ -307,7 +300,6 @@ class HystrixObservableTest extends AgentTestRunner { "hystrix.group" "FailingGroup" "hystrix.circuit-open" false errorTags(IllegalArgumentException) - defaultTags() } } span(2) { @@ -322,7 +314,6 @@ class HystrixObservableTest extends AgentTestRunner { "hystrix.group" "FailingGroup" "hystrix.circuit-open" false errorTags(UnsupportedOperationException, "No fallback available.") - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy index 5ae4d58530cd..08059bcd8880 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy @@ -50,7 +50,6 @@ class HystrixTest extends AgentTestRunner { errored false tags { "$DDTags.SPAN_TYPE" null - defaultTags() } } span(1) { @@ -64,7 +63,6 @@ class HystrixTest extends AgentTestRunner { "hystrix.command" "HystrixTest\$1" "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false - defaultTags() } } span(2) { @@ -75,7 +73,6 @@ class HystrixTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "HystrixTest\$1.tracedMethod" "$DDTags.SPAN_TYPE" null "$Tags.COMPONENT" "trace" - defaultTags() } } } @@ -124,7 +121,6 @@ class HystrixTest extends AgentTestRunner { errored false tags { "$DDTags.SPAN_TYPE" null - defaultTags() } } span(1) { @@ -139,7 +135,6 @@ class HystrixTest extends AgentTestRunner { "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false errorTags(IllegalArgumentException) - defaultTags() } } span(2) { @@ -153,7 +148,6 @@ class HystrixTest extends AgentTestRunner { "hystrix.command" "HystrixTest\$2" "hystrix.group" "ExampleGroup" "hystrix.circuit-open" false - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy index 5cac5f5a863b..020e445ea1bb 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy +++ b/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy @@ -25,7 +25,6 @@ class SlickTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" "SlickUtils.startQuery" "$Tags.COMPONENT" "trace" - defaultTags() } } span(1) { @@ -43,7 +42,6 @@ class SlickTest extends AgentTestRunner { "$Tags.DB_USER" SlickUtils.Username() "$Tags.DB_STATEMENT" SlickUtils.TestQuery() "span.origin.type" "org.h2.jdbc.JdbcPreparedStatement" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy index 64e2454c4847..0b4b66ec18ec 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy @@ -35,7 +35,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "POST /a" "$DDTags.SPAN_TYPE" "web" "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } @@ -58,7 +57,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" name "$Tags.COMPONENT" "jax-rs" - defaultTags() } } span(1) { @@ -68,7 +66,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "${className}.call" "$DDTags.SPAN_TYPE" "web" "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } @@ -156,7 +153,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { span(0) { operationName "test" tags { - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy index 08b34f329362..b77468e53497 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy @@ -35,7 +35,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "POST /a" "$DDTags.SPAN_TYPE" "web" "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } @@ -58,7 +57,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" name "$Tags.COMPONENT" "jax-rs" - defaultTags() } } span(1) { @@ -68,7 +66,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" "${className}.call" "$DDTags.SPAN_TYPE" "web" "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } @@ -156,7 +153,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { span(0) { operationName "test" tags { - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy index e02585a38f6a..7cbd7550ac99 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy @@ -186,7 +186,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -247,7 +246,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -300,7 +298,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -353,7 +350,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -406,7 +402,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -462,7 +457,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -535,7 +529,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { } "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -605,7 +598,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { "$Tags.DB_USER" "SA" "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } @@ -625,7 +617,6 @@ class JDBCInstrumentationTest extends AgentTestRunner { "$Tags.DB_USER" "SA" "$Tags.DB_STATEMENT" query "span.origin.type" String - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy index bb063d30e032..1f272b689a58 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy @@ -59,7 +59,6 @@ class JedisClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -85,7 +84,6 @@ class JedisClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -99,7 +97,6 @@ class JedisClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "GET" - defaultTags() } } } @@ -125,7 +122,6 @@ class JedisClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -139,7 +135,6 @@ class JedisClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "RANDOMKEY" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy b/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy index 546ff251fe7a..e998ccfa069a 100644 --- a/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy +++ b/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy @@ -138,7 +138,6 @@ class JettyHandlerTest extends HttpServerTest { "error.type" { it == null || it == Exception.name } "error.stack" { it == null || it instanceof String } } - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy b/dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy index d4aad7e93ff2..ed0d04692f39 100644 --- a/dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy +++ b/dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy @@ -167,7 +167,6 @@ class JMS2Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" HornetQMessageConsumer.name - defaultTags() } } } @@ -205,7 +204,6 @@ class JMS2Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" HornetQMessageConsumer.name - defaultTags() } } } @@ -234,7 +232,6 @@ class JMS2Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER "span.origin.type" HornetQMessageProducer.name - defaultTags() } } } @@ -258,7 +255,6 @@ class JMS2Test extends AgentTestRunner { "${Tags.COMPONENT}" "jms" "${Tags.SPAN_KIND}" "consumer" "span.origin.type" origin.name - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy b/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy index df6afcddd007..e1f66de5134c 100644 --- a/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy +++ b/dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy @@ -130,7 +130,6 @@ class JMS1Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" ActiveMQMessageConsumer.name - defaultTags() } } } @@ -168,7 +167,6 @@ class JMS1Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" ActiveMQMessageConsumer.name - defaultTags() } } } @@ -219,7 +217,6 @@ class JMS1Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" ActiveMQMessageConsumer.name - defaultTags() } } } @@ -251,7 +248,6 @@ class JMS1Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER "span.origin.type" ActiveMQMessageProducer.name - defaultTags() } } } @@ -275,7 +271,6 @@ class JMS1Test extends AgentTestRunner { "$Tags.COMPONENT" "jms" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "span.origin.type" origin.name - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy index 34f86cb8bb32..06072e4c8e88 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy +++ b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy @@ -104,7 +104,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/$jspFileName" - defaultTags() } } span(1) { @@ -117,7 +116,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" jspClassName "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -130,7 +128,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.$jspClassNamePrefix$jspClassName" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -176,7 +173,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/getQuery.jsp" - defaultTags() } } span(1) { @@ -189,7 +185,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "getQuery_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -202,7 +197,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.getQuery_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -245,7 +239,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/post.jsp" - defaultTags() } } span(1) { @@ -258,7 +251,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "post_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -271,7 +263,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.post_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -318,7 +309,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { return errorMessageOptional || tagErrorMsg instanceof String } "error.stack" String - defaultTags() } } span(1) { @@ -338,7 +328,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { return errorMessageOptional || tagErrorMsg instanceof String } "error.stack" String - defaultTags() } } span(2) { @@ -351,7 +340,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.$jspClassName" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -396,7 +384,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/includes/includeHtml.jsp" - defaultTags() } } span(1) { @@ -409,7 +396,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "includeHtml_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -422,7 +408,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.includes.includeHtml_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -461,7 +446,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/includes/includeMulti.jsp" - defaultTags() } } span(1) { @@ -474,7 +458,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "includeMulti_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -487,7 +470,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "javaLoopH2_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(3) { @@ -500,7 +482,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.common.javaLoopH2_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(4) { @@ -513,7 +494,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "span.origin.type" "javaLoopH2_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(5) { @@ -526,7 +506,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.common.javaLoopH2_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(6) { @@ -539,7 +518,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.includes.includeMulti_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -579,7 +557,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "servlet.path" "/$jspFileName" errorTags(JasperException, String) - defaultTags() } } span(1) { @@ -593,7 +570,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { "jsp.classFQCN" "org.apache.jsp.$jspClassNamePrefix$jspClassName" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" errorTags(JasperException, String) - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy index dbdb24126e20..7274f8aaabf9 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy +++ b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy @@ -103,7 +103,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/$forwardFromFileName" - defaultTags() } } span(1) { @@ -116,7 +115,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" jspForwardFromClassName "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -130,7 +128,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/$forwardFromFileName" "jsp.requestURL" baseUrl + "/$forwardDestFileName" - defaultTags() } } span(3) { @@ -143,7 +140,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.$jspForwardDestClassPrefix$jspForwardDestClassName" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(4) { @@ -156,7 +152,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.$jspForwardFromClassPrefix$jspForwardFromClassName" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -200,7 +195,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/forwards/forwardToHtml.jsp" - defaultTags() } } span(1) { @@ -213,7 +207,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "forwardToHtml_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -226,7 +219,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToHtml_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -265,7 +257,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/forwards/forwardToIncludeMulti.jsp" - defaultTags() } } span(1) { @@ -278,7 +269,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "forwardToIncludeMulti_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -292,7 +282,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/forwards/forwardToIncludeMulti.jsp" "jsp.requestURL" baseUrl + "/includes/includeMulti.jsp" - defaultTags() } } span(3) { @@ -306,7 +295,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/forwards/forwardToIncludeMulti.jsp" "jsp.requestURL" baseUrl + "/includes/includeMulti.jsp" - defaultTags() } } span(4) { @@ -319,7 +307,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.common.javaLoopH2_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(5) { @@ -333,7 +320,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/forwards/forwardToIncludeMulti.jsp" "jsp.requestURL" baseUrl + "/includes/includeMulti.jsp" - defaultTags() } } span(6) { @@ -346,7 +332,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.common.javaLoopH2_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(7) { @@ -359,7 +344,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.includes.includeMulti_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(8) { @@ -372,7 +356,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToIncludeMulti_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -411,7 +394,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/forwards/forwardToJspForward.jsp" - defaultTags() } } span(1) { @@ -424,7 +406,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "forwardToJspForward_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -438,7 +419,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/forwards/forwardToJspForward.jsp" "jsp.requestURL" baseUrl + "/forwards/forwardToSimpleJava.jsp" - defaultTags() } } span(3) { @@ -452,7 +432,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.forwardOrigin" "/forwards/forwardToJspForward.jsp" "jsp.requestURL" baseUrl + "/common/loop.jsp" - defaultTags() } } span(4) { @@ -465,7 +444,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.common.loop_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(5) { @@ -478,7 +456,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToSimpleJava_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } span(6) { @@ -491,7 +468,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToJspForward_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -531,7 +507,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "servlet.path" "/forwards/forwardToCompileError.jsp" errorTags(JasperException, String) - defaultTags() } } span(1) { @@ -545,7 +520,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl errorTags(JasperException, String) - defaultTags() } } span(2) { @@ -559,7 +533,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "jsp.classFQCN" "org.apache.jsp.compileError_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" errorTags(JasperException, String) - defaultTags() } } span(3) { @@ -572,7 +545,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToCompileError_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } @@ -611,7 +583,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "org.apache.catalina.core.ApplicationFilterChain" "servlet.context" "/$jspWebappContext" "servlet.path" "/forwards/forwardToNonExistent.jsp" - defaultTags() } } span(1) { @@ -624,7 +595,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "span.origin.type" "forwardToNonExistent_jsp" "servlet.context" "/$jspWebappContext" "jsp.requestURL" reqUrl - defaultTags() } } span(2) { @@ -637,7 +607,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { "servlet.context" "/$jspWebappContext" "jsp.classFQCN" "org.apache.jsp.forwards.forwardToNonExistent_jsp" "jsp.compiler" "org.apache.jasper.compiler.JDTCompiler" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy index db7842f476d5..e1cb128f712e 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy @@ -92,7 +92,6 @@ class KafkaClientTest extends AgentTestRunner { "$DDTags.SPAN_TYPE" "queue" "$Tags.COMPONENT" "java-kafka" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - defaultTags() } } } @@ -110,7 +109,6 @@ class KafkaClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "partition" { it >= 0 } "offset" 0 - defaultTags(true) } } } @@ -175,7 +173,6 @@ class KafkaClientTest extends AgentTestRunner { "$Tags.COMPONENT" "java-kafka" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER "kafka.partition" { it >= 0 } - defaultTags(true) } } } @@ -193,7 +190,6 @@ class KafkaClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "partition" { it >= 0 } "offset" 0 - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy index ec83553abcc8..ec66c6b8ade6 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy @@ -137,7 +137,6 @@ class KafkaStreamsTest extends AgentTestRunner { "$DDTags.SPAN_TYPE" "queue" "$Tags.COMPONENT" "java-kafka" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - defaultTags() } } } @@ -155,7 +154,6 @@ class KafkaStreamsTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER "partition" { it >= 0 } "offset" 0 - defaultTags(true) } } } @@ -173,7 +171,6 @@ class KafkaStreamsTest extends AgentTestRunner { "$DDTags.SPAN_TYPE" "queue" "$Tags.COMPONENT" "java-kafka" "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - defaultTags() } } @@ -192,7 +189,6 @@ class KafkaStreamsTest extends AgentTestRunner { "partition" { it >= 0 } "offset" 0 "asdf" "testing" - defaultTags(true) } } } @@ -211,7 +207,6 @@ class KafkaStreamsTest extends AgentTestRunner { "partition" { it >= 0 } "offset" 0 "testing" 123 - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy index ad385e68f3b9..a50fe5f5021c 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy @@ -129,7 +129,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.PEER_PORT" port "$Tags.DB_TYPE" "redis" "db.redis.dbIndex" 0 - defaultTags() } } } @@ -169,7 +168,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.DB_TYPE" "redis" "db.redis.dbIndex" 0 errorTags CompletionException, String - defaultTags() } } } @@ -196,7 +194,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -234,7 +231,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -286,7 +282,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -324,7 +319,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -381,7 +375,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -397,7 +390,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -444,7 +436,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" errorTags(IllegalStateException, "TestException") - defaultTags() } } } @@ -485,7 +476,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "db.command.cancelled" true - defaultTags() } } } @@ -510,7 +500,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -536,7 +525,6 @@ class LettuceAsyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy index 7a22bdc0ec7f..6471afd6baa8 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy @@ -99,7 +99,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -128,7 +127,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -165,7 +163,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -200,7 +197,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -226,7 +222,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "db.command.results.count" 157 - defaultTags() } } } @@ -253,7 +248,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.DB_TYPE" "redis" "db.command.cancelled" true "db.command.results.count" 2 - defaultTags() } } } @@ -290,7 +284,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -315,7 +308,6 @@ class LettuceReactiveClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy index 44b3b30c6230..af94f5849e60 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy @@ -109,7 +109,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.PEER_PORT" port "$Tags.DB_TYPE" "redis" "db.redis.dbIndex" 0 - defaultTags() } } } @@ -146,7 +145,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.DB_TYPE" "redis" "db.redis.dbIndex" 0 errorTags CompletionException, String - defaultTags() } } } @@ -172,7 +170,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -198,7 +195,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -224,7 +220,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -250,7 +245,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -276,7 +270,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -302,7 +295,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -328,7 +320,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -353,7 +344,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } @@ -378,7 +368,6 @@ class LettuceSyncClientTest extends AgentTestRunner { "$Tags.COMPONENT" "redis-client" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoClientTest.groovy index ded584c38f86..4ba05e6a7fb9 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoClientTest.groovy @@ -256,7 +256,6 @@ class MongoClientTest extends MongoBaseTest { } "$Tags.DB_TYPE" "mongo" "$Tags.DB_INSTANCE" instance - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/mongo/driver-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy b/dd-java-agent/instrumentation/mongo/driver-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy index 9e7513b0ddc6..db2ca09e054a 100644 --- a/dd-java-agent/instrumentation/mongo/driver-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/mongo/driver-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy @@ -292,7 +292,6 @@ class MongoAsyncClientTest extends MongoBaseTest { "$Tags.DB_STATEMENT" statementEval "$Tags.DB_TYPE" "mongo" "$Tags.DB_INSTANCE" instance - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy index 607a2ee1c930..439a2b7fbcc2 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy +++ b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy @@ -91,7 +91,6 @@ class Netty40ClientTest extends HttpClientTest { // Older versions use 'java.net.ConnectException' and do not have 'io.netty.channel.AbstractChannel$AnnotatedConnectException' } errorTags errorClass, "Connection refused: localhost/127.0.0.1:$UNUSABLE_PORT" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy index 8866cf5c70da..c1ac9553fbce 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy +++ b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy @@ -95,7 +95,6 @@ class Netty41ClientTest extends HttpClientTest { tags { "$Tags.COMPONENT" "netty" errorTags AbstractChannel.AnnotatedConnectException, "Connection refused: localhost/127.0.0.1:$UNUSABLE_PORT" - defaultTags() } } } @@ -199,7 +198,6 @@ class Netty41ClientTest extends HttpClientTest { tags { "$DDTags.RESOURCE_NAME" "AnnotatedClass.makeRequestUnderTrace" "$Tags.COMPONENT" "trace" - defaultTags() } } clientSpan(it, 2, span(1), method) diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy index 5dc765b2ebc3..7fd5e4a72adf 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy +++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy @@ -96,7 +96,6 @@ class PlayServerTest extends HttpServerTest { if (endpoint == EXCEPTION) { errorTags(Exception, EXCEPTION.body) } - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy index 9e7bb8644a7e..22913be9a637 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy +++ b/dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy @@ -98,7 +98,6 @@ class PlayServerTest extends HttpServerTest { if (endpoint == EXCEPTION) { errorTags(Exception, EXCEPTION.body) } - defaultTags() } } } @@ -125,7 +124,6 @@ class PlayServerTest extends HttpServerTest { "error.type" { it == null || it == Exception.name } "error.stack" { it == null || it instanceof String } } - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy index 12dfbe7cdd48..67d4eec89615 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy @@ -109,7 +109,6 @@ class RabbitMQTest extends AgentTestRunner { span(0) { operationName "parent" tags { - defaultTags() } } // reverse order @@ -398,7 +397,6 @@ class RabbitMQTest extends AgentTestRunner { if (exception) { errorTags(exception.class, errorMsg) } - defaultTags(distributedRootSpan) } } } diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy index b16ef5c0c0ba..37c2e941e24a 100644 --- a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy +++ b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy @@ -78,7 +78,6 @@ class RatpackOtherTest extends AgentTestRunner { "$Tags.HTTP_URL" "${app.address.resolve(path)}" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 200 - defaultTags() } } span(1) { @@ -95,7 +94,6 @@ class RatpackOtherTest extends AgentTestRunner { "$Tags.HTTP_URL" "${app.address.resolve(path)}" "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 200 - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy index 3793e40800f5..0e953487eb52 100644 --- a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy +++ b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy @@ -118,7 +118,6 @@ class RatpackHttpServerTest extends HttpServerTest { "error.type" { it == null || it == Exception.name } "error.stack" { it == null || it instanceof String } } - defaultTags(true) } } } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy index 8cf47d9c9c07..8fcef9fadf06 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy +++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy @@ -92,7 +92,6 @@ abstract class AbstractServlet3Test extends HttpServerTest return tagVal.contains(EchoHandlerFunction.getName()) } - defaultTags() } } span(1) { @@ -283,7 +275,6 @@ class SpringWebfluxTest extends AgentTestRunner { "$Tags.HTTP_URL" url "$Tags.HTTP_METHOD" "POST" "$Tags.HTTP_STATUS" 202 - defaultTags() } } span(2) { @@ -292,7 +283,6 @@ class SpringWebfluxTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" "echo" "$Tags.COMPONENT" "trace" - defaultTags() } } } @@ -326,7 +316,6 @@ class SpringWebfluxTest extends AgentTestRunner { "$Tags.HTTP_URL" url "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 500 - defaultTags() } } span(1) { @@ -354,7 +343,6 @@ class SpringWebfluxTest extends AgentTestRunner { "handler.type" TestController.getName() } errorTags(RuntimeException, "bad things happen") - defaultTags() } } } @@ -397,7 +385,6 @@ class SpringWebfluxTest extends AgentTestRunner { "$Tags.HTTP_URL" url "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 307 - defaultTags() } } span(1) { @@ -412,7 +399,6 @@ class SpringWebfluxTest extends AgentTestRunner { return (tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX) || tagVal.contains("Lambda")) } - defaultTags() } } } @@ -428,7 +414,6 @@ class SpringWebfluxTest extends AgentTestRunner { "handler.type" { String tagVal -> return tagVal.contains(INNER_HANDLER_FUNCTION_CLASS_TAG_PREFIX) } - defaultTags() } } span(1) { @@ -445,7 +430,6 @@ class SpringWebfluxTest extends AgentTestRunner { "$Tags.HTTP_URL" finalUrl "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 200 - defaultTags() } } } @@ -489,7 +473,6 @@ class SpringWebfluxTest extends AgentTestRunner { // Annotation API "handler.type" TestController.getName() } - defaultTags() } } span(1) { @@ -506,7 +489,6 @@ class SpringWebfluxTest extends AgentTestRunner { "$Tags.HTTP_URL" url "$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_STATUS" 200 - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy b/dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy index 7d2a73b4217e..30f950b3d713 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy @@ -73,7 +73,6 @@ class SpringWebfluxHttpClientTest extends HttpClientTest errorType) { errorTags(errorType, null) } @@ -84,6 +73,6 @@ class TagsAssert { // The primary goal is to ensure the set is empty. // tags and assertedTags are included via an "always true" comparison // so they provide better context in the error message. - assert tags.entrySet() != assertedTags && set.isEmpty() + assert (tags.entrySet() != assertedTags || assertedTags.isEmpty()) && set.isEmpty() } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy index 4b4032aa0641..b872e16ff5d5 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy @@ -340,7 +340,6 @@ abstract class HttpClientTest extends Age if (exception) { errorTags(exception.class, exception.message) } - defaultTags() } } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index 7612067d440d..5ebf44cb3858 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -410,7 +410,6 @@ abstract class HttpServerTest ext if (errorMessage) { errorTags(Exception, errorMessage) } - defaultTags() } } } @@ -444,7 +443,6 @@ abstract class HttpServerTest ext // "$DDTags.HTTP_QUERY" uri.query // "$DDTags.HTTP_FRAGMENT" { it == null || it == uri.fragment } // Optional // } - defaultTags(true) } } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy index ddd8dd7d78c5..ba10079338fe 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy @@ -105,7 +105,6 @@ class TestHttpServer implements AutoCloseable { } tags { "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER - defaultTags(parentSpan != null) } } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy index 172eae559283..0d35c12c72db 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy @@ -62,7 +62,6 @@ class TraceUtils { if (exception) { errorTags(exception.class, exception.message) } - defaultTags() } } } diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java index b8a47af993b9..d9386043de77 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java @@ -4,8 +4,6 @@ public class DDTags { public static final String SPAN_TYPE = "span.type"; public static final String SERVICE_NAME = "service.name"; public static final String RESOURCE_NAME = "resource.name"; - public static final String THREAD_NAME = "thread.name"; - public static final String THREAD_ID = "thread.id"; public static final String DB_STATEMENT = "sql.query"; public static final String HTTP_QUERY = "http.query.string"; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java index e94b625952cd..5dc2f37ccee6 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java @@ -1,6 +1,5 @@ package datadog.opentracing; -import datadog.trace.api.DDTags; import java.math.BigInteger; import java.util.Collections; import java.util.Map; @@ -43,10 +42,6 @@ public class DDSpanContext implements io.opentracing.SpanContext { /** Metrics on the span */ private final AtomicReference> metrics = new AtomicReference<>(); - // Additional Metadata - private final String threadName = Thread.currentThread().getName(); - private final long threadId = Thread.currentThread().getId(); - public DDSpanContext( final BigInteger traceId, final BigInteger spanId, @@ -75,9 +70,6 @@ public DDSpanContext( this.operationName = operationName; this.errorFlag = errorFlag; - - this.tags.put(DDTags.THREAD_NAME, threadName); - this.tags.put(DDTags.THREAD_ID, threadId); } public BigInteger getTraceId() { diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanBuilderTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanBuilderTest.groovy index bf28bfe353c1..e515bb652408 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanBuilderTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanBuilderTest.groovy @@ -2,7 +2,6 @@ package datadog.opentracing import datadog.opentracing.propagation.ExtractedContext import datadog.trace.api.Config -import datadog.trace.api.DDTags import datadog.trace.common.writer.ListWriter import datadog.trace.util.test.DDSpecification import io.opentracing.Scope @@ -46,16 +45,6 @@ class DDSpanBuilderTest extends DDSpecification { span.getOperationName() == expectedName span.tags.subMap(tags.keySet()) == tags - - when: - span = tracer.buildSpan(expectedName).start() - - then: - span.getTags() == [ - (DDTags.THREAD_NAME): Thread.currentThread().getName(), - (DDTags.THREAD_ID) : Thread.currentThread().getId() - ] - when: // with all custom fields provided @@ -69,9 +58,6 @@ class DDSpanBuilderTest extends DDSpecification { then: context.getErrorFlag() - - context.tags[DDTags.THREAD_NAME] == Thread.currentThread().getName() - context.tags[DDTags.THREAD_ID] == Thread.currentThread().getId() } def "setting #name should remove"() { diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy index d8b6975a3da4..b99d8272bf4f 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy @@ -15,27 +15,24 @@ class DDSpanContextTest extends DDSpecification { expect: context.getTags() == tags - context.toString() == "DDSpan [ t_id=1, s_id=1, p_id=0] trace=fakeOperation metrics={} *errored* tags={${extra}${tags.containsKey(DDTags.SPAN_TYPE) ? "span.type=${tags.get(DDTags.SPAN_TYPE)}, " : ""}thread.id=${Thread.currentThread().id}, thread.name=${Thread.currentThread().name}}" + context.toString() == "DDSpan [ t_id=1, s_id=1, p_id=0] trace=fakeOperation metrics={} *errored* tags={${extra}${tags.containsKey(DDTags.SPAN_TYPE) ? ", span.type=${tags.get(DDTags.SPAN_TYPE)}" : ""}}" where: - name | extra | tags - DDTags.SPAN_TYPE | "some.tag=asdf, " | ["some.tag": "asdf", (DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id] - "some.tag" | "" | [(DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id] + name | extra | tags + DDTags.SPAN_TYPE | "some.tag=asdf" | ["some.tag": "asdf"] + "some.tag" | "" | [:] } def "tags can be added to the context"() { setup: def context = SpanFactory.newSpanOf(0).context context.setTag(name, value) - def thread = Thread.currentThread() expect: context.getTags() == [ - (name) : value, - (DDTags.THREAD_NAME): thread.name, - (DDTags.THREAD_ID) : thread.id + (name): value ] - context.toString() == "DDSpan [ t_id=1, s_id=1, p_id=0] trace=fakeOperation metrics={} tags={$name=$value, thread.id=$thread.id, thread.name=$thread.name}" + context.toString() == "DDSpan [ t_id=1, s_id=1, p_id=0] trace=fakeOperation metrics={} tags={$name=$value}" where: name | value From e9ae7d6d10c660c13e0a7be3f71218c7be2cd152 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 17 Dec 2019 11:11:39 -0800 Subject: [PATCH 2/2] Fix tests --- .../src/test/groovy/JerseyTest.groovy | 2 -- .../src/test/groovy/JaxRsFilterTest.groovy | 17 ++++++++--------- .../src/test/groovy/Jedis30ClientTest.groovy | 5 ----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy index b64fa1d7394f..1818b09e1408 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy @@ -35,7 +35,6 @@ class JerseyTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" expectedResourceName "$Tags.COMPONENT" "jax-rs" - defaultTags() } } @@ -46,7 +45,6 @@ class JerseyTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" controllerName "$DDTags.SPAN_TYPE" DDSpanTypes.HTTP_SERVER "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy index 7ccb2d7cecc7..9086e976eaf6 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy @@ -3,13 +3,6 @@ import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags import datadog.trace.instrumentation.api.Tags import io.dropwizard.testing.junit.ResourceTestRule -import javax.ws.rs.client.Entity -import javax.ws.rs.container.ContainerRequestContext -import javax.ws.rs.container.ContainerRequestFilter -import javax.ws.rs.container.PreMatching -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.Response -import javax.ws.rs.ext.Provider import org.jboss.resteasy.core.Dispatcher import org.jboss.resteasy.mock.MockDispatcherFactory import org.jboss.resteasy.mock.MockHttpRequest @@ -18,6 +11,14 @@ import org.junit.ClassRule import spock.lang.Shared import spock.lang.Unroll +import javax.ws.rs.client.Entity +import javax.ws.rs.container.ContainerRequestContext +import javax.ws.rs.container.ContainerRequestFilter +import javax.ws.rs.container.PreMatching +import javax.ws.rs.core.MediaType +import javax.ws.rs.core.Response +import javax.ws.rs.ext.Provider + import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace @Unroll @@ -62,7 +63,6 @@ abstract class JaxRsFilterTest extends AgentTestRunner { tags { "$DDTags.RESOURCE_NAME" parentResourceName "$Tags.COMPONENT" "jax-rs" - defaultTags() } } span(1) { @@ -72,7 +72,6 @@ abstract class JaxRsFilterTest extends AgentTestRunner { "$DDTags.RESOURCE_NAME" controllerName "$DDTags.SPAN_TYPE" DDSpanTypes.HTTP_SERVER "$Tags.COMPONENT" "jax-rs-controller" - defaultTags() } } } diff --git a/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy b/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy index 912954807982..22ba3ca9ed2b 100644 --- a/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy @@ -59,7 +59,6 @@ class Jedis30ClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -85,7 +84,6 @@ class Jedis30ClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -99,7 +97,6 @@ class Jedis30ClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "GET" - defaultTags() } } } @@ -125,7 +122,6 @@ class Jedis30ClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "SET" - defaultTags() } } } @@ -139,7 +135,6 @@ class Jedis30ClientTest extends AgentTestRunner { "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT "$Tags.DB_TYPE" "redis" "$Tags.DB_STATEMENT" "RANDOMKEY" - defaultTags() } } }