From 9faadd2fcbfa920abaafb83ff446a1d775fad060 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Tue, 1 Dec 2020 14:38:05 +0100
Subject: [PATCH 1/2] Remove gradle exclusion
Signed-off-by: Pavol Loffay
---
.../v4_0/OutputStreamInstrumentationModule.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
index ea8b933c5..7fcdd5183 100644
--- a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
+++ b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
@@ -66,10 +66,7 @@ static class OutputStreamInstrumentation implements TypeInstrumentation {
@Override
public ElementMatcher super TypeDescription> typeMatcher() {
- // TODO exclude gradle classes in AgentBuilder SPI in AbstractTest
- // The gradle classes are excluded only for test purposes
- return extendsClass(named("java.io.OutputStream"))
- .and(not(nameStartsWith("org.gradle.internal")));
+ return extendsClass(named("java.io.OutputStream"));
}
@Override
From 0a885954fbb7cf514c511389a024e9d914bb4142 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Tue, 1 Dec 2020 14:52:13 +0100
Subject: [PATCH 2/2] Fix
Signed-off-by: Pavol Loffay
---
.../v4_0/OutputStreamInstrumentationModule.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
index 7fcdd5183..fae7dad24 100644
--- a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
+++ b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/apachehttpclient/v4_0/OutputStreamInstrumentationModule.java
@@ -20,9 +20,7 @@
import static io.opentelemetry.javaagent.tooling.matcher.NameMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.is;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
-import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
import static net.bytebuddy.matcher.ElementMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.not;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;