From 23b33adb0a170baf68ff33d23c6c8c2247f1c461 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 28 Jan 2022 09:29:46 -0800 Subject: [PATCH] Auto-format groovy files in Intellij (#5260) * Auto-format groovy files in Intellij * A bit of clean up --- .../api/db/SqlStatementSanitizerTest.groovy | 84 +++++++++---------- ...TracingRequestApiGatewayWrapperTest.groovy | 2 +- .../v1_0/TracingRequestWrapperTestBase.groovy | 3 +- .../v1_0/TracingSqsEventWrapperTest.groovy | 6 +- .../src/test/groovy/AwsConnector.groovy | 3 +- .../v1_11/AbstractAws1ClientTest.groovy | 7 +- .../test/groovy/DropwizardAsyncTest.groovy | 1 + .../Elasticsearch5NodeClientTest.groovy | 3 +- .../Elasticsearch5TransportClientTest.groovy | 3 +- .../Elasticsearch53NodeClientTest.groovy | 3 +- .../Elasticsearch53TransportClientTest.groovy | 3 +- .../test/groovy/test/TestController.groovy | 2 +- .../src/test/groovy/ReflectionTest.groovy | 1 + .../src/test/groovy/JaxRsClientTest.groovy | 3 +- .../main/groovy/JaxRsHttpServerTest.groovy | 3 +- .../JspInstrumentationBasicTests.groovy | 3 +- .../MongoDbAttributesExtractorTest.groovy | 6 +- .../v3_1/MongoSpanNameExtractorTest.groovy | 4 +- .../testing/AbstractMongoClientTest.groovy | 7 +- .../src/test/groovy/WithRabbitMqTrait.groovy | 4 +- .../ratpack/RatpackFunctionalTest.groovy | 5 +- ...pagationOperatorInstrumentationTest.groovy | 4 +- .../reactor/ReactorCoreTest.groovy | 44 +++++----- .../groovy/ReactorNettyWithSpanTest.groovy | 2 +- .../AbstractReactorNettyHttpClientTest.groovy | 2 +- .../v1_0/spring/SpringBeanRouterTest.groovy | 2 +- .../v1_0/spring/SpringRouterTest.groovy | 2 +- .../src/test/groovy/TestServlet2.groovy | 2 +- .../src/test/groovy/TestServlet3.groovy | 1 + .../src/test/groovy/TestServlet5.groovy | 3 +- ...stractSpringCloudStreamProducerTest.groovy | 4 +- .../tomcat/v7_0/AsyncServlet.groovy | 3 +- .../tomcat/v7_0/ThreadPoolExecutorTest.groovy | 5 +- .../test/vaadin/AbstractVaadinTest.groovy | 1 - .../muzzle/HelperReferenceWrapperTest.groovy | 2 +- .../LibertyServletOnlySmokeTest.groovy | 1 + .../smoketest/LogsSmokeTest.groovy | 3 +- .../test/base/HttpServerTest.groovy | 12 +-- .../junit/http/AbstractHttpClientTest.java | 4 +- 39 files changed, 138 insertions(+), 115 deletions(-) diff --git a/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizerTest.groovy b/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizerTest.groovy index 1010b8ee34..13f58f5db9 100644 --- a/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizerTest.groovy +++ b/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizerTest.groovy @@ -18,63 +18,63 @@ class SqlStatementSanitizerTest extends Specification { actualSanitized.getFullStatement() == sanitizedSql where: - originalSql | sanitizedSql + originalSql | sanitizedSql // Numbers - "SELECT * FROM TABLE WHERE FIELD=1234" | "SELECT * FROM TABLE WHERE FIELD=?" - "SELECT * FROM TABLE WHERE FIELD = 1234" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD>=-1234" | "SELECT * FROM TABLE WHERE FIELD>=?" - "SELECT * FROM TABLE WHERE FIELD<-1234" | "SELECT * FROM TABLE WHERE FIELD=-1234" | "SELECT * FROM TABLE WHERE FIELD>=?" + "SELECT * FROM TABLE WHERE FIELD<-1234" | "SELECT * FROM TABLE WHERE FIELD7" | "SELECT FIELD2 FROM TABLE_123 WHERE X<>?" + "SELECT A + B" | "SELECT A + B" + "SELECT -- comment" | "SELECT -- comment" + "SELECT * FROM TABLE123" | "SELECT * FROM TABLE123" + "SELECT FIELD2 FROM TABLE_123 WHERE X<>7" | "SELECT FIELD2 FROM TABLE_123 WHERE X<>?" // Semi-nonsensical almost-numbers to elide or not - "SELECT --83--...--8e+76e3E-1" | "SELECT ?" - "SELECT DEADBEEF" | "SELECT DEADBEEF" - "SELECT 123-45-6789" | "SELECT ?" - "SELECT 1/2/34" | "SELECT ?/?/?" + "SELECT --83--...--8e+76e3E-1" | "SELECT ?" + "SELECT DEADBEEF" | "SELECT DEADBEEF" + "SELECT 123-45-6789" | "SELECT ?" + "SELECT 1/2/34" | "SELECT ?/?/?" // Basic ' strings - "SELECT * FROM TABLE WHERE FIELD = ''" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = 'words and spaces'" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = ' an escaped '' quote mark inside'" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = '\\\\'" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = '\"inside doubles\"'" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = '\"\$\$\$\$\"'" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = 'a single \" doublequote inside'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = ''" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = 'words and spaces'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = ' an escaped '' quote mark inside'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = '\\\\'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = '\"inside doubles\"'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = '\"\$\$\$\$\"'" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = 'a single \" doublequote inside'" | "SELECT * FROM TABLE WHERE FIELD = ?" // Some databases allow using dollar-quoted strings - "SELECT * FROM TABLE WHERE FIELD = \$\$\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = \$\$words and spaces\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = \$\$quotes '\" inside\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = \$\$\"''\"\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" - "SELECT * FROM TABLE WHERE FIELD = \$\$\\\\\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = \$\$\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = \$\$words and spaces\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = \$\$quotes '\" inside\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = \$\$\"''\"\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" + "SELECT * FROM TABLE WHERE FIELD = \$\$\\\\\$\$" | "SELECT * FROM TABLE WHERE FIELD = ?" // Unicode, including a unicode identifier with a trailing number - "SELECT * FROM TABLE\u09137 WHERE FIELD = '\u0194'" | "SELECT * FROM TABLE\u09137 WHERE FIELD = ?" + "SELECT * FROM TABLE\u09137 WHERE FIELD = '\u0194'" | "SELECT * FROM TABLE\u09137 WHERE FIELD = ?" // whitespace normalization - "SELECT * \t\r\nFROM TABLE WHERE FIELD1 = 12344 AND FIELD2 = 5678" | "SELECT * FROM TABLE WHERE FIELD1 = ? AND FIELD2 = ?" + "SELECT * \t\r\nFROM TABLE WHERE FIELD1 = 12344 AND FIELD2 = 5678" | "SELECT * FROM TABLE WHERE FIELD1 = ? AND FIELD2 = ?" // hibernate/jpa query language - "FROM TABLE WHERE FIELD=1234" | "FROM TABLE WHERE FIELD=?" + "FROM TABLE WHERE FIELD=1234" | "FROM TABLE WHERE FIELD=?" } def "normalize couchbase #originalSql"() { diff --git a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestApiGatewayWrapperTest.groovy b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestApiGatewayWrapperTest.groovy index b06fa01fa4..3bf5f17634 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestApiGatewayWrapperTest.groovy +++ b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestApiGatewayWrapperTest.groovy @@ -63,7 +63,7 @@ class TracingRequestApiGatewayWrapperTest extends TracingRequestWrapperTestBase @Override String handleRequest(CustomType input, Context context) { if (input.key == "hello") { - return "Hello "+input.value + return "Hello " + input.value } throw new IllegalStateException("bad request") } diff --git a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperTestBase.groovy b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperTestBase.groovy index 6bf78611e6..70cb6840f8 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperTestBase.groovy +++ b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperTestBase.groovy @@ -7,11 +7,12 @@ package io.opentelemetry.instrumentation.awslambda.v1_0 import com.amazonaws.services.lambda.runtime.Context import io.opentelemetry.instrumentation.test.LibraryInstrumentationSpecification -import java.util.function.BiFunction import org.junit.Rule import org.junit.contrib.java.lang.system.EnvironmentVariables import spock.lang.Shared +import java.util.function.BiFunction + class TracingRequestWrapperTestBase extends LibraryInstrumentationSpecification { @Rule diff --git a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventWrapperTest.groovy b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventWrapperTest.groovy index 7f3caba472..16c423e6df 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventWrapperTest.groovy +++ b/instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventWrapperTest.groovy @@ -5,9 +5,6 @@ package io.opentelemetry.instrumentation.awslambda.v1_0 -import static io.opentelemetry.api.trace.SpanKind.CONSUMER -import static io.opentelemetry.api.trace.SpanKind.SERVER - import com.amazonaws.services.lambda.runtime.Context import com.amazonaws.services.lambda.runtime.RequestHandler import com.amazonaws.services.lambda.runtime.events.SQSEvent @@ -17,6 +14,9 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import org.junit.Rule import org.junit.contrib.java.lang.system.EnvironmentVariables +import static io.opentelemetry.api.trace.SpanKind.CONSUMER +import static io.opentelemetry.api.trace.SpanKind.SERVER + class TracingSqsEventWrapperTest extends LibraryInstrumentationSpecification { @Rule diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/AwsConnector.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/AwsConnector.groovy index 8e805bed66..72f10e3be1 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/AwsConnector.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/AwsConnector.groovy @@ -19,12 +19,13 @@ import com.amazonaws.services.sqs.AmazonSQSAsyncClient import com.amazonaws.services.sqs.model.GetQueueAttributesRequest import com.amazonaws.services.sqs.model.PurgeQueueRequest import com.amazonaws.services.sqs.model.ReceiveMessageRequest -import java.time.Duration import org.slf4j.LoggerFactory import org.testcontainers.containers.localstack.LocalStackContainer import org.testcontainers.containers.output.Slf4jLogConsumer import org.testcontainers.utility.DockerImageName +import java.time.Duration + class AwsConnector { private LocalStackContainer localstack diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index 4efad86eec..0c01e5ca92 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -136,8 +136,11 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { // Some users may implicitly subclass the request object to mimic a fluent style "Kinesis" | "DeleteStream" | "POST" | "/" | AmazonKinesisClientBuilder.standard() | { c -> c.deleteStream(new DeleteStreamRequest() { - { withStreamName("somestream") } - }) } | ["aws.stream.name": "somestream"] | "" + { + withStreamName("somestream") + } + }) + } | ["aws.stream.name": "somestream"] | "" "EC2" | "AllocateAddress" | "POST" | "/" | AmazonEC2ClientBuilder.standard() | { c -> c.allocateAddress() } | [:] | """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE diff --git a/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy b/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy index 6d5583cfb3..3aff0d0650 100644 --- a/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy +++ b/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy @@ -7,6 +7,7 @@ import io.dropwizard.Application import io.dropwizard.Configuration import io.dropwizard.setup.Bootstrap import io.dropwizard.setup.Environment + import javax.ws.rs.GET import javax.ws.rs.HeaderParam import javax.ws.rs.Path diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 24e734ba57..58693e8aed 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -4,7 +4,6 @@ */ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import java.util.concurrent.TimeUnit import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings @@ -17,6 +16,8 @@ import org.elasticsearch.transport.Netty3Plugin import spock.lang.Shared import spock.lang.Unroll +import java.util.concurrent.TimeUnit + import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index f3a8b2988d..e5585454ad 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -4,7 +4,6 @@ */ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import java.util.concurrent.TimeUnit import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings @@ -21,6 +20,8 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient import spock.lang.Shared import spock.lang.Unroll +import java.util.concurrent.TimeUnit + import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index 66cfb88998..f1d533076b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -4,7 +4,6 @@ */ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import java.util.concurrent.TimeUnit import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils @@ -18,6 +17,8 @@ import org.elasticsearch.transport.Netty3Plugin import spock.lang.Shared import spock.lang.Unroll +import java.util.concurrent.TimeUnit + import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index b6043992b4..a82e414c98 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -4,7 +4,6 @@ */ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import java.util.concurrent.TimeUnit import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils @@ -22,6 +21,8 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient import spock.lang.Shared import spock.lang.Unroll +import java.util.concurrent.TimeUnit + import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR diff --git a/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy b/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy index e4420ddfd2..b1771a85e8 100644 --- a/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy +++ b/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy @@ -78,7 +78,7 @@ class TestController implements Controller { @Action def child() { HttpServerTest.controller(INDEXED_CHILD) { - INDEXED_CHILD.collectSpanAttributes({name -> name == "id" ? params.id : null }) + INDEXED_CHILD.collectSpanAttributes({ name -> name == "id" ? params.id : null }) render INDEXED_CHILD.body } } diff --git a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/groovy/ReflectionTest.groovy b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/groovy/ReflectionTest.groovy index b9fb0843f8..84420367d4 100644 --- a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/groovy/ReflectionTest.groovy +++ b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/groovy/ReflectionTest.groovy @@ -6,6 +6,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker + import java.lang.reflect.Field import java.lang.reflect.Method diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy index e3caa9a71d..7669b57f04 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy @@ -42,7 +42,8 @@ abstract class JaxRsClientTest extends HttpClientTest implem def response = request.build(method, body).invoke() try { response.close() - } catch (IOException ignore) {} + } catch (IOException ignore) { + } return response.status } catch (ProcessingException exception) { throw exception.getCause() diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy index b28c05f3af..6287e473c3 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy @@ -285,7 +285,8 @@ abstract class JaxRsHttpServerTest extends HttpServerTest implements Agent "$SemanticAttributes.HTTP_CLIENT_IP" TEST_CLIENT_IP "$SemanticAttributes.HTTP_SERVER_NAME" String "$SemanticAttributes.NET_TRANSPORT" IP_TCP - "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + // Optional + "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_ROUTE" path if (fullUrl.getPath().endsWith(ServerEndpoint.CAPTURE_HEADERS.getPath())) { "http.request.header.x_test_request" { it == ["test"] } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 4b6eb4d563..76dbe6a701 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -101,7 +101,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_USER_AGENT" String "$SemanticAttributes.HTTP_SERVER_NAME" String "$SemanticAttributes.NET_TRANSPORT" IP_TCP - "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + // Optional + "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_ROUTE" route } } diff --git a/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractorTest.groovy b/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractorTest.groovy index c4c8cff47a..0737957668 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractorTest.groovy +++ b/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractorTest.groovy @@ -5,15 +5,15 @@ package io.opentelemetry.instrumentation.mongo.v3_1 -import static io.opentelemetry.instrumentation.mongo.v3_1.MongoTracingBuilder.DEFAULT_MAX_NORMALIZED_QUERY_LENGTH -import static java.util.Arrays.asList - import org.bson.BsonArray import org.bson.BsonDocument import org.bson.BsonInt32 import org.bson.BsonString import spock.lang.Specification +import static io.opentelemetry.instrumentation.mongo.v3_1.MongoTracingBuilder.DEFAULT_MAX_NORMALIZED_QUERY_LENGTH +import static java.util.Arrays.asList + class MongoDbAttributesExtractorTest extends Specification { def 'should sanitize statements to json'() { diff --git a/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoSpanNameExtractorTest.groovy b/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoSpanNameExtractorTest.groovy index f83c4543a1..2da2182e29 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoSpanNameExtractorTest.groovy +++ b/instrumentation/mongo/mongo-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/mongo/v3_1/MongoSpanNameExtractorTest.groovy @@ -5,13 +5,13 @@ package io.opentelemetry.instrumentation.mongo.v3_1 -import static io.opentelemetry.instrumentation.mongo.v3_1.MongoTracingBuilder.DEFAULT_MAX_NORMALIZED_QUERY_LENGTH - import com.mongodb.event.CommandStartedEvent import org.bson.BsonDocument import org.bson.BsonInt32 import spock.lang.Specification +import static io.opentelemetry.instrumentation.mongo.v3_1.MongoTracingBuilder.DEFAULT_MAX_NORMALIZED_QUERY_LENGTH + class MongoSpanNameExtractorTest extends Specification { def 'test span name with no dbName'() { diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index 18e77c73eb..ef731b217b 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -5,19 +5,20 @@ package io.opentelemetry.instrumentation.mongo.testing -import static io.opentelemetry.api.trace.SpanKind.CLIENT - import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import java.util.concurrent.atomic.AtomicInteger import org.slf4j.LoggerFactory import org.testcontainers.containers.GenericContainer import org.testcontainers.containers.output.Slf4jLogConsumer import spock.lang.Shared +import java.util.concurrent.atomic.AtomicInteger + +import static io.opentelemetry.api.trace.SpanKind.CLIENT + abstract class AbstractMongoClientTest extends InstrumentationSpecification { @Shared diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy b/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy index b651638c3d..3b8fc6efb1 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy @@ -7,11 +7,11 @@ import com.rabbitmq.client.ConnectionFactory import org.slf4j.Logger import org.slf4j.LoggerFactory import org.testcontainers.containers.GenericContainer - -import java.time.Duration import org.testcontainers.containers.output.Slf4jLogConsumer import org.testcontainers.containers.wait.strategy.Wait +import java.time.Duration + trait WithRabbitMqTrait { private static final Logger logger = LoggerFactory.getLogger("io.opentelemetry.testing.rabbitmq-container") diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy index 91c61c9836..a80d7fada4 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy @@ -18,8 +18,9 @@ import ratpack.test.embed.EmbeddedApp class RatpackFunctionalTest extends MainClassApplicationUnderTest { Registry registry - @Lazy InMemorySpanExporter spanExporter = registry.get(SpanExporter) as InMemorySpanExporter - EmbeddedApp app = EmbeddedApp.of { server -> + @Lazy + InMemorySpanExporter spanExporter = registry.get(SpanExporter) as InMemorySpanExporter + EmbeddedApp app = EmbeddedApp.of { server -> server.handlers { chain -> chain.get("other") { ctx -> ctx.render("hi-other") } } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy index c51722c38c..bc363bd7db 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy @@ -75,7 +75,7 @@ class ContextPropagationOperatorInstrumentationTest extends AgentInstrumentation setup: def result = Mono.defer({ -> Span span = GlobalOpenTelemetry.getTracer("test").spanBuilder("parent").startSpan() - def outer = Mono.defer({ -> new TracedWithSpan().mono(Mono.just("Value") )}); + def outer = Mono.defer({ -> new TracedWithSpan().mono(Mono.just("Value")) }); return ContextPropagationOperator .runWithContext(outer, Context.current().with(span)) .doFinally({ i -> span.end() }) @@ -108,7 +108,7 @@ class ContextPropagationOperatorInstrumentationTest extends AgentInstrumentation setup: def result = Flux.defer({ -> Span span = GlobalOpenTelemetry.getTracer("test").spanBuilder("parent").startSpan() - def outer = Flux.defer({ -> new TracedWithSpan().flux(Flux.just("Value") )}); + def outer = Flux.defer({ -> new TracedWithSpan().flux(Flux.just("Value")) }); return ContextPropagationOperator .runWithContext(outer, Context.current().with(span)) .doFinally({ i -> span.end() }) diff --git a/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy index 697a031744..f650eec61d 100644 --- a/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy +++ b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy @@ -30,7 +30,7 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai def "Current in non-blocking publisher assembly"() { when: runWithSpan({ - return publisherSupplier().transform({ publisher -> traceNonBlocking(publisher, "inner")}) + return publisherSupplier().transform({ publisher -> traceNonBlocking(publisher, "inner") }) }) then: @@ -61,19 +61,23 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai where: paramName | publisherSupplier - "basic mono" | { -> Mono.fromCallable({ i -> - Span.current().setAttribute("inner", "foo") - return 1 - }) } - "basic flux" | { -> Flux.defer({ - Span.current().setAttribute("inner", "foo") - return Flux.just([5,6].toArray()) - })} + "basic mono" | { -> + Mono.fromCallable({ i -> + Span.current().setAttribute("inner", "foo") + return 1 + }) + } + "basic flux" | { -> + Flux.defer({ + Span.current().setAttribute("inner", "foo") + return Flux.just([5, 6].toArray()) + }) + } } def "Nested non-blocking"() { when: - def result = runWithSpan({ + def result = runWithSpan({ Mono.defer({ -> Span.current().setAttribute("middle", "foo") return Mono.fromCallable({ -> @@ -82,7 +86,7 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai }) .transform({ i -> traceNonBlocking(i, "inner") }) }) - .transform({ m -> traceNonBlocking(m, "middle")}) + .transform({ m -> traceNonBlocking(m, "middle") }) }) then: @@ -128,7 +132,7 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai tracingOperator.resetOnEachOperator() def result1 = Mono.fromCallable({ -> - assert !Span.current().getSpanContext().isValid() : "current span is not set" + assert !Span.current().getSpanContext().isValid(): "current span is not set" return 1 }) .transform({ i -> @@ -136,14 +140,15 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai def beforeSpan = GlobalOpenTelemetry.getTracer("test").spanBuilder("before").startSpan() return ContextPropagationOperator - .runWithContext(i, Context.root().with(beforeSpan)) + .runWithContext(i, Context.root().with(beforeSpan)) .doOnEach({ signal -> - assert !Span.current().getSpanContext().isValid() : "current span is not set" - })}).block() + assert !Span.current().getSpanContext().isValid(): "current span is not set" + }) + }).block() tracingOperator.registerOnEachOperator() def result2 = Mono.fromCallable({ -> - assert Span.current().getSpanContext().isValid() : "current span is set" + assert Span.current().getSpanContext().isValid(): "current span is set" return 2 }) .transform({ i -> @@ -151,13 +156,14 @@ class ReactorCoreTest extends AbstractReactorCoreTest implements LibraryTestTrai def afterSpan = GlobalOpenTelemetry.getTracer("test").spanBuilder("after").startSpan() return ContextPropagationOperator - .runWithContext(i, Context.root().with(afterSpan)) + .runWithContext(i, Context.root().with(afterSpan)) .doOnEach({ signal -> - assert Span.current().getSpanContext().isValid() : "current span is set" + assert Span.current().getSpanContext().isValid(): "current span is set" if (signal.isOnComplete()) { Span.current().end() } - })}).block() + }) + }).block() then: result1 == 1 diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy index 51a80bed60..d9ebc777cd 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy @@ -38,7 +38,7 @@ class ReactorNettyWithSpanTest extends InstrumentationSpecification implements A def httpRequest = Mono.defer({ -> httpClient.get().uri("http://localhost:${server.httpPort()}/success") - .responseSingle ({ resp, content -> + .responseSingle({ resp, content -> // Make sure to consume content since that's when we close the span. content.map { resp } }) diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy index 779685949e..ee12c08291 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy @@ -195,7 +195,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest() def httpClient = createHttpClient() - .doOnConnect({ uniqueChannelHashes.add(it.channelHash())}) + .doOnConnect({ uniqueChannelHashes.add(it.channelHash()) }) def uri = "http://localhost:${server.httpPort()}/success" def count = 100 diff --git a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy index 3fffd1d692..ccc3bb8aee 100644 --- a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy +++ b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy @@ -13,5 +13,5 @@ class SpringBeanRouterTest extends AbstractSpringServerTest implements AgentTest String getConfigurationName() { return "springBeanRouterConf.xml" } - + } diff --git a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy index ab5e0a9902..bb824d14c0 100644 --- a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy +++ b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy @@ -13,5 +13,5 @@ class SpringRouterTest extends AbstractSpringServerTest implements AgentTestTrai String getConfigurationName() { return "springRouterConf.xml" } - + } diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/TestServlet2.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/TestServlet2.groovy index 2f8b5817ce..ff59631fd4 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/TestServlet2.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/TestServlet2.groovy @@ -43,7 +43,7 @@ class TestServlet2 { case EXCEPTION: throw new Exception(endpoint.body) case INDEXED_CHILD: - INDEXED_CHILD.collectSpanAttributes {name -> req.getParameter(name) } + INDEXED_CHILD.collectSpanAttributes { name -> req.getParameter(name) } resp.status = endpoint.status resp.writer.print(endpoint.body) break diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy index e0c7aa31de..a994a8c1eb 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy @@ -5,6 +5,7 @@ import groovy.servlet.AbstractHttpServlet import io.opentelemetry.instrumentation.test.base.HttpServerTest + import javax.servlet.RequestDispatcher import javax.servlet.ServletException import javax.servlet.annotation.WebServlet diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy index 4da58464ea..7ea0f137a9 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TestServlet5.groovy @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_PARAMETERS - import io.opentelemetry.instrumentation.test.base.HttpServerTest import jakarta.servlet.RequestDispatcher import jakarta.servlet.ServletException @@ -16,6 +14,7 @@ import jakarta.servlet.http.HttpServletResponse import java.util.concurrent.CountDownLatch import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_HEADERS +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_PARAMETERS import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.INDEXED_CHILD diff --git a/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/AbstractSpringCloudStreamProducerTest.groovy b/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/AbstractSpringCloudStreamProducerTest.groovy index bcdb01cda4..bee9853d2f 100644 --- a/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/AbstractSpringCloudStreamProducerTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/AbstractSpringCloudStreamProducerTest.groovy @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.InstrumentationSpecification + import static io.opentelemetry.api.trace.SpanKind.CONSUMER import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static org.junit.jupiter.api.Assumptions.assumeTrue -import io.opentelemetry.instrumentation.test.InstrumentationSpecification - abstract class AbstractSpringCloudStreamProducerTest extends InstrumentationSpecification implements WithRabbitProducerConsumerTrait { private static final boolean HAS_PRODUCER_SPAN = Boolean.getBoolean("otel.instrumentation.spring-integration.producer.enabled") diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy index 40a5d3fa2f..8f14e2073e 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/AsyncServlet.groovy @@ -7,11 +7,12 @@ package io.opentelemetry.javaagent.instrumentation.tomcat.v7_0 import groovy.servlet.AbstractHttpServlet import io.opentelemetry.instrumentation.test.base.HttpServerTest -import java.util.concurrent.CountDownLatch + import javax.servlet.ServletException import javax.servlet.annotation.WebServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse +import java.util.concurrent.CountDownLatch import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_HEADERS import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/ThreadPoolExecutorTest.groovy b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/ThreadPoolExecutorTest.groovy index 6b8a880d88..517b8ad71e 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/ThreadPoolExecutorTest.groovy +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/ThreadPoolExecutorTest.groovy @@ -7,11 +7,12 @@ package io.opentelemetry.javaagent.instrumentation.tomcat.v7_0 import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification +import org.apache.tomcat.util.threads.TaskQueue +import org.apache.tomcat.util.threads.ThreadPoolExecutor + import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import org.apache.tomcat.util.threads.TaskQueue -import org.apache.tomcat.util.threads.ThreadPoolExecutor class ThreadPoolExecutorTest extends AgentInstrumentationSpecification { diff --git a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadinTest.groovy b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadinTest.groovy index daf5744a38..7bafc5825b 100644 --- a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadinTest.groovy +++ b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadinTest.groovy @@ -11,7 +11,6 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait - import org.openqa.selenium.chrome.ChromeOptions import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapperTest.groovy b/muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapperTest.groovy index 5763877199..ea98a6e06c 100644 --- a/muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapperTest.groovy +++ b/muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapperTest.groovy @@ -9,8 +9,8 @@ import io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef import io.opentelemetry.javaagent.tooling.muzzle.references.Flag import io.opentelemetry.javaagent.tooling.muzzle.references.Source import muzzle.HelperReferenceWrapperTestClasses -import org.objectweb.asm.Type import net.bytebuddy.pool.TypePool +import org.objectweb.asm.Type import spock.lang.Shared import spock.lang.Specification diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy index 22e7dd61c5..ccd5dd789d 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy @@ -31,6 +31,7 @@ abstract class LibertyServletOnlySmokeTest extends LibertySmokeTest { @AppServer(version = "20.0.0.12", jdk = "11") class LibertyServletOnly20Jdk11 extends LibertySmokeTest { } + @AppServer(version = "21.0.0.10", jdk = "11") class LibertyServletOnly21Jdk11 extends LibertySmokeTest { } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LogsSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LogsSmokeTest.groovy index 56b932857c..929f36fdf3 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LogsSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LogsSmokeTest.groovy @@ -6,9 +6,10 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest -import java.time.Duration import spock.lang.IgnoreIf +import java.time.Duration + import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContainers import static java.util.stream.Collectors.toList diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index f2a6dc5cef..11f23f7d64 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -705,8 +705,8 @@ abstract class HttpServerTest extends InstrumentationSpecification imple if (httpAttributes.contains(SemanticAttributes.NET_PEER_IP)) { "$SemanticAttributes.NET_PEER_IP" { it == peerIp(endpoint) } } else { - "$SemanticAttributes.NET_PEER_IP" { it == null || it == peerIp(endpoint) } // Optional + "$SemanticAttributes.NET_PEER_IP" { it == null || it == peerIp(endpoint) } } "$SemanticAttributes.HTTP_CLIENT_IP" { it == null || it == TEST_CLIENT_IP } @@ -722,14 +722,14 @@ abstract class HttpServerTest extends InstrumentationSpecification imple if (httpAttributes.contains(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH)) { "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long } else { - "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } } if (httpAttributes.contains(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH)) { "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } else { - "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } } if (httpAttributes.contains(SemanticAttributes.HTTP_SERVER_NAME)) { "$SemanticAttributes.HTTP_SERVER_NAME" String @@ -770,8 +770,8 @@ abstract class HttpServerTest extends InstrumentationSpecification imple if (httpAttributes.contains(SemanticAttributes.NET_PEER_IP)) { "$SemanticAttributes.NET_PEER_IP" { it == peerIp(endpoint) } } else { - "$SemanticAttributes.NET_PEER_IP" { it == null || it == peerIp(endpoint) } // Optional + "$SemanticAttributes.NET_PEER_IP" { it == null || it == peerIp(endpoint) } } "$SemanticAttributes.HTTP_CLIENT_IP" { it == null || it == TEST_CLIENT_IP } @@ -787,14 +787,14 @@ abstract class HttpServerTest extends InstrumentationSpecification imple if (httpAttributes.contains(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH)) { "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long } else { - "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } } if (httpAttributes.contains(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH)) { "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } else { - "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } // Optional + "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } } if (httpAttributes.contains(SemanticAttributes.HTTP_ROUTE)) { // TODO(anuraaga): Revisit this when applying instrumenters to more libraries, Armeria diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 63b9c100d8..4f28fc6a16 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -924,9 +924,7 @@ public abstract class AbstractHttpClientTest { } } - // Optional - // TODO(anuraaga): Move to test knob rather than always treating - // as optional + // TODO(anuraaga): Move to test knob rather than always treating as optional if (attrs.asMap().containsKey(SemanticAttributes.NET_PEER_IP)) { if (uri.getHost().equals("192.0.2.1")) { // NB(anuraaga): This branch seems to currently only be exercised on Java 15.