open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Muzzle Kafka Client & Streams Instrumentation 

Add muzzle blocks and remove class loader matcher methods.
This commit is contained in:
Gary Huang 2018-09-07 20:11:01 -04:00
parent 0f3e119ae5
commit ea0600c0c3
No known key found for this signature in database
GPG Key ID: 225B4CE0235DF2D1
6 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
View File

@ -1,13 +1,10 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan { group = "org.apache.kafka"
group = "org.apache.kafka" module = "kafka-clients"
module = "kafka-clients" versions = "[0.11.0.0,)"
versions = "[0.11.0.0,)" assertInverse = true
verifyPresent = [ }
'org.apache.kafka.common.header.Header' : null,
'org.apache.kafka.common.header.Headers': null,
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

7
dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.kafka_clients; package datadog.trace.instrumentation.kafka_clients;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -45,12 +44,6 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default {
return named("org.apache.kafka.clients.consumer.ConsumerRecords"); return named("org.apache.kafka.clients.consumer.ConsumerRecords");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses(
"org.apache.kafka.common.header.Header", "org.apache.kafka.common.header.Headers");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return HELPER_CLASS_NAMES; return HELPER_CLASS_NAMES;

7
dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.kafka_clients; package datadog.trace.instrumentation.kafka_clients;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@ -46,12 +45,6 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default {
return named("org.apache.kafka.clients.producer.KafkaProducer"); return named("org.apache.kafka.clients.producer.KafkaProducer");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses(
"org.apache.kafka.common.header.Header", "org.apache.kafka.common.header.Headers");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return HELPER_CLASS_NAMES; return HELPER_CLASS_NAMES;

15
dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
View File

@ -1,12 +1,9 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan { group = "org.apache.kafka"
group = "org.apache.kafka" module = "kafka-streams"
module = "kafka-streams" versions = "[0.11.0.0,)"
versions = "[0.11.0.0,)" }
verifyPresent = [
'org.apache.kafka.streams.state.internals.OrderedBytes': null
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

5
dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java
View File

@ -46,11 +46,6 @@ public class KafkaStreamsProcessorInstrumentation {
return named("org.apache.kafka.streams.processor.internals.PartitionGroup"); return named("org.apache.kafka.streams.processor.internals.PartitionGroup");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("org.apache.kafka.streams.state.internals.OrderedBytes");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return HELPER_CLASS_NAMES; return HELPER_CLASS_NAMES;

6
dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.kafka_streams; package datadog.trace.instrumentation.kafka_streams;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -30,11 +29,6 @@ public class KafkaStreamsSourceNodeRecordDeserializerInstrumentation extends Ins
return named("org.apache.kafka.streams.processor.internals.SourceNodeRecordDeserializer"); return named("org.apache.kafka.streams.processor.internals.SourceNodeRecordDeserializer");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("org.apache.kafka.streams.state.internals.OrderedBytes");
}
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
final Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();