Follow common childOf verification convention
MODIFY
instrumentation/aws-sdk/aws-sdk-1.11/src/test/groovy/AWSClientTest.groovy
instrumentation/aws-sdk/aws-sdk-1.11/src/test/groovy/AWSClientTest.groovy
@@ -176,7 +176,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName(method)
spanKind CLIENT
errored false
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
@@ -267,7 +267,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName(method)
spanKind CLIENT
errored true
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
@@ -378,7 +378,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName("GET")
spanKind CLIENT
errored true
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"

MODIFY
instrumentation/aws-sdk/aws-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy
instrumentation/aws-sdk/aws-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy
@@ -139,7 +139,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName(method)
spanKind CLIENT
errored false
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
@@ -212,7 +212,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName(method)
spanKind CLIENT
errored true
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
@@ -320,7 +320,7 @@ class AWSClientTest extends AgentTestRunner {
operationName expectedOperationName("GET")
spanKind CLIENT
errored true
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"

MODIFY
instrumentation/aws-sdk/aws-sdk-2.2/src/test/groovy/AwsClientTest.groovy
instrumentation/aws-sdk/aws-sdk-2.2/src/test/groovy/AwsClientTest.groovy
@@ -127,7 +127,7 @@ class AwsClientTest extends AgentTestRunner {
operationName expectedOperationName(method)
spanKind CLIENT
errored false
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
@@ -340,7 +340,7 @@ class AwsClientTest extends AgentTestRunner {
operationName expectedOperationName("GET")
spanKind CLIENT
errored true
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"

MODIFY
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
@@ -98,7 +98,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
operationName "elasticsearch.query"
spanKind CLIENT
errored false
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
@@ -142,7 +142,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
@@ -177,7 +177,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(3) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
@@ -217,7 +217,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
@@ -260,7 +260,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
@@ -281,7 +281,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(2) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
@@ -313,7 +313,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
@@ -356,7 +356,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "DeleteAction"
@@ -376,7 +376,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(2) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
@@ -409,7 +409,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
span(1) {
operationName "elasticsearch.query"
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"

MODIFY
instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
@@ -208,7 +208,7 @@ class Netty41ClientTest extends HttpClientTest {
trace(0, 4) {
basicSpan(it, 0, "parent")
span(1) {
- childOf(span(0))
+ childOf span(0)
operationName "tracedMethod"
errored false
tags {

MODIFY
instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy
instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy
@@ -100,7 +100,7 @@ class RatpackOtherTest extends AgentTestRunner {
span(1) {
operationName "GET /$route"
spanKind INTERNAL
- childOf(span(0))
+ childOf span(0)
errored false
tags {
"$MoreTags.RESOURCE_NAME" "GET /$route"

MODIFY
instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy
instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy
@@ -50,14 +50,14 @@ class ReactorCoreTest extends AgentTestRunner {
}
span(1) {
operationName "publisher-parent"
- childOf(span(0))
+ childOf span(0)
tags {
}
}
for (int i = 0; i < workSpans; i++) {
span(i + 2) {
operationName "add one"
- childOf(span(1))
+ childOf span(1)
tags {
}
}
@@ -97,7 +97,7 @@ class ReactorCoreTest extends AgentTestRunner {
}
span(1) {
operationName "publisher-parent"
- childOf(span(0))
+ childOf span(0)
errored true
tags {
errorTags(RuntimeException, EXCEPTION_MESSAGE)
@@ -130,7 +130,7 @@ class ReactorCoreTest extends AgentTestRunner {
}
span(1) {
operationName "publisher-parent"
- childOf(span(0))
+ childOf span(0)
errored true
tags {
errorTags(RuntimeException, EXCEPTION_MESSAGE)
@@ -139,7 +139,7 @@ class ReactorCoreTest extends AgentTestRunner {
for (int i = 0; i < workSpans; i++) {
span(i + 2) {
operationName "add one"
- childOf(span(1))
+ childOf span(1)
tags {
}
}
@@ -168,7 +168,7 @@ class ReactorCoreTest extends AgentTestRunner {
}
span(1) {
operationName "publisher-parent"
- childOf(span(0))
+ childOf span(0)
tags {
}
}

MODIFY
instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy
instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy
@@ -80,7 +80,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(1) { // select
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^select /
@@ -116,7 +116,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(1) { // insert
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^insert /
@@ -152,7 +152,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(1) { // select
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^select /
@@ -167,7 +167,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(2) { // update
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^update /
@@ -201,7 +201,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(1) { // select
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^select /
@@ -235,7 +235,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(1) { // select
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^select /
@@ -250,7 +250,7 @@ class SpringJpaTest extends AgentTestRunner {
}
span(2) { // delete
spanKind CLIENT
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.RESOURCE_NAME" ~/^delete /

MODIFY
instrumentation/spring-webflux-5.0/src/test/groovy/SpringWebfluxTest.groovy
instrumentation/spring-webflux-5.0/src/test/groovy/SpringWebfluxTest.groovy
@@ -90,7 +90,7 @@ class SpringWebfluxTest extends AgentTestRunner {
operationName TestController.getSimpleName() + "." + annotatedMethod
}
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"
@@ -159,7 +159,7 @@ class SpringWebfluxTest extends AgentTestRunner {
operationName TestController.getSimpleName() + "." + annotatedMethod
}
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"
@@ -177,7 +177,7 @@ class SpringWebfluxTest extends AgentTestRunner {
}
span(2) {
operationName "tracedMethod"
- childOf(span(1))
+ childOf span(1)
errored false
tags {
}
@@ -226,7 +226,7 @@ class SpringWebfluxTest extends AgentTestRunner {
span(1) {
operationName "ResourceWebHandler.handle"
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
@@ -272,7 +272,7 @@ class SpringWebfluxTest extends AgentTestRunner {
span(1) {
operationName EchoHandlerFunction.getSimpleName() + ".handle"
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"
@@ -284,7 +284,7 @@ class SpringWebfluxTest extends AgentTestRunner {
}
span(2) {
operationName "echo"
- childOf(span(1))
+ childOf span(1)
tags {
}
}
@@ -329,7 +329,7 @@ class SpringWebfluxTest extends AgentTestRunner {
operationName TestController.getSimpleName() + "." + annotatedMethod
}
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
@@ -391,7 +391,7 @@ class SpringWebfluxTest extends AgentTestRunner {
span(1) {
operationName "RedirectComponent.lambda"
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"
@@ -422,7 +422,7 @@ class SpringWebfluxTest extends AgentTestRunner {
span(1) {
operationNameContains(SpringWebFluxTestApplication.getSimpleName() + "\$", ".handle")
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"
@@ -474,7 +474,7 @@ class SpringWebfluxTest extends AgentTestRunner {
operationName TestController.getSimpleName() + "." + annotatedMethod
}
spanKind SERVER
- childOf(span(0))
+ childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "spring-webflux-controller"

MODIFY
testing/src/test/groovy/AgentTestRunnerTest.groovy
testing/src/test/groovy/AgentTestRunnerTest.groovy
@@ -128,7 +128,7 @@ class AgentTestRunnerTest extends AgentTestRunner {
}
span(1) {
operationName "child"
- childOf(span(0))
+ childOf span(0)
}
}
}

Follow common childOf verification convention (#251)