From 1a1b790ad2c2f194c41e1246bbe102e21633caa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 09:40:28 -0700 Subject: [PATCH 1/2] Bump com.gradle.enterprise from 3.14.1 to 3.15 (#360) Bumps com.gradle.enterprise from 3.14.1 to 3.15. --- updated-dependencies: - dependency-name: com.gradle.enterprise dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0ce5a99a..b64ebb74 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ pluginManagement { } plugins { - id 'com.gradle.enterprise' version '3.14.1' + id 'com.gradle.enterprise' version '3.15' id 'io.spring.ge.conventions' version '0.0.14' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } From 668eab912dd6c2565b55c784a49a0e3e1c0b6669 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 21 Sep 2023 14:22:43 -0700 Subject: [PATCH 2/2] Apply wider exclusion for zipkin-reporter Closes gh-362 --- .../micrometer-tracing-bridge-brave/build.gradle | 16 +++++++++------- .../gradle.lockfile | 3 --- .../build.gradle | 15 +++++++-------- .../gradle.lockfile | 3 --- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle index 0b64b5da..d76b2c54 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle @@ -8,13 +8,10 @@ dependencies { optionalApi 'javax.servlet:javax.servlet-api' optionalApi 'jakarta.platform:jakarta.jakartaee-web-api' - api("io.zipkin.brave:brave") { - exclude group: "io.zipkin.reporter2" - exclude group: "io.zipkin.zipkin2" - } - api("io.zipkin.brave:brave-context-slf4j") - api("io.zipkin.brave:brave-instrumentation-http") - api("io.zipkin.aws:brave-propagation-aws") + api 'io.zipkin.brave:brave' + api 'io.zipkin.brave:brave-context-slf4j' + api 'io.zipkin.brave:brave-instrumentation-http' + api 'io.zipkin.aws:brave-propagation-aws' testImplementation project(':micrometer-tracing-test') testImplementation 'io.micrometer:micrometer-core' @@ -26,3 +23,8 @@ dependencies { testImplementation 'ch.qos.logback:logback-classic' testImplementation 'io.projectreactor:reactor-core' } + +configurations.api { + exclude group: 'io.zipkin.reporter2' + exclude group: 'io.zipkin.zipkin2' +} diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile index 49e2ee66..81b10f53 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile @@ -48,9 +48,6 @@ io.zipkin.brave:brave-instrumentation-http-tests:5.14.1=jmhRuntimeClasspath,test io.zipkin.brave:brave-instrumentation-http:5.14.1=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.zipkin.brave:brave-tests:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.zipkin.brave:brave:5.14.1=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter-brave:2.16.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter:2.16.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.zipkin2:zipkin:2.23.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.platform:jakarta.jakartaee-web-api:9.1.0=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle index 3ea7642b..afc5d209 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle @@ -7,15 +7,9 @@ dependencies { api 'io.micrometer:micrometer-observation' // Brave - optionalImplementation('io.zipkin.brave:brave') { - exclude group: 'io.zipkin.reporter2' - exclude group: 'io.zipkin.zipkin2' - } optionalImplementation project(':micrometer-tracing-bridge-brave') - optionalImplementation('io.zipkin.brave:brave-instrumentation-http') { - exclude group: "io.zipkin.reporter2" - exclude group: "io.zipkin.zipkin2" - } + optionalImplementation 'io.zipkin.brave:brave' + optionalImplementation 'io.zipkin.brave:brave-instrumentation-http' // OTel optionalImplementation project(':micrometer-tracing-bridge-otel') @@ -35,3 +29,8 @@ dependencies { testImplementation 'ch.qos.logback:logback-classic' testImplementation 'org.mockito:mockito-core' } + +configurations.optionalImplementation { + exclude group: 'io.zipkin.reporter2' + exclude group: 'io.zipkin.zipkin2' +} diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile index 21f190d4..a67e3675 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile @@ -63,9 +63,6 @@ io.zipkin.brave:brave-bom:5.14.1=compileClasspath,jmhCompileClasspath,jmhRuntime io.zipkin.brave:brave-context-slf4j:5.14.1=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.zipkin.brave:brave-instrumentation-http:5.14.1=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.zipkin.brave:brave:5.14.1=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter-brave:2.16.3=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter:2.16.3=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.zipkin.zipkin2:zipkin:2.23.2=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhAnnotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath