Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove thread name and thread id tags #42

Merged
merged 2 commits into from
Dec 17, 2019
Merged

Remove thread name and thread id tags #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
346e8bd
Remove thread name and thread id tags
trask Dec 10, 2019
e9ae7d6
Fix tests
trask Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -78,7 +77,6 @@ class LagomTest extends AgentTestRunner {
tags {
"$DDTags.RESOURCE_NAME" 'EchoServiceImpl.tracedMethod'
"$Tags.COMPONENT" "trace"
defaultTags()
}
}
}
Expand Down Expand Up @@ -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()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...t/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDec
"$Tags.COMPONENT" "akka-http-client"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
errorTags(NullPointerException)
defaultTags()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...t/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<Object,
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }
}
defaultTags(true)
}
}
}
Expand Down
7 changes: 0 additions & 7 deletions dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.endpoint" "$server.address"
"aws.operation" "${operation}Request"
"aws.agent" "java-aws-sdk"
defaultTags()
}
}
span(1) {
Expand All @@ -160,7 +159,6 @@ class AWSClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "$server.address/$url"
"$Tags.HTTP_METHOD" "$method"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down Expand Up @@ -217,7 +215,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.operation" "${operation}Request"
"aws.agent" "java-aws-sdk"
errorTags SdkClientException, ~/Unable to execute HTTP request/
defaultTags()
}
}
span(1) {
Expand All @@ -233,7 +230,6 @@ class AWSClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "http://localhost:${UNUSABLE_PORT}/$url"
"$Tags.HTTP_METHOD" "$method"
errorTags HttpHostConnectException, ~/Connection refused/
defaultTags()
}
}
}
Expand Down Expand Up @@ -279,7 +275,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.operation" "HeadBucketRequest"
"aws.agent" "java-aws-sdk"
errorTags RuntimeException, "bad handler"
defaultTags()
}
}
}
Expand Down Expand Up @@ -329,7 +324,6 @@ class AWSClientTest extends AgentTestRunner {
} catch (AssertionError e) {
errorTags SdkClientException, "Unable to execute HTTP request: Request did not complete before the request timeout configuration."
}
defaultTags()
}
}
(1..4).each {
Expand All @@ -350,7 +344,6 @@ class AWSClientTest extends AgentTestRunner {
} catch (AssertionError e) {
errorTags RequestAbortedException, "Request aborted"
}
defaultTags()
}
}
}
Expand Down
7 changes: 0 additions & 7 deletions .../instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWSClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.endpoint" "$server.address"
"aws.operation" "${operation}Request"
"aws.agent" "java-aws-sdk"
defaultTags()
}
}
span(1) {
Expand All @@ -130,7 +129,6 @@ class AWSClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "$server.address/$url"
"$Tags.HTTP_METHOD" "$method"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down Expand Up @@ -187,7 +185,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.operation" "${operation}Request"
"aws.agent" "java-aws-sdk"
errorTags AmazonClientException, ~/Unable to execute HTTP request/
defaultTags()
}
}
span(1) {
Expand All @@ -203,7 +200,6 @@ class AWSClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "http://localhost:${UNUSABLE_PORT}/$url"
"$Tags.HTTP_METHOD" "$method"
errorTags HttpHostConnectException, ~/Connection refused/
defaultTags()
}
}
}
Expand Down Expand Up @@ -249,7 +245,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.operation" "GetObjectRequest"
"aws.agent" "java-aws-sdk"
errorTags RuntimeException, "bad handler"
defaultTags()
}
}
}
Expand Down Expand Up @@ -295,7 +290,6 @@ class AWSClientTest extends AgentTestRunner {
"aws.operation" "GetObjectRequest"
"aws.agent" "java-aws-sdk"
errorTags AmazonClientException, ~/Unable to execute HTTP request/
defaultTags()
}
}
(1..4).each {
Expand All @@ -316,7 +310,6 @@ class AWSClientTest extends AgentTestRunner {
} catch (AssertionError e) {
errorTags RequestAbortedException, "Request aborted"
}
defaultTags()
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/AwsClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ class AwsClientTest extends AgentTestRunner {
} else if (service == "Kinesis") {
"aws.stream.name" "somestream"
}
defaultTags()
}
}
span(1) {
Expand All @@ -120,7 +119,6 @@ class AwsClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "${server.address}${path}"
"$Tags.HTTP_METHOD" "$method"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down Expand Up @@ -220,7 +218,6 @@ class AwsClientTest extends AgentTestRunner {
} else if (service == "Kinesis") {
"aws.stream.name" "somestream"
}
defaultTags()
}
}
}
Expand All @@ -240,7 +237,6 @@ class AwsClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "${server.address}${path}"
"$Tags.HTTP_METHOD" "$method"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down Expand Up @@ -329,7 +325,6 @@ class AwsClientTest extends AgentTestRunner {
"aws.agent" "java-aws-sdk"
"aws.bucket.name" "somebucket"
errorTags SdkClientException, "Unable to execute HTTP request: Read timed out"
defaultTags()
}
}
(1..4).each {
Expand All @@ -346,7 +341,6 @@ class AwsClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "$server.address/somebucket/somekey"
"$Tags.HTTP_METHOD" "GET"
errorTags SocketTimeoutException, "Read timed out"
defaultTags()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...ava-agent/instrumentation/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ abstract class AbstractCouchbaseTest extends AgentTestRunner {
if (bucketName != null) {
"bucket" bucketName
}
defaultTags()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/couchbase-2.6/src/test/groovy/CouchbaseSpanUtil.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class CouchbaseSpanUtil {
// We assign a resourceName of 'Bucket.query' and this is shared with n1ql queries
// that do have operation ids
"couchbase.operation_id" { it == null || String }
defaultTags()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...ava-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class CassandraClientTest extends AgentTestRunner {
"$Tags.DB_TYPE" "cassandra"
"$Tags.DB_INSTANCE" keyspace
"$Tags.DB_STATEMENT" statement
defaultTags()
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...a-agent/instrumentation/dropwizard/dropwizard-views/src/test/groovy/ViewRenderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class ViewRenderTest extends AgentTestRunner {
"$DDTags.RESOURCE_NAME" "View $template"
"$Tags.COMPONENT" "dropwizard-view"
"span.origin.type" renderer.class.simpleName
defaultTags()
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
if (endpoint == EXCEPTION) {
errorTags(Exception, EXCEPTION.body)
}
defaultTags()
}
}
}
Expand Down Expand Up @@ -122,7 +121,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }
}
defaultTags(true)
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...ntation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.DB_TYPE" "elasticsearch"
defaultTags()
}
}
span(1) {
Expand All @@ -106,7 +105,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions .../instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.DB_TYPE" "elasticsearch"
defaultTags()
}
}
span(1) {
Expand All @@ -111,7 +110,6 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...ation/elasticsearch/rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.DB_TYPE" "elasticsearch"
defaultTags()
}
}
span(1) {
Expand All @@ -110,7 +109,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...nstrumentation/elasticsearch/rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.DB_TYPE" "elasticsearch"
defaultTags()
}
}
span(1) {
Expand All @@ -106,7 +105,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
defaultTags()
}
}
}
Expand Down
8 changes: 0 additions & 8 deletions ...on/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest"
defaultTags()
}
}
}
Expand Down Expand Up @@ -115,7 +114,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName
errorTags IndexNotFoundException, "no such index"
defaultTags()
}
}
}
Expand Down Expand Up @@ -186,7 +184,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName
defaultTags()
}
}
}
Expand All @@ -202,7 +199,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest"
defaultTags()
}
}
}
Expand All @@ -222,7 +218,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.type" indexType
"elasticsearch.id" "1"
"elasticsearch.version"(-1)
defaultTags()
}
}
}
Expand All @@ -239,7 +234,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest"
"elasticsearch.request.indices" indexName
defaultTags()
}
}
}
Expand All @@ -257,7 +251,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.request" "IndexRequest"
"elasticsearch.request.indices" indexName
"elasticsearch.request.write.type" indexType
defaultTags()
}
}
}
Expand All @@ -277,7 +270,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
"elasticsearch.type" indexType
"elasticsearch.id" "1"
"elasticsearch.version" 1
defaultTags()
}
}
}
Expand Down
Loading