Change groovy import order (#1013)

* Update docs

* Format all groovy code

* Organize imports
This commit is contained in:
Trask Stalnaker 2020-08-15 23:19:27 -07:00 committed by GitHub
parent 414213f2d1
commit 7159d04b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
218 changed files with 1029 additions and 1138 deletions

View File

@ -16,11 +16,10 @@
package io.opentelemetry.instrumentation.auto.api
import spock.lang.Specification
import spock.lang.Timeout
import java.util.concurrent.Phaser
import java.util.concurrent.TimeUnit
import spock.lang.Specification
import spock.lang.Timeout
class AgentClassLoaderTest extends Specification {
@Timeout(value = 60, unit = TimeUnit.SECONDS)

View File

@ -1,3 +1,7 @@
import java.lang.reflect.Method
import java.security.SecureClassLoader
import java.util.concurrent.atomic.AtomicReference
import java.util.regex.Pattern
import org.apache.maven.repository.internal.MavenRepositorySystemUtils
import org.eclipse.aether.DefaultRepositorySystemSession
import org.eclipse.aether.RepositorySystem
@ -21,11 +25,6 @@ import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.model.ObjectFactory
import java.lang.reflect.Method
import java.security.SecureClassLoader
import java.util.concurrent.atomic.AtomicReference
import java.util.regex.Pattern
/**
* muzzle task plugin which runs muzzle validation against a range of dependencies.
*/

View File

@ -10,7 +10,7 @@ Suggested plugins and settings:
* Editor > Code Style > Java/Groovy > Imports
* Class count to use import with '*': `9999` (some number sufficiently large that is unlikely to matter)
* Names count to use static import with '*': `9999`
* With java use the following import layout (groovy should still use the default) to ensure consistency with google-java-format:
* Import Layout:
![import layout](https://user-images.githubusercontent.com/734411/43430811-28442636-94ae-11e8-86f1-f270ddcba023.png)
* [Google Java Format](https://plugins.jetbrains.com/plugin/8527-google-java-format)
* [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions)

View File

@ -16,11 +16,6 @@
package io.opentelemetry.instrumentation.api.config
import io.opentelemetry.auto.util.test.AgentSpecification
import org.junit.Rule
import org.junit.contrib.java.lang.system.EnvironmentVariables
import org.junit.contrib.java.lang.system.RestoreSystemProperties
import static Config.CONFIGURATION_FILE
import static Config.ENDPOINT_PEER_SERVICE_MAPPING
import static Config.HTTP_CLIENT_ERROR_STATUSES
@ -30,6 +25,11 @@ import static Config.RUNTIME_CONTEXT_FIELD_INJECTION
import static Config.TRACE_ENABLED
import static Config.TRACE_METHODS
import io.opentelemetry.auto.util.test.AgentSpecification
import org.junit.Rule
import org.junit.contrib.java.lang.system.EnvironmentVariables
import org.junit.contrib.java.lang.system.RestoreSystemProperties
class ConfigTest extends AgentSpecification {
@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties()

View File

@ -16,14 +16,14 @@
package io.opentelemetry.instrumentation.api.tracer
import static io.opentelemetry.auto.test.utils.ConfigUtils.withConfigOverride
import io.opentelemetry.context.propagation.HttpTextFormat
import io.opentelemetry.instrumentation.api.decorator.HttpStatusConverter
import io.opentelemetry.trace.Span
import io.opentelemetry.trace.attributes.SemanticAttributes
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.ConfigUtils.withConfigOverride
class HttpClientTracerTest extends BaseTracerTest {
@Shared

View File

@ -16,11 +16,14 @@
package io.opentelemetry.instrumentation.reactor
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import io.opentelemetry.OpenTelemetry
import io.opentelemetry.auto.test.InstrumentationTestRunner
import io.opentelemetry.auto.test.utils.TraceUtils
import io.opentelemetry.trace.DefaultSpan
import io.opentelemetry.trace.Tracer
import java.time.Duration
import org.reactivestreams.Publisher
import org.reactivestreams.Subscriber
import org.reactivestreams.Subscription
@ -28,10 +31,6 @@ import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
import spock.lang.Shared
import java.time.Duration
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
class ReactorCoreTest extends InstrumentationTestRunner {
public static final String EXCEPTION_MESSAGE = "test exception"

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import akka.dispatch.forkjoin.ForkJoinPool
import akka.dispatch.forkjoin.ForkJoinTask
import io.opentelemetry.auto.test.AgentTestRunner
@ -27,8 +29,6 @@ import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
/**
* Test executor instrumentation for Akka specific classes.
* This is to large extent a copy of ExecutorInstrumentationTest.

View File

@ -14,22 +14,21 @@
* limitations under the License.
*/
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.TestServer
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.defaultSetup
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.startServer
import static io.opentelemetry.trace.Span.Kind.SERVER
import akka.NotUsed
import akka.stream.javadsl.Source
import akka.stream.testkit.TestSubscriber.Probe
import akka.stream.testkit.javadsl.TestSink
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.function.Function
import play.inject.guice.GuiceApplicationBuilder
import spock.lang.Shared
import java.util.function.Function
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.TestServer
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.defaultSetup
import static com.lightbend.lagom.javadsl.testkit.ServiceTest.startServer
import static io.opentelemetry.trace.Span.Kind.SERVER
class LagomTest extends AgentTestRunner {
@Shared

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import akka.actor.ActorSystem
import akka.http.javadsl.Http
import akka.http.javadsl.model.HttpMethods
@ -25,8 +27,6 @@ import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
import spock.lang.Shared
import spock.lang.Timeout
import static io.opentelemetry.trace.Span.Kind.CLIENT
@Timeout(5)
class AkkaHttpClientInstrumentationTest extends HttpClientTest {

View File

@ -15,6 +15,7 @@
*/
import io.opentelemetry.auto.test.base.HttpClientTest
import java.util.concurrent.CompletableFuture
import org.apache.http.HttpResponse
import org.apache.http.client.config.RequestConfig
import org.apache.http.concurrent.FutureCallback
@ -24,8 +25,6 @@ import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Timeout
import java.util.concurrent.CompletableFuture
@Timeout(5)
class ApacheHttpAsyncClientCallbackTest extends HttpClientTest {

View File

@ -15,6 +15,7 @@
*/
import io.opentelemetry.auto.test.base.HttpClientTest
import java.util.concurrent.Future
import org.apache.http.client.config.RequestConfig
import org.apache.http.impl.nio.client.HttpAsyncClients
import org.apache.http.message.BasicHeader
@ -22,8 +23,6 @@ import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Timeout
import java.util.concurrent.Future
@Timeout(5)
class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest {

View File

@ -15,6 +15,7 @@
*/
import io.opentelemetry.auto.test.base.HttpClientTest
import java.util.concurrent.CountDownLatch
import org.apache.http.HttpResponse
import org.apache.http.client.config.RequestConfig
import org.apache.http.concurrent.FutureCallback
@ -24,8 +25,6 @@ import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Timeout
import java.util.concurrent.CountDownLatch
@Timeout(5)
class ApacheHttpAsyncClientTest extends HttpClientTest {

View File

@ -16,6 +16,9 @@
package io.opentelemetry.instrumentation.armeria.v1_0
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
import com.linecorp.armeria.client.WebClient
import com.linecorp.armeria.client.WebClientBuilder
import com.linecorp.armeria.common.HttpMethod
@ -29,9 +32,6 @@ import io.opentelemetry.trace.attributes.SemanticAttributes
import spock.lang.Shared
import spock.lang.Unroll
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
@Unroll
abstract class AbstractArmeriaTest extends InstrumentationSpecification {

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.amazonaws.AmazonClientException
import com.amazonaws.AmazonWebServiceClient
import com.amazonaws.ClientConfiguration
@ -47,15 +51,10 @@ import com.amazonaws.services.sqs.model.SendMessageRequest
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.atomic.AtomicReference
import spock.lang.AutoCleanup
import spock.lang.Shared
import java.util.concurrent.atomic.AtomicReference
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.trace.Span.Kind.CLIENT
class AWS1ClientTest extends AgentTestRunner {
private static final CREDENTIALS_PROVIDER_CHAIN = new AWSCredentialsProviderChain(

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.amazonaws.AmazonClientException
import com.amazonaws.ClientConfiguration
import com.amazonaws.Request
@ -34,15 +38,10 @@ import com.amazonaws.services.s3.S3ClientOptions
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.atomic.AtomicReference
import spock.lang.AutoCleanup
import spock.lang.Shared
import java.util.concurrent.atomic.AtomicReference
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.trace.Span.Kind.CLIENT
class AWS0ClientTest extends AgentTestRunner {
private static final CREDENTIALS_PROVIDER_CHAIN = new AWSCredentialsProviderChain(

View File

@ -16,8 +16,14 @@
package io.opentelemetry.instrumentation.awssdk.v2_2
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.InstrumentationSpecification
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.time.Duration
import java.util.concurrent.Future
import java.util.concurrent.atomic.AtomicReference
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
import software.amazon.awssdk.core.ResponseInputStream
@ -47,13 +53,6 @@ import software.amazon.awssdk.services.sqs.model.SendMessageRequest
import spock.lang.AutoCleanup
import spock.lang.Shared
import java.time.Duration
import java.util.concurrent.Future
import java.util.concurrent.atomic.AtomicReference
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import static io.opentelemetry.trace.Span.Kind.CLIENT
abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
private static final StaticCredentialsProvider CREDENTIALS_PROVIDER = StaticCredentialsProvider

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.datastax.driver.core.Cluster
import com.datastax.driver.core.Session
import io.opentelemetry.auto.test.AgentTestRunner
@ -23,10 +27,6 @@ import io.opentelemetry.trace.attributes.SemanticAttributes
import org.cassandraunit.utils.EmbeddedCassandraServerHelper
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class CassandraClientTest extends AgentTestRunner {
@Shared

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.datastax.oss.driver.api.core.CqlSession
import com.datastax.oss.driver.api.core.config.DefaultDriverOption
import com.datastax.oss.driver.api.core.config.DriverConfigLoader
@ -22,13 +26,8 @@ import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.cassandraunit.utils.EmbeddedCassandraServerHelper
import java.time.Duration
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import org.cassandraunit.utils.EmbeddedCassandraServerHelper
class CassandraClientTest extends AgentTestRunner {

View File

@ -14,21 +14,20 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.couchbase.client.java.AsyncCluster
import com.couchbase.client.java.CouchbaseAsyncCluster
import com.couchbase.client.java.document.JsonDocument
import com.couchbase.client.java.document.json.JsonObject
import com.couchbase.client.java.env.CouchbaseEnvironment
import com.couchbase.client.java.query.N1qlQuery
import java.util.concurrent.TimeUnit
import spock.lang.Unroll
import spock.util.concurrent.BlockingVariable
import util.AbstractCouchbaseTest
import java.util.concurrent.TimeUnit
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
@Unroll
class CouchbaseAsyncClientTest extends AbstractCouchbaseTest {
static final int TIMEOUT = 10

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.couchbase.client.java.Bucket
import com.couchbase.client.java.Cluster
import com.couchbase.client.java.CouchbaseCluster
@ -24,9 +27,6 @@ import com.couchbase.client.java.query.N1qlQuery
import spock.lang.Unroll
import util.AbstractCouchbaseTest
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
@Unroll
class CouchbaseClientTest extends AbstractCouchbaseTest {
def "test hasBucket #type"() {

View File

@ -16,6 +16,8 @@
package springdata
import static com.google.common.base.Preconditions.checkNotNull
import com.couchbase.client.java.cluster.BucketSettings
import com.couchbase.client.java.env.CouchbaseEnvironment
import org.springframework.context.annotation.ComponentScan
@ -23,8 +25,6 @@ import org.springframework.context.annotation.Configuration
import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration
import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories
import static com.google.common.base.Preconditions.checkNotNull
@Configuration
@EnableCouchbaseRepositories(basePackages = "springdata")
@ComponentScan(basePackages = "springdata")

View File

@ -16,6 +16,9 @@
package springdata
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.couchbase.client.java.Cluster
import com.couchbase.client.java.CouchbaseCluster
import com.couchbase.client.java.env.CouchbaseEnvironment
@ -28,9 +31,6 @@ import spock.lang.Shared
import spock.lang.Unroll
import util.AbstractCouchbaseTest
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
@Unroll
class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
static final Closure<Doc> FIND

View File

@ -16,6 +16,9 @@
package springdata
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.couchbase.client.java.Bucket
import com.couchbase.client.java.Cluster
import com.couchbase.client.java.CouchbaseCluster
@ -27,9 +30,6 @@ import spock.lang.Shared
import spock.lang.Unroll
import util.AbstractCouchbaseTest
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
@Retry(count = 10, delay = 500)
@Unroll
class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest {

View File

@ -16,6 +16,8 @@
package util
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.couchbase.client.core.metrics.DefaultLatencyMetricsCollectorConfig
import com.couchbase.client.core.metrics.DefaultMetricsCollectorConfig
import com.couchbase.client.java.bucket.BucketType
@ -31,11 +33,8 @@ import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import spock.lang.Shared
import java.util.concurrent.TimeUnit
import static io.opentelemetry.trace.Span.Kind.CLIENT
import spock.lang.Shared
abstract class AbstractCouchbaseTest extends AgentTestRunner {

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import static io.opentelemetry.trace.Span.Kind.CLIENT
class CouchbaseSpanUtil {
// Reusable span assertion method. Cannot directly override AbstractCouchbaseTest.assertCouchbaseSpan because
// Of the class hierarchy of these tests

View File

@ -14,11 +14,18 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import io.dropwizard.Application
import io.dropwizard.Configuration
import io.dropwizard.setup.Bootstrap
import io.dropwizard.setup.Environment
import java.util.concurrent.Executors
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.PathParam
@ -26,14 +33,6 @@ import javax.ws.rs.QueryParam
import javax.ws.rs.container.AsyncResponse
import javax.ws.rs.container.Suspended
import javax.ws.rs.core.Response
import java.util.concurrent.Executors
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
class DropwizardAsyncTest extends DropwizardTest {

View File

@ -14,6 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
import io.dropwizard.Application
import io.dropwizard.Configuration
import io.dropwizard.setup.Bootstrap
@ -26,22 +35,12 @@ import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.instrumentation.api.MoreAttributes
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.PathParam
import javax.ws.rs.QueryParam
import javax.ws.rs.core.Response
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class DropwizardTest extends HttpServerTest<DropwizardTestSupport> {
@Override

View File

@ -14,16 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import io.dropwizard.views.View
import io.dropwizard.views.freemarker.FreemarkerViewRenderer
import io.dropwizard.views.mustache.MustacheViewRenderer
import io.opentelemetry.auto.test.AgentTestRunner
import java.nio.charset.StandardCharsets
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
class ViewRenderTest extends AgentTestRunner {
def "render #template succeeds with span"() {

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import groovy.json.JsonSlurper
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
@ -33,9 +36,6 @@ import org.elasticsearch.node.Node
import org.elasticsearch.transport.Netty4Plugin
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class Elasticsearch6RestClientTest extends AgentTestRunner {
@Shared
TransportAddress httpTransportAddress

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import groovy.json.JsonSlurper
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
@ -34,10 +38,6 @@ import org.elasticsearch.node.internal.InternalSettingsPreparer
import org.elasticsearch.transport.Netty3Plugin
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch5RestClientTest extends AgentTestRunner {
@Shared
TransportAddress httpTransportAddress

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import groovy.json.JsonSlurper
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
@ -36,9 +39,6 @@ import org.elasticsearch.plugins.Plugin
import org.elasticsearch.transport.Netty4Plugin
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class Elasticsearch6RestClientTest extends AgentTestRunner {
@Shared

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import groovy.json.JsonSlurper
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
@ -33,9 +36,6 @@ import org.elasticsearch.node.Node
import org.elasticsearch.transport.Netty4Plugin
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class Elasticsearch6RestClientTest extends AgentTestRunner {
@Shared
TransportAddress httpTransportAddress

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -26,9 +29,6 @@ import org.elasticsearch.node.NodeBuilder
import org.elasticsearch.transport.TransportService
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2NodeClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -29,9 +32,6 @@ import org.elasticsearch.transport.RemoteTransportException
import org.elasticsearch.transport.TransportService
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2TransportClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -16,15 +16,15 @@
package springdata
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
@Shared
ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config)

View File

@ -16,8 +16,11 @@
package springdata
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.atomic.AtomicLong
import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings
@ -33,10 +36,6 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder
import spock.lang.Shared
import java.util.concurrent.atomic.AtomicLong
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -24,9 +27,6 @@ import org.elasticsearch.node.Node
import org.elasticsearch.node.NodeBuilder
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2NodeClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -29,9 +32,6 @@ import org.elasticsearch.transport.RemoteTransportException
import org.elasticsearch.transport.TransportService
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2TransportClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -16,15 +16,15 @@
package springdata
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
@Shared
ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config)

View File

@ -16,8 +16,11 @@
package springdata
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.atomic.AtomicLong
import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings
@ -33,10 +36,6 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder
import spock.lang.Shared
import java.util.concurrent.atomic.AtomicLong
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -26,10 +30,6 @@ import org.elasticsearch.node.internal.InternalSettingsPreparer
import org.elasticsearch.transport.Netty3Plugin
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch5NodeClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -31,10 +35,6 @@ import org.elasticsearch.transport.TransportService
import org.elasticsearch.transport.client.PreBuiltTransportClient
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch5TransportClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -26,10 +30,6 @@ import org.elasticsearch.node.Node
import org.elasticsearch.transport.Netty3Plugin
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch53NodeClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -31,10 +35,6 @@ import org.elasticsearch.transport.TransportService
import org.elasticsearch.transport.client.PreBuiltTransportClient
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch53TransportClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -16,19 +16,18 @@
package springdata
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared
import java.lang.reflect.InvocationHandler
import java.lang.reflect.Method
import java.lang.reflect.Proxy
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.lang.reflect.InvocationHandler
import java.lang.reflect.Method
import java.lang.reflect.Proxy
import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared
class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
// Setting up appContext & repo with @Shared doesn't allow
// spring-data instrumentation to applied.

View File

@ -16,9 +16,14 @@
package springdata
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import com.google.common.collect.ImmutableSet
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.atomic.AtomicLong
import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings
@ -36,12 +41,6 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder
import spock.lang.Shared
import java.util.concurrent.atomic.AtomicLong
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -25,10 +29,6 @@ import org.elasticsearch.node.Node
import org.elasticsearch.transport.Netty4Plugin
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch6NodeClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
@ -30,10 +34,6 @@ import org.elasticsearch.transport.TransportService
import org.elasticsearch.transport.client.PreBuiltTransportClient
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
class Elasticsearch6TransportClientTest extends AgentTestRunner {
public static final long TIMEOUT = 10000; // 10 seconds

View File

@ -14,15 +14,14 @@
* limitations under the License.
*/
import io.opentelemetry.instrumentation.auto.traceannotation.TraceAnnotationsInstrumentation
import static io.opentelemetry.instrumentation.auto.traceannotation.TraceAnnotationsInstrumentation.DEFAULT_ANNOTATIONS
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import io.opentelemetry.instrumentation.auto.traceannotation.TraceAnnotationsInstrumentation
import io.opentelemetry.test.annotation.SayTracedHello
import java.util.concurrent.Callable
import static io.opentelemetry.instrumentation.auto.traceannotation.TraceAnnotationsInstrumentation.DEFAULT_ANNOTATIONS
class ConfiguredTraceAnnotationsTest extends AgentTestRunner {
static {

View File

@ -17,7 +17,6 @@
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.test.annotation.SayTracedHello
import io.opentracing.contrib.dropwizard.Trace
import java.util.concurrent.Callable
class TraceAnnotationsTest extends AgentTestRunner {

View File

@ -16,7 +16,6 @@
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import java.util.concurrent.Callable
class TraceConfigTest extends AgentTestRunner {

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
import io.opentracing.contrib.dropwizard.Trace
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import io.opentracing.contrib.dropwizard.Trace
class TracedMethodsExclusionTest extends AgentTestRunner {

View File

@ -14,6 +14,11 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
import com.twitter.finatra.http.HttpServer
import com.twitter.util.Await
import com.twitter.util.Closable
@ -23,14 +28,8 @@ import io.opentelemetry.auto.test.base.HttpServerTest
import io.opentelemetry.instrumentation.api.MoreAttributes
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.TimeoutException
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class FinatraServerTest extends HttpServerTest<HttpServer> {
private static final Duration TIMEOUT = Duration.fromSeconds(5)
private static final long STARTUP_TIMEOUT = 40 * 1000

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.apache.geode.cache.client.ClientCacheFactory
@ -21,10 +25,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut
import spock.lang.Shared
import spock.lang.Unroll
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
@Unroll
class PutGetTest extends AgentTestRunner {
@Shared

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.google.api.client.http.GenericUrl
import com.google.api.client.http.HttpRequest
import com.google.api.client.http.HttpResponse
@ -22,8 +24,6 @@ import io.opentelemetry.auto.test.base.HttpClientTest
import io.opentelemetry.trace.attributes.SemanticAttributes
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
abstract class AbstractGoogleHttpClientTest extends HttpClientTest {
@Shared
@ -44,7 +44,8 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest {
// and lowercase all other headers
def ci = request.getHeaders().getClassInfo()
request.getHeaders().putAll(headers.collectEntries { name, value
-> [(name) : (ci.getFieldInfo(name) != null ? [value] : value.toLowerCase())]})
-> [(name): (ci.getFieldInfo(name) != null ? [value] : value.toLowerCase())]
})
request.setThrowExceptionOnExecuteError(throwExceptionOnError)

View File

@ -14,24 +14,23 @@
* limitations under the License.
*/
import org.glassfish.grizzly.http.server.HttpServer
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory
import org.glassfish.jersey.server.ResourceConfig
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.QueryParam
import javax.ws.rs.container.AsyncResponse
import javax.ws.rs.container.Suspended
import javax.ws.rs.core.Response
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import org.glassfish.grizzly.http.server.HttpServer
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory
import org.glassfish.jersey.server.ResourceConfig
class GrizzlyAsyncTest extends GrizzlyTest {

View File

@ -14,7 +14,21 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static java.lang.String.valueOf
import static java.nio.charset.Charset.defaultCharset
import static java.util.concurrent.TimeUnit.MILLISECONDS
import static org.glassfish.grizzly.memory.Buffers.wrap
import io.opentelemetry.auto.test.base.HttpServerTest
import java.util.concurrent.Executors
import org.glassfish.grizzly.filterchain.BaseFilter
import org.glassfish.grizzly.filterchain.FilterChain
import org.glassfish.grizzly.filterchain.FilterChainBuilder
@ -33,21 +47,6 @@ import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder
import org.glassfish.grizzly.utils.DelayedExecutor
import org.glassfish.grizzly.utils.IdleTimeoutFilter
import java.util.concurrent.Executors
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static java.lang.String.valueOf
import static java.nio.charset.Charset.defaultCharset
import static java.util.concurrent.TimeUnit.MILLISECONDS
import static org.glassfish.grizzly.memory.Buffers.wrap
class GrizzlyFilterchainServerTest extends HttpServerTest<HttpServer> {
static {

View File

@ -14,23 +14,22 @@
* limitations under the License.
*/
import io.opentelemetry.auto.test.base.HttpServerTest
import org.glassfish.grizzly.http.server.HttpServer
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory
import org.glassfish.jersey.server.ResourceConfig
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import io.opentelemetry.auto.test.base.HttpServerTest
import javax.ws.rs.GET
import javax.ws.rs.NotFoundException
import javax.ws.rs.Path
import javax.ws.rs.QueryParam
import javax.ws.rs.core.Response
import javax.ws.rs.ext.ExceptionMapper
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import org.glassfish.grizzly.http.server.HttpServer
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory
import org.glassfish.jersey.server.ResourceConfig
class GrizzlyTest extends HttpServerTest<HttpServer> {

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
import example.GreeterGrpc
import example.Helloworld
import io.grpc.BindableService
@ -26,14 +29,10 @@ import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.trace.Status
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicReference
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
class GrpcStreamingTest extends AgentTestRunner {
def "test conversation #name"() {

View File

@ -14,6 +14,11 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
import example.GreeterGrpc
import example.Helloworld
import io.grpc.BindableService
@ -24,19 +29,13 @@ import io.grpc.ServerBuilder
import io.grpc.Status
import io.grpc.StatusRuntimeException
import io.grpc.stub.StreamObserver
import io.opentelemetry.javaagent.common.exec.CommonTaskExecutor
import io.opentelemetry.instrumentation.auto.grpc.common.GrpcHelper
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.instrumentation.auto.grpc.common.GrpcHelper
import io.opentelemetry.javaagent.common.exec.CommonTaskExecutor
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.TimeUnit
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.SERVER
class GrpcTest extends AgentTestRunner {
def "test request-response"() {

View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.Criteria
import org.hibernate.Session
import org.hibernate.criterion.Order
import org.hibernate.criterion.Restrictions
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class CriteriaTest extends AbstractHibernateTest {
def "test criteria.#methodName"() {

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.Query
import org.hibernate.Session
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class QueryTest extends AbstractHibernateTest {
def "test hibernate query.#queryMethodName single call"() {

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.LockMode
import org.hibernate.MappingException
@ -22,10 +26,6 @@ import org.hibernate.ReplicationMode
import org.hibernate.Session
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class SessionTest extends AbstractHibernateTest {
@Shared

View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.Criteria
import org.hibernate.Session
import org.hibernate.criterion.Order
import org.hibernate.criterion.Restrictions
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class CriteriaTest extends AbstractHibernateTest {
def "test criteria.#methodName"() {

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.Query
import org.hibernate.Session
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class QueryTest extends AbstractHibernateTest {
def "test hibernate query.#queryMethodName single call"() {

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.hibernate.LockMode
import org.hibernate.MappingException
@ -22,10 +26,6 @@ import org.hibernate.ReplicationMode
import org.hibernate.Session
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class SessionTest extends AbstractHibernateTest {
@Shared

View File

@ -14,8 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.sql.Connection
import java.sql.DriverManager
import java.sql.Statement
import javax.persistence.ParameterMode
import org.hibernate.Session
import org.hibernate.SessionFactory
import org.hibernate.cfg.Configuration
@ -23,14 +30,6 @@ import org.hibernate.exception.SQLGrammarException
import org.hibernate.procedure.ProcedureCall
import spock.lang.Shared
import javax.persistence.ParameterMode
import java.sql.Connection
import java.sql.DriverManager
import java.sql.Statement
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class ProcedureCallTest extends AgentTestRunner {

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.springframework.context.annotation.AnnotationConfigApplicationContext
@ -22,8 +24,6 @@ import spring.jpa.Customer
import spring.jpa.CustomerRepository
import spring.jpa.PersistenceConfig
import static io.opentelemetry.trace.Span.Kind.CLIENT
/**
* Unfortunately this test verifies that our hibernate instrumentation doesn't currently work with Spring Data Repositories.
*/

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.base.HttpClientTest
import io.opentelemetry.trace.attributes.SemanticAttributes
import spock.lang.Ignore
@ -21,9 +24,6 @@ import spock.lang.Requires
import spock.lang.Timeout
import sun.net.www.protocol.https.HttpsURLConnectionImpl
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
@Timeout(5)
class HttpUrlConnectionTest extends HttpClientTest {
@ -74,7 +74,8 @@ class HttpUrlConnectionTest extends HttpClientTest {
connection = url.openConnection()
connection.useCaches = useCaches
assert activeSpan() != null
assert connection.getResponseCode() == STATUS // call before input stream to test alternate behavior
// call before input stream to test alternate behavior
assert connection.getResponseCode() == STATUS
connection.inputStream
stream = connection.inputStream // one more to ensure state is working
lines = stream.readLines()
@ -148,7 +149,8 @@ class HttpUrlConnectionTest extends HttpClientTest {
connection.useCaches = useCaches
connection.addRequestProperty("is-test-server", "false")
assert activeSpan() != null
assert connection.getResponseCode() == STATUS // call before input stream to test alternate behavior
// call before input stream to test alternate behavior
assert connection.getResponseCode() == STATUS
stream = connection.inputStream
lines = stream.readLines()
stream.close()

View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer
import io.opentelemetry.instrumentation.auto.api.AgentClassLoader
import io.opentelemetry.trace.attributes.SemanticAttributes
import static io.opentelemetry.auto.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class UrlConnectionTest extends AgentTestRunner {
def "trace request with connection failure #scheme"() {

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.netflix.hystrix.HystrixObservableCommand
import io.opentelemetry.auto.test.AgentTestRunner
import rx.Observable
import rx.schedulers.Schedulers
import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
class HystrixObservableChainTest extends AgentTestRunner {
static {
// Disable so failure testing below doesn't inadvertently change the behavior.

View File

@ -14,18 +14,17 @@
* limitations under the License.
*/
import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.netflix.hystrix.HystrixObservable
import com.netflix.hystrix.HystrixObservableCommand
import com.netflix.hystrix.exception.HystrixRuntimeException
import io.opentelemetry.auto.test.AgentTestRunner
import rx.Observable
import rx.schedulers.Schedulers
import java.util.concurrent.BlockingQueue
import java.util.concurrent.LinkedBlockingQueue
import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import rx.Observable
import rx.schedulers.Schedulers
class HystrixObservableTest extends AgentTestRunner {
static {

View File

@ -14,16 +14,15 @@
* limitations under the License.
*/
import com.netflix.hystrix.HystrixCommand
import io.opentelemetry.auto.test.AgentTestRunner
import spock.lang.Timeout
import java.util.concurrent.BlockingQueue
import java.util.concurrent.LinkedBlockingQueue
import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import com.netflix.hystrix.HystrixCommand
import io.opentelemetry.auto.test.AgentTestRunner
import java.util.concurrent.BlockingQueue
import java.util.concurrent.LinkedBlockingQueue
import spock.lang.Timeout
@Timeout(10)
class HystrixTest extends AgentTestRunner {
static {

View File

@ -14,12 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.sdk.trace.data.SpanData
import scala.concurrent.forkjoin.ForkJoinPool
import scala.concurrent.forkjoin.ForkJoinTask
import spock.lang.Shared
import java.lang.reflect.InvocationTargetException
import java.util.concurrent.ArrayBlockingQueue
import java.util.concurrent.Callable
@ -27,8 +25,9 @@ import java.util.concurrent.Future
import java.util.concurrent.RejectedExecutionException
import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import scala.concurrent.forkjoin.ForkJoinPool
import scala.concurrent.forkjoin.ForkJoinTask
import spock.lang.Shared
/**
* Test executor instrumentation for Scala specific classes.

View File

@ -14,9 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.sdk.trace.data.SpanData
import java.util.concurrent.ArrayBlockingQueue
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ThreadPoolExecutor
@ -24,8 +25,6 @@ import java.util.concurrent.TimeUnit
import java.util.function.Function
import java.util.function.Supplier
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
/**
* Note: ideally this should live with the rest of ExecutorInstrumentationTest,
* but this code needs java8 so we put it here for now.

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.trace.attributes.SemanticAttributes
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.trace.attributes.SemanticAttributes
class SlickTest extends AgentTestRunner {
// Can't be @Shared, otherwise the work queue is initialized before the instrumentation is applied

View File

@ -14,14 +14,13 @@
* limitations under the License.
*/
import io.opentelemetry.auto.test.AgentTestRunner
import spock.lang.Requires
import java.util.concurrent.CompletableFuture
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import io.opentelemetry.auto.test.AgentTestRunner
import java.util.concurrent.CompletableFuture
import spock.lang.Requires
@Requires({ javaVersion >= 1.8 })
class CompletableFutureTest extends AgentTestRunner {

View File

@ -14,13 +14,14 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static org.junit.Assume.assumeTrue
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import io.opentelemetry.instrumentation.auto.api.concurrent.CallableWrapper
import io.opentelemetry.instrumentation.auto.api.concurrent.RunnableWrapper
import io.opentelemetry.sdk.trace.data.SpanData
import spock.lang.Shared
import java.lang.reflect.InvocationTargetException
import java.util.concurrent.AbstractExecutorService
import java.util.concurrent.ArrayBlockingQueue
@ -37,9 +38,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor
import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static org.junit.Assume.assumeTrue
import spock.lang.Shared
class ExecutorInstrumentationTest extends AgentTestRunner {

View File

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.test.AgentTestRunner
import javax.swing.*
/**

View File

@ -14,16 +14,15 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
import io.opentelemetry.auto.test.AgentTestRunner
import javax.ws.rs.client.Client
import org.glassfish.jersey.client.JerseyClientBuilder
import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.util.concurrent.AsyncConditions
import javax.ws.rs.client.Client
import static io.opentelemetry.auto.test.server.http.TestHttpServer.httpServer
class JaxMultithreadedClientTest extends AgentTestRunner {
@AutoCleanup

View File

@ -15,13 +15,8 @@
*/
import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.ClientConfig
import org.glassfish.jersey.client.ClientProperties
import org.glassfish.jersey.client.JerseyClientBuilder
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder
import spock.lang.Timeout
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import javax.ws.rs.client.AsyncInvoker
import javax.ws.rs.client.Client
import javax.ws.rs.client.ClientBuilder
@ -30,8 +25,12 @@ import javax.ws.rs.client.InvocationCallback
import javax.ws.rs.client.WebTarget
import javax.ws.rs.core.MediaType
import javax.ws.rs.core.Response
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.ClientConfig
import org.glassfish.jersey.client.ClientProperties
import org.glassfish.jersey.client.JerseyClientBuilder
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder
import spock.lang.Timeout
abstract class JaxRsClientAsyncTest extends HttpClientTest {

View File

@ -15,13 +15,7 @@
*/
import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.ClientConfig
import org.glassfish.jersey.client.ClientProperties
import org.glassfish.jersey.client.JerseyClientBuilder
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder
import spock.lang.Timeout
import java.util.concurrent.TimeUnit
import javax.ws.rs.client.Client
import javax.ws.rs.client.ClientBuilder
import javax.ws.rs.client.Entity
@ -29,7 +23,12 @@ import javax.ws.rs.client.Invocation
import javax.ws.rs.client.WebTarget
import javax.ws.rs.core.MediaType
import javax.ws.rs.core.Response
import java.util.concurrent.TimeUnit
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.ClientConfig
import org.glassfish.jersey.client.ClientProperties
import org.glassfish.jersey.client.JerseyClientBuilder
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder
import spock.lang.Timeout
abstract class JaxRsClientTest extends HttpClientTest {

View File

@ -14,10 +14,12 @@
* limitations under the License.
*/
import io.opentelemetry.instrumentation.auto.jaxrs.v1_0.JaxRsAnnotationsTracer
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.auto.api.WeakMap
import io.opentelemetry.instrumentation.auto.jaxrs.v1_0.JaxRsAnnotationsTracer
import java.lang.reflect.Method
import javax.ws.rs.DELETE
import javax.ws.rs.GET
import javax.ws.rs.HEAD
@ -25,9 +27,6 @@ import javax.ws.rs.OPTIONS
import javax.ws.rs.POST
import javax.ws.rs.PUT
import javax.ws.rs.Path
import java.lang.reflect.Method
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
class JaxRsAnnotations1InstrumentationTest extends AgentTestRunner {

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.dropwizard.testing.junit.ResourceTestRule
import io.opentelemetry.auto.test.AgentTestRunner
import org.junit.ClassRule
import spock.lang.Shared
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class JerseyTest extends AgentTestRunner {
@Shared

View File

@ -14,10 +14,12 @@
* limitations under the License.
*/
import io.opentelemetry.instrumentation.auto.jaxrs.v2_0.JaxRsAnnotationsTracer
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.instrumentation.auto.api.WeakMap
import io.opentelemetry.instrumentation.auto.jaxrs.v2_0.JaxRsAnnotationsTracer
import java.lang.reflect.Method
import javax.ws.rs.DELETE
import javax.ws.rs.GET
import javax.ws.rs.HEAD
@ -25,9 +27,6 @@ import javax.ws.rs.OPTIONS
import javax.ws.rs.POST
import javax.ws.rs.PUT
import javax.ws.rs.Path
import java.lang.reflect.Method
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
class JaxRsAnnotations2InstrumentationTest extends AgentTestRunner {

View File

@ -14,6 +14,9 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import io.dropwizard.testing.junit.ResourceTestRule
import io.opentelemetry.auto.test.AgentTestRunner
import javax.ws.rs.client.Entity
@ -31,9 +34,6 @@ import org.junit.ClassRule
import spock.lang.Shared
import spock.lang.Unroll
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderServerTrace
import static io.opentelemetry.trace.Span.Kind.INTERNAL
@Unroll
abstract class JaxRsFilterTest extends AgentTestRunner {

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
import static io.opentelemetry.instrumentation.auto.api.jdbc.JDBCConnectionUrlParser.parse
import io.opentelemetry.instrumentation.auto.api.jdbc.DBInfo
import spock.lang.Shared
import spock.lang.Specification
import static io.opentelemetry.instrumentation.auto.api.jdbc.JDBCConnectionUrlParser.parse
class JDBCConnectionUrlParserTest extends Specification {
@Shared

View File

@ -14,13 +14,23 @@
* limitations under the License.
*/
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import com.mchange.v2.c3p0.ComboPooledDataSource
import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.sql.CallableStatement
import java.sql.Connection
import java.sql.PreparedStatement
import java.sql.ResultSet
import java.sql.Statement
import javax.sql.DataSource
import org.apache.derby.jdbc.EmbeddedDataSource
import org.apache.derby.jdbc.EmbeddedDriver
import org.h2.Driver
@ -30,17 +40,6 @@ import spock.lang.Shared
import spock.lang.Unroll
import test.TestConnection
import javax.sql.DataSource
import java.sql.CallableStatement
import java.sql.Connection
import java.sql.PreparedStatement
import java.sql.ResultSet
import java.sql.Statement
import static io.opentelemetry.auto.test.utils.TraceUtils.basicSpan
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
class JDBCInstrumentationTest extends AgentTestRunner {
static {
ConfigUtils.updateConfig {

View File

@ -14,11 +14,11 @@
* limitations under the License.
*/
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.instrumentation.auto.jdbc.normalizer.SqlNormalizer
import io.opentelemetry.auto.test.utils.ConfigUtils
import io.opentelemetry.auto.util.test.AgentSpecification
import io.opentelemetry.instrumentation.api.config.Config
import io.opentelemetry.instrumentation.auto.jdbc.JDBCUtils
import io.opentelemetry.instrumentation.auto.jdbc.normalizer.SqlNormalizer
import spock.lang.Timeout
@Timeout(20)

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.trace.attributes.SemanticAttributes
@ -21,8 +23,6 @@ import redis.clients.jedis.Jedis
import redis.embedded.RedisServer
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
class JedisClientTest extends AgentTestRunner {
@Shared

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
import io.opentelemetry.trace.attributes.SemanticAttributes
@ -21,8 +23,6 @@ import redis.clients.jedis.Jedis
import redis.embedded.RedisServer
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
class Jedis30ClientTest extends AgentTestRunner {
@Shared

View File

@ -14,17 +14,16 @@
* limitations under the License.
*/
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import org.eclipse.jetty.continuation.Continuation
import org.eclipse.jetty.continuation.ContinuationSupport
import org.eclipse.jetty.server.Request
import org.eclipse.jetty.server.handler.AbstractHandler
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
// FIXME: We don't currently handle jetty continuations properly (at all).
abstract class JettyContinuationHandlerTest extends JettyHandlerTest {

View File

@ -14,21 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.auto.test.base.HttpServerTest
import io.opentelemetry.instrumentation.api.MoreAttributes
import io.opentelemetry.trace.attributes.SemanticAttributes
import org.eclipse.jetty.server.Request
import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.AbstractHandler
import org.eclipse.jetty.server.handler.ErrorHandler
import spock.lang.Shared
import javax.servlet.DispatcherType
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
@ -37,6 +22,20 @@ import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDI
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.SERVER
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.auto.test.base.HttpServerTest
import io.opentelemetry.instrumentation.api.MoreAttributes
import io.opentelemetry.trace.attributes.SemanticAttributes
import javax.servlet.DispatcherType
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import org.eclipse.jetty.server.Request
import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.AbstractHandler
import org.eclipse.jetty.server.handler.ErrorHandler
import spock.lang.Shared
class JettyHandlerTest extends HttpServerTest<Server> {
@Shared

View File

@ -14,6 +14,10 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.CONSUMER
import static io.opentelemetry.trace.Span.Kind.PRODUCER
import com.google.common.io.Files
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -41,10 +45,6 @@ import org.hornetq.jms.client.HornetQMessageConsumer
import org.hornetq.jms.client.HornetQTextMessage
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.CONSUMER
import static io.opentelemetry.trace.Span.Kind.PRODUCER
class JMS2Test extends AgentTestRunner {
static {
ConfigUtils.updateConfig {

View File

@ -14,19 +14,18 @@
* limitations under the License.
*/
import static JMS2Test.consumerSpan
import static JMS2Test.producerSpan
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import javax.jms.ConnectionFactory
import listener.Config
import org.hornetq.jms.client.HornetQMessageConsumer
import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.jms.core.JmsTemplate
import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter
import javax.jms.ConnectionFactory
import static JMS2Test.consumerSpan
import static JMS2Test.producerSpan
class SpringListenerJMS2Test extends AgentTestRunner {
static {

View File

@ -14,9 +14,15 @@
* limitations under the License.
*/
import static JMS2Test.consumerSpan
import static JMS2Test.producerSpan
import com.google.common.io.Files
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.ConfigUtils
import java.util.concurrent.TimeUnit
import javax.jms.Session
import javax.jms.TextMessage
import org.hornetq.api.core.TransportConfiguration
import org.hornetq.api.core.client.HornetQClient
import org.hornetq.api.jms.HornetQJMSClient
@ -33,13 +39,6 @@ import org.hornetq.jms.client.HornetQMessageConsumer
import org.springframework.jms.core.JmsTemplate
import spock.lang.Shared
import javax.jms.Session
import javax.jms.TextMessage
import java.util.concurrent.TimeUnit
import static JMS2Test.consumerSpan
import static JMS2Test.producerSpan
class SpringTemplateJMS2Test extends AgentTestRunner {
static {
ConfigUtils.updateConfig {
@ -147,7 +146,8 @@ class SpringTemplateJMS2Test extends AgentTestRunner {
consumerSpan(it, 0, expectedSpanName, false, HornetQMessageConsumer, traces[0][0])
}
trace(2, 1) {
producerSpan(it, 0, "queue/<temporary>") // receive doesn't propagate the trace, so this is a root
// receive doesn't propagate the trace, so this is a root
producerSpan(it, 0, "queue/<temporary>")
}
trace(3, 1) {
consumerSpan(it, 0, "queue/<temporary>", false, HornetQMessageConsumer, traces[2][0])

View File

@ -17,6 +17,8 @@
package listener
import com.google.common.io.Files
import javax.annotation.PreDestroy
import javax.jms.ConnectionFactory
import org.hornetq.api.core.TransportConfiguration
import org.hornetq.api.core.client.HornetQClient
import org.hornetq.api.jms.HornetQJMSClient
@ -35,9 +37,6 @@ import org.springframework.jms.annotation.EnableJms
import org.springframework.jms.config.DefaultJmsListenerContainerFactory
import org.springframework.jms.config.JmsListenerContainerFactory
import javax.annotation.PreDestroy
import javax.jms.ConnectionFactory
@Configuration
@ComponentScan
@EnableJms

View File

@ -14,11 +14,14 @@
* limitations under the License.
*/
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.CONSUMER
import static io.opentelemetry.trace.Span.Kind.PRODUCER
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.trace.attributes.SemanticAttributes
import java.util.concurrent.CountDownLatch
import java.util.concurrent.atomic.AtomicReference
import javax.jms.Connection
@ -32,10 +35,6 @@ import org.apache.activemq.command.ActiveMQTextMessage
import org.apache.activemq.junit.EmbeddedActiveMQBroker
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.CONSUMER
import static io.opentelemetry.trace.Span.Kind.PRODUCER
class JMS1Test extends AgentTestRunner {
@Shared
EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker()

View File

@ -14,7 +14,11 @@
* limitations under the License.
*/
import static JMS1Test.consumerSpan
import static JMS1Test.producerSpan
import io.opentelemetry.auto.test.AgentTestRunner
import javax.jms.ConnectionFactory
import listener.Config
import org.apache.activemq.ActiveMQMessageConsumer
import org.apache.activemq.junit.EmbeddedActiveMQBroker
@ -22,11 +26,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.jms.core.JmsTemplate
import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter
import javax.jms.ConnectionFactory
import static JMS1Test.consumerSpan
import static JMS1Test.producerSpan
class SpringListenerJMS1Test extends AgentTestRunner {
def "receiving message in spring listener generates spans"() {

View File

@ -14,23 +14,22 @@
* limitations under the License.
*/
import static JMS1Test.consumerSpan
import static JMS1Test.producerSpan
import com.google.common.base.Stopwatch
import io.opentelemetry.auto.test.AgentTestRunner
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicReference
import javax.jms.Connection
import javax.jms.Session
import javax.jms.TextMessage
import org.apache.activemq.ActiveMQConnectionFactory
import org.apache.activemq.ActiveMQMessageConsumer
import org.apache.activemq.junit.EmbeddedActiveMQBroker
import org.springframework.jms.core.JmsTemplate
import spock.lang.Shared
import javax.jms.Connection
import javax.jms.Session
import javax.jms.TextMessage
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicReference
import static JMS1Test.consumerSpan
import static JMS1Test.producerSpan
class SpringTemplateJMS1Test extends AgentTestRunner {
@Shared
EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker()
@ -110,7 +109,8 @@ class SpringTemplateJMS1Test extends AgentTestRunner {
consumerSpan(it, 0, destinationType, destinationName, msgId.get(), false, ActiveMQMessageConsumer, traces[0][0])
}
trace(2, 1) {
producerSpan(it, 0, "queue", "<temporary>") // receive doesn't propagate the trace, so this is a root
// receive doesn't propagate the trace, so this is a root
producerSpan(it, 0, "queue", "<temporary>")
}
trace(3, 1) {
consumerSpan(it, 0, "queue", "<temporary>", receivedMessage.getJMSMessageID(), false, ActiveMQMessageConsumer, traces[2][0])

Some files were not shown because too many files have changed in this diff Show More