Remove timeouts.
Not helping as much as was hoped. Causing extra noise in CI.
This commit is contained in:
parent
de7a7c9575
commit
cd289308bb
|
@ -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. */
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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"() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"() {
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"() {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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-"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"() {
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"() {
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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"() {
|
||||
|
|
Loading…
Reference in New Issue