From b2fc94950db7440fdea8309aceb84bbe0735130e Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 10 Jul 2019 17:21:24 -0400 Subject: [PATCH 1/2] Revert "Trace 'records(TopicPartitions)` in kafka consumer" --- .../kafka_clients/KafkaConsumerInstrumentation.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index d79e8a084b..9653a61b0b 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -52,9 +52,7 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default { isMethod() .and(isPublic()) .and(named("records")) - .and( - takesArgument(0, String.class) - .or(takesArgument(0, named("org.apache.kafka.common.TopicPartition")))) + .and(takesArgument(0, String.class)) .and(returns(Iterable.class)), IterableAdvice.class.getName()); transformers.put( From e3b4ffb2404781537fd6a96d6058f671f3e552f8 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Fri, 12 Jul 2019 10:07:08 -0400 Subject: [PATCH 2/2] Update gradle to 5.5.1 --- dd-trace-java.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 945b68d611..0de18a9544 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -52,7 +52,7 @@ buildScan { wrapper { distributionType = Wrapper.DistributionType.ALL - version = '5.5' + version = '5.5.1' } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0c4de36dd..430dfabc5c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5d..8e25e6c19d 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/gradlew.bat b/gradlew.bat index 15e1ee37a7..24467a141f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS,