Skip to content

Commit e4a1461

Browse files
authored
confluent-schema-registry instrumentation is compatible with 4.1.0+ (#10127)
1 parent a10ebc2 commit e4a1461

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/build.gradle renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
apply from: "$rootDir/gradle/java.gradle"
22

33
muzzle {
4+
extraRepository("confluent-releases", "https://packages.confluent.io/maven/")
45
pass {
56
group = "io.confluent"
67
module = "kafka-schema-registry-client"
7-
versions = "[7.0.0,)"
8+
versions = "[4.1.0,)"
9+
excludeDependency "org.codehaus.jackson:jackson-mapper-asl" // missing on some releases
810
assertInverse = true
911
}
1012
}
1113

1214
dependencies {
13-
compileOnly project(':dd-java-agent:instrumentation:kafka:kafka-common')
14-
compileOnly group: 'io.confluent', name: 'kafka-schema-registry-client', version: '7.0.0'
15-
compileOnly group: 'io.confluent', name: 'kafka-avro-serializer', version: '7.0.0'
16-
compileOnly group: 'io.confluent', name: 'kafka-protobuf-serializer', version: '7.0.0'
15+
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
16+
compileOnly group: 'io.confluent', name: 'kafka-schema-registry-client', version: '4.1.0'
17+
compileOnly group: 'io.confluent', name: 'kafka-avro-serializer', version: '4.1.0'
18+
compileOnly group: 'io.confluent', name: 'kafka-protobuf-serializer', version: '4.1.0'
1719
compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '3.0.0'
1820

1921
testImplementation project(':dd-java-agent:instrumentation:kafka:kafka-common')

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/gradle.lockfile renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaDeserializerInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/KafkaSerializerInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/main/java/datadog/trace/instrumentation/confluentschemaregistry/SchemaIdExtractor.java

File renamed without changes.

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-7.0/src/test/groovy/ConfluentSchemaRegistryDataStreamsTest.groovy renamed to dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/src/test/groovy/ConfluentSchemaRegistryDataStreamsTest.groovy

File renamed without changes.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ include(
312312
":dd-java-agent:instrumentation:commons-lang:commons-lang-2.1",
313313
":dd-java-agent:instrumentation:commons-lang:commons-lang-3.5",
314314
":dd-java-agent:instrumentation:commons-text-1.0",
315-
":dd-java-agent:instrumentation:confluent-schema-registry:confluent-schema-registry-7.0",
315+
":dd-java-agent:instrumentation:confluent-schema-registry:confluent-schema-registry-4.1",
316316
":dd-java-agent:instrumentation:couchbase:couchbase-2.0",
317317
":dd-java-agent:instrumentation:couchbase:couchbase-2.6",
318318
":dd-java-agent:instrumentation:couchbase:couchbase-3.1",

0 commit comments

Comments
 (0)