From cd289308bbfcec322dad6aa88395763e330e0413 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 30 Apr 2018 11:10:18 +1000 Subject: [PATCH] Remove timeouts. Not helping as much as was hoped. Causing extra noise in CI. --- .../agent/integration/classloading/ClassLoadingTest.groovy | 2 -- .../integration/classloading/ShadowPackageRenamingTest.groovy | 2 -- .../agent/integration/httpclient/ApacheHttpClientTest.groovy | 2 -- .../agent/integration/jdbc/JDBCInstrumentationTest.groovy | 2 -- .../aws-sdk/src/test/groovy/AWSClientTest.groovy | 2 -- .../src/test/groovy/CassandraClientTest.groovy | 2 -- .../test/groovy/JaxRsAnnotationsInstrumentationTest.groovy | 2 -- .../jax-rs-annotations/src/test/groovy/JerseyTest.groovy | 2 -- .../jax-rs-client/src/test/groovy/JaxRsClientTest.groovy | 1 - .../src/test/groovy/JBossClassloadingTest.groovy | 2 -- .../jedis-1.4/src/test/groovy/JedisClientTest.groovy | 2 -- .../instrumentation/jms-1/src/test/groovy/JMS1Test.groovy | 2 -- .../instrumentation/jms-2/src/test/groovy/JMS2Test.groovy | 2 -- .../kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy | 2 -- .../src/test/groovy/KafkaStreamsTest.groovy | 2 -- .../okhttp-3/src/test/groovy/OkHttp3Test.groovy | 2 -- .../src/test/groovy/OSGIClassloadingTest.groovy | 2 -- .../servlet-2/src/test/groovy/JettyServletTest.groovy | 2 -- .../servlet-3/src/test/groovy/JettyServletTest.groovy | 2 -- .../servlet-3/src/test/groovy/TomcatServletTest.groovy | 2 -- .../sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy | 2 -- .../src/test/groovy/test/SpringBootBasedTest.groovy | 2 -- .../groovy/datadog/opentracing/DDSpanSerializationTest.groovy | 2 -- .../src/test/groovy/datadog/opentracing/DDSpanTest.groovy | 2 -- .../datadog/opentracing/decorators/SpanDecoratorTest.groovy | 2 -- .../opentracing/decorators/URLAsResourceNameTest.groovy | 2 -- .../datadog/opentracing/propagation/HTTPCodecTest.groovy | 2 -- .../datadog/opentracing/scopemanager/ScopeManagerTest.groovy | 2 -- .../src/test/groovy/datadog/trace/DDSpanContextTest.groovy | 2 -- .../src/test/groovy/datadog/trace/DDTraceConfigTest.groovy | 4 ---- .../trace/api/sampling/RateByServiceSamplerTest.groovy | 2 -- .../groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy | 2 -- .../src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy | 4 ---- .../groovy/datadog/trace/api/writer/WriterQueueTest.groovy | 2 -- 34 files changed, 71 deletions(-) diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy index 733ad36465..9a234f3b7c 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy @@ -3,11 +3,9 @@ package datadog.trace.agent.integration.classloading import datadog.trace.agent.test.IntegrationTestUtils import datadog.trace.api.Trace import spock.lang.Specification -import spock.lang.Timeout import static datadog.trace.agent.test.IntegrationTestUtils.createJarWithClasses -@Timeout(1) class ClassLoadingTest extends Specification { /** Assert that we can instrument classloaders which cannot resolve agent advice classes. */ diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy index a0f26ce746..20f7d71f23 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy @@ -5,11 +5,9 @@ import com.google.common.reflect.ClassPath import datadog.trace.agent.test.IntegrationTestUtils import io.opentracing.util.GlobalTracer import spock.lang.Specification -import spock.lang.Timeout import java.lang.reflect.Field -@Timeout(10) class ShadowPackageRenamingTest extends Specification { def "agent dependencies renamed"() { setup: diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy index 6b2bf7cb39..0aca749caa 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy @@ -14,9 +14,7 @@ import org.apache.http.impl.client.HttpClientBuilder import org.apache.http.message.BasicHeader import spock.lang.Shared import spock.lang.Specification -import spock.lang.Timeout -@Timeout(5) class ApacheHttpClientTest extends Specification { @Shared diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy index 9700306aae..d4ba98466f 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy @@ -8,7 +8,6 @@ import org.h2.Driver import org.hsqldb.jdbc.JDBCDriver import spock.lang.Shared import spock.lang.Specification -import spock.lang.Timeout import spock.lang.Unroll import java.sql.Connection @@ -16,7 +15,6 @@ import java.sql.PreparedStatement import java.sql.ResultSet import java.sql.Statement -@Timeout(10) class JDBCInstrumentationTest extends Specification { final ListWriter writer = new ListWriter() diff --git a/dd-java-agent/instrumentation/aws-sdk/src/test/groovy/AWSClientTest.groovy b/dd-java-agent/instrumentation/aws-sdk/src/test/groovy/AWSClientTest.groovy index b786160def..7d25a8b003 100644 --- a/dd-java-agent/instrumentation/aws-sdk/src/test/groovy/AWSClientTest.groovy +++ b/dd-java-agent/instrumentation/aws-sdk/src/test/groovy/AWSClientTest.groovy @@ -11,13 +11,11 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.DDTags import io.opentracing.tag.Tags import ratpack.http.Headers -import spock.lang.Timeout import java.util.concurrent.atomic.AtomicReference import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack -@Timeout(20) class AWSClientTest extends AgentTestRunner { def "request handler is hooked up with builder"() { diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy index 5148c3549f..1e5cd5e382 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy @@ -5,9 +5,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.cassandraunit.utils.EmbeddedCassandraServerHelper -import spock.lang.Timeout -@Timeout(15) class CassandraClientTest extends AgentTestRunner { def setupSpec() { diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy index eb4559ebf9..c37a43dab9 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy @@ -1,12 +1,10 @@ import datadog.opentracing.DDSpanContext import datadog.trace.agent.test.AgentTestRunner import io.opentracing.util.GlobalTracer -import spock.lang.Timeout import spock.lang.Unroll import javax.ws.rs.* -@Timeout(1) class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { @Unroll diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy index ee193dc062..a2704e5947 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy @@ -2,9 +2,7 @@ import datadog.trace.agent.test.AgentTestRunner import io.dropwizard.testing.junit.ResourceTestRule import org.junit.ClassRule import spock.lang.Shared -import spock.lang.Timeout -@Timeout(5) class JerseyTest extends AgentTestRunner { @Shared diff --git a/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy b/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy index db5f248803..35aaf6f2c1 100644 --- a/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy @@ -18,7 +18,6 @@ import java.util.concurrent.atomic.AtomicReference import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack -//@Timeout(10) class JaxRsClientTest extends AgentTestRunner { static { System.setProperty("dd.integration.jax-rs.enabled", "true") diff --git a/dd-java-agent/instrumentation/jboss-classloading/src/test/groovy/JBossClassloadingTest.groovy b/dd-java-agent/instrumentation/jboss-classloading/src/test/groovy/JBossClassloadingTest.groovy index 908b3f331b..48960e4602 100644 --- a/dd-java-agent/instrumentation/jboss-classloading/src/test/groovy/JBossClassloadingTest.groovy +++ b/dd-java-agent/instrumentation/jboss-classloading/src/test/groovy/JBossClassloadingTest.groovy @@ -1,7 +1,5 @@ import datadog.trace.agent.test.AgentTestRunner -import spock.lang.Timeout -@Timeout(5) class JBossClassloadingTest extends AgentTestRunner { def "delegation property set on module load"() { setup: diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy index cb9c8cba7e..b7a9eae56c 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy @@ -6,9 +6,7 @@ import io.opentracing.tag.Tags import redis.clients.jedis.Jedis import redis.embedded.RedisServer import spock.lang.Shared -import spock.lang.Timeout -@Timeout(5) class JedisClientTest extends AgentTestRunner { public static final int PORT = 6399 diff --git a/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy index 2c9ef7753b..0467557fa3 100644 --- a/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy +++ b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy @@ -5,7 +5,6 @@ import org.apache.activemq.ActiveMQMessageConsumer import org.apache.activemq.ActiveMQMessageProducer import org.apache.activemq.junit.EmbeddedActiveMQBroker import spock.lang.Shared -import spock.lang.Timeout import spock.lang.Unroll import javax.jms.Connection @@ -14,7 +13,6 @@ import javax.jms.TextMessage import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicReference -@Timeout(1) class JMS1Test extends AgentTestRunner { @Shared static Session session diff --git a/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy index c9da186e7e..795a22f599 100644 --- a/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy +++ b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy @@ -15,7 +15,6 @@ import org.hornetq.core.server.HornetQServers import org.hornetq.jms.client.HornetQMessageConsumer import org.hornetq.jms.client.HornetQMessageProducer import spock.lang.Shared -import spock.lang.Timeout import spock.lang.Unroll import javax.jms.Session @@ -23,7 +22,6 @@ import javax.jms.TextMessage import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicReference -@Timeout(1) class JMS2Test extends AgentTestRunner { @Shared static Session session diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy index 4df3878482..ab14e82dbc 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy @@ -11,12 +11,10 @@ import org.springframework.kafka.test.rule.KafkaEmbedded import org.springframework.kafka.test.utils.ContainerTestUtils import org.springframework.kafka.test.utils.KafkaTestUtils import spock.lang.Shared -import spock.lang.Timeout import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.TimeUnit -@Timeout(5) class KafkaClientTest extends AgentTestRunner { static final SHARED_TOPIC = "shared.topic" diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy index f9fad017e7..eece550b7d 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy @@ -17,12 +17,10 @@ import org.springframework.kafka.test.rule.KafkaEmbedded import org.springframework.kafka.test.utils.ContainerTestUtils import org.springframework.kafka.test.utils.KafkaTestUtils import spock.lang.Shared -import spock.lang.Timeout import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.TimeUnit -@Timeout(15) class KafkaStreamsTest extends AgentTestRunner { static final STREAM_PENDING = "test.pending" static final STREAM_PROCESSED = "test.processed" diff --git a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy index 903f015b65..3529277cd4 100644 --- a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy +++ b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy @@ -4,13 +4,11 @@ import io.opentracing.tag.Tags import okhttp3.OkHttpClient import okhttp3.Request import ratpack.http.Headers -import spock.lang.Timeout import java.util.concurrent.atomic.AtomicReference import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack -@Timeout(10) class OkHttp3Test extends AgentTestRunner { def "sending a request creates spans and sends headers"() { diff --git a/dd-java-agent/instrumentation/osgi-classloading/src/test/groovy/OSGIClassloadingTest.groovy b/dd-java-agent/instrumentation/osgi-classloading/src/test/groovy/OSGIClassloadingTest.groovy index 160f4ea21c..8d3c4de5f3 100644 --- a/dd-java-agent/instrumentation/osgi-classloading/src/test/groovy/OSGIClassloadingTest.groovy +++ b/dd-java-agent/instrumentation/osgi-classloading/src/test/groovy/OSGIClassloadingTest.groovy @@ -1,7 +1,5 @@ import datadog.trace.agent.test.AgentTestRunner -import spock.lang.Timeout -@Timeout(1) class OSGIClassloadingTest extends AgentTestRunner { def "delegation property set on module load"() { setup: diff --git a/dd-java-agent/instrumentation/servlet-2/src/test/groovy/JettyServletTest.groovy b/dd-java-agent/instrumentation/servlet-2/src/test/groovy/JettyServletTest.groovy index 2d1425515b..c8b6b1f3f7 100644 --- a/dd-java-agent/instrumentation/servlet-2/src/test/groovy/JettyServletTest.groovy +++ b/dd-java-agent/instrumentation/servlet-2/src/test/groovy/JettyServletTest.groovy @@ -11,14 +11,12 @@ import okhttp3.Request import okhttp3.Response import org.eclipse.jetty.server.Server import org.eclipse.jetty.servlet.ServletContextHandler -import spock.lang.Timeout import spock.lang.Unroll import java.lang.reflect.Field import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -@Timeout(1) class JettyServletTest extends AgentTestRunner { static final int PORT = TestUtils.randomOpenPort() diff --git a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy index 2fd8a18f23..dd940500a5 100644 --- a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy +++ b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy @@ -11,14 +11,12 @@ import okhttp3.Request import okhttp3.Response import org.eclipse.jetty.server.Server import org.eclipse.jetty.servlet.ServletContextHandler -import spock.lang.Timeout import spock.lang.Unroll import java.lang.reflect.Field import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -@Timeout(20) class JettyServletTest extends AgentTestRunner { static final int PORT = TestUtils.randomOpenPort() diff --git a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy index 8ae4bbb3ce..de3847778a 100644 --- a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy +++ b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy @@ -11,12 +11,10 @@ import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat import org.apache.tomcat.JarScanFilter import org.apache.tomcat.JarScanType -import spock.lang.Timeout import spock.lang.Unroll import java.lang.reflect.Field -@Timeout(15) class TomcatServletTest extends AgentTestRunner { static final int PORT = TestUtils.randomOpenPort() diff --git a/dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy b/dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy index 780e632749..a482c929cb 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy +++ b/dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy @@ -5,9 +5,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import spark.Spark import spark.embeddedserver.jetty.JettyHandler -import spock.lang.Timeout -@Timeout(20) class SparkJavaBasedTest extends AgentTestRunner { static { diff --git a/dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy index 38283272a5..1a3e424c88 100644 --- a/dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy @@ -9,9 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment import org.springframework.boot.test.web.client.TestRestTemplate import org.springframework.web.bind.MethodArgumentNotValidException import org.springframework.web.util.NestedServletException -import spock.lang.Timeout -@Timeout(5) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class SpringBootBasedTest extends AgentTestRunner { diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy index 7d36ee982c..eb5dd9a7ec 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy @@ -6,10 +6,8 @@ import datadog.trace.api.DDTags import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import spock.lang.Specification -import spock.lang.Timeout import spock.lang.Unroll -@Timeout(5) class DDSpanSerializationTest extends Specification { @Unroll diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy index db8a734071..2aff3c6d35 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy @@ -3,11 +3,9 @@ package datadog.opentracing import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import spock.lang.Specification -import spock.lang.Timeout import java.util.concurrent.TimeUnit -@Timeout(10) class DDSpanTest extends Specification { def writer = new ListWriter() def tracer = new DDTracer(writer) diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy index ef08682f45..036325e117 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy @@ -7,9 +7,7 @@ import datadog.trace.common.writer.LoggingWriter import io.opentracing.tag.StringTag import io.opentracing.tag.Tags import spock.lang.Specification -import spock.lang.Timeout -@Timeout(1) class SpanDecoratorTest extends Specification { def "adding span personalisation using Decorators"() { diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy index 6074b5a175..063cb81a70 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy @@ -8,9 +8,7 @@ import datadog.trace.common.writer.ListWriter import io.opentracing.tag.Tags import spock.lang.Specification import spock.lang.Subject -import spock.lang.Timeout -@Timeout(1) class URLAsResourceNameTest extends Specification { def writer = new ListWriter() def tracer = new DDTracer(writer) diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy index 04cb302b5b..f92a8db223 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy @@ -9,10 +9,8 @@ import io.opentracing.propagation.TextMapExtractAdapter import io.opentracing.propagation.TextMapInjectAdapter import spock.lang.Shared import spock.lang.Specification -import spock.lang.Timeout import spock.lang.Unroll -@Timeout(1) class HTTPCodecTest extends Specification { @Shared private static final String OT_BAGGAGE_PREFIX = "ot-baggage-" diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/scopemanager/ScopeManagerTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/scopemanager/ScopeManagerTest.groovy index f65900b0b5..7efa86c0c2 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/scopemanager/ScopeManagerTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/scopemanager/ScopeManagerTest.groovy @@ -9,13 +9,11 @@ import io.opentracing.Scope import io.opentracing.Span import spock.lang.Specification import spock.lang.Subject -import spock.lang.Timeout import spock.lang.Unroll import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicReference -@Timeout(10) class ScopeManagerTest extends Specification { def writer = new ListWriter() def tracer = new DDTracer(writer) diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy index cb7e1cb779..42316489f8 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy @@ -3,9 +3,7 @@ package datadog.trace import datadog.opentracing.SpanFactory import datadog.trace.api.DDTags import spock.lang.Specification -import spock.lang.Timeout -@Timeout(1) class DDSpanContextTest extends Specification { def "null values for tags delete existing tags"() { diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy index 6975ae995c..750326527c 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy @@ -10,12 +10,10 @@ import org.junit.Rule import org.junit.contrib.java.lang.system.EnvironmentVariables import org.junit.contrib.java.lang.system.RestoreSystemProperties import spock.lang.Specification -import spock.lang.Timeout import spock.lang.Unroll import static datadog.trace.common.DDTraceConfig.* -@Timeout(1) class DDTraceConfigTest extends Specification { @Rule public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties() @@ -72,7 +70,6 @@ class DDTraceConfigTest extends Specification { tracer.writer instanceof LoggingWriter } - @Timeout(5) def "sys props override env vars"() { when: environmentVariables.set(propToEnvName(PREFIX + SERVICE_NAME), "still something else") @@ -102,7 +99,6 @@ class DDTraceConfigTest extends Specification { tracer.spanContextDecorators.size() == 6 } - @Timeout(5) @Unroll def "verify single override on #source for #key"() { when: diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy index 20a69dccd6..57748343f0 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy @@ -5,9 +5,7 @@ import datadog.opentracing.DDSpan import datadog.opentracing.SpanFactory import datadog.trace.common.sampling.RateByServiceSampler import spock.lang.Specification -import spock.lang.Timeout -@Timeout(1) class RateByServiceSamplerTest extends Specification { def "rate by service name"() { diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy index 5c46f84f05..ffda905c00 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy @@ -5,13 +5,11 @@ import datadog.trace.common.writer.DDAgentWriter import datadog.trace.common.writer.DDApi import datadog.trace.common.writer.WriterQueue import spock.lang.Specification -import spock.lang.Timeout import static datadog.opentracing.SpanFactory.newSpanOf import static org.mockito.Mockito.mock import static org.mockito.Mockito.verifyNoMoreInteractions -@Timeout(10) class DDAgentWriterTest extends Specification { diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy index 82b632311d..9986f0a634 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy @@ -11,7 +11,6 @@ import ratpack.exec.Blocking import ratpack.http.Headers import ratpack.http.MediaType import spock.lang.Specification -import spock.lang.Timeout import spock.lang.Unroll import java.util.concurrent.atomic.AtomicInteger @@ -19,11 +18,9 @@ import java.util.concurrent.atomic.AtomicReference import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack -@Timeout(1) class DDApiTest extends Specification { static mapper = new ObjectMapper(new MessagePackFactory()) - @Timeout(10) // first test takes longer def "sending an empty list of traces returns no errors"() { setup: @@ -183,7 +180,6 @@ class DDApiTest extends Specification { v3Agent.close() } - @Timeout(5) @Unroll def "Api Downgrades to v3 if timeout exceeded (#delayTrace, #badPort)"() { // This test is unfortunately only exercising the read timeout, not the connect timeout. diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy index 1402f4d85b..13201b44dc 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy @@ -2,12 +2,10 @@ package datadog.trace.api.writer import datadog.trace.common.writer.WriterQueue import spock.lang.Specification -import spock.lang.Timeout import java.util.concurrent.Phaser import java.util.concurrent.atomic.AtomicInteger -@Timeout(5) class WriterQueueTest extends Specification { def "instantiate a empty queue throws an exception"() {