diff --git a/benchmarks/gradle.lockfile b/benchmarks/gradle.lockfile index e73eee8e..f10301ef 100644 --- a/benchmarks/gradle.lockfile +++ b/benchmarks/gradle.lockfile @@ -23,10 +23,10 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=jmh,jmhCompileClasspath,jmhRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=jmh,jmhCompileClasspath,jmhRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=jmh,jmhCompileClasspath,jmhRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=jmh,jmhCompileClasspath,jmhRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=jmh,jmhCompileClasspath,jmhRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=jmh,jmhCompileClasspath,jmhRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=jmh,jmhCompileClasspath,jmhRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=jmh,jmhCompileClasspath,jmhRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=jmh,jmhRuntimeClasspath diff --git a/build.gradle b/build.gradle index 8f3ffbd8..3a35c8bd 100644 --- a/build.gradle +++ b/build.gradle @@ -316,6 +316,10 @@ subprojects { description = 'Facade over tracing concepts' repositories { + maven { + url 'https://repo.spring.io/snapshot/' + content { includeGroup 'io.micrometer' } + } mavenCentral() } diff --git a/dependencies.gradle b/dependencies.gradle index c735873e..c0b61563 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ def VERSIONS = [ 'javax.servlet:javax.servlet-api:latest.release', 'jakarta.platform:jakarta.jakartaee-web-api:9.+', - 'io.micrometer:context-propagation:1.0.4', + 'io.micrometer:context-propagation:1.0.+', 'aopalliance:aopalliance:1.0', // logging @@ -28,7 +28,7 @@ def VERSIONS = [ ] def MICROMETER_PLATFORM_VERSIONS = [ - 'io.micrometer:micrometer-bom:1.10.9' + 'io.micrometer:micrometer-bom:1.10.+' ] def PLATFORM_VERSIONS = [ diff --git a/micrometer-tracing-bom/gradle.lockfile b/micrometer-tracing-bom/gradle.lockfile index bc5ec1de..80dc5187 100644 --- a/micrometer-tracing-bom/gradle.lockfile +++ b/micrometer-tracing-bom/gradle.lockfile @@ -1,5 +1,5 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -io.micrometer:micrometer-bom:1.10.9=classpath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=classpath empty=archives,signatures diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile index c5ddb2fd..7ef6720e 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile @@ -26,12 +26,12 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.9=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.9=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.10-SNAPSHOT=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.10-SNAPSHOT=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile index c3b7a27b..35f243b4 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile @@ -21,12 +21,12 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.9=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.9=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.10-SNAPSHOT=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.10-SNAPSHOT=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile index a2d220d6..2e9a79fc 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile @@ -33,10 +33,10 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile index bed802ff..f4777538 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile @@ -39,13 +39,13 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-test:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-test:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile index 2eac29e8..e13b397e 100644 --- a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile @@ -23,11 +23,11 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.9=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.10-SNAPSHOT=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing/gradle.lockfile b/micrometer-tracing/gradle.lockfile index fe958213..149ca828 100644 --- a/micrometer-tracing/gradle.lockfile +++ b/micrometer-tracing/gradle.lockfile @@ -23,11 +23,11 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.4=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.9=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.9=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.4-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.10-SNAPSHOT=compileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.10-SNAPSHOT=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath