fix muzzle and retry tests
MODIFY
dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy
dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy
@@ -6,6 +6,7 @@ import com.couchbase.client.java.CouchbaseCluster
import com.couchbase.client.java.cluster.ClusterManager
import com.couchbase.client.java.env.CouchbaseEnvironment
import org.springframework.data.couchbase.core.CouchbaseTemplate
+import spock.lang.Retry
import spock.lang.Shared
import spock.lang.Unroll
import util.AbstractCouchbaseTest
@@ -13,6 +14,7 @@ import util.AbstractCouchbaseTest
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+@Retry(count = 5, delay = 1)
@Unroll
class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest {

MODIFY
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
@@ -14,7 +14,7 @@ import java.lang.reflect.Proxy
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-@RetryOnFailure(times = 3, delaySeconds = 1)
+@RetryOnFailure(times = 10, delaySeconds = 1)
class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
// Setting up appContext & repo with @Shared doesn't allow
// spring-data instrumentation to applied.

MODIFY
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
@@ -38,7 +38,8 @@ public final class FilterInstrumentation extends Instrumenter.Default {
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
// Optimization for expensive typeMatcher.
- return not(classLoaderHasNoResources("javax/servlet/Filter.class"));
+ // return not(classLoaderHasNoResources("javax/servlet/Filter.class")); // Not available in 2.2
+ return not(classLoaderHasNoResources("javax/servlet/http/HttpServlet.class"));
}
@Override

fix muzzle and retry tests