diff --git a/implementations/micrometer-registry-wavefront/gradle.lockfile b/implementations/micrometer-registry-wavefront/gradle.lockfile index 0e5217d0a7..dd79eb59c8 100644 --- a/implementations/micrometer-registry-wavefront/gradle.lockfile +++ b/implementations/micrometer-registry-wavefront/gradle.lockfile @@ -4,22 +4,19 @@ antlr:antlr:2.7.7=checkstyle,nohttp ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli -com.fasterxml.jackson.core:jackson-annotations:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock-jre8-standalone:2.31.0=testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,default,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,nohttp -com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,default,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=checkstyle,nohttp com.google.guava:guava:29.0-jre=checkstyle,nohttp -com.google.guava:guava:30.1.1-jre=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,default,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,default,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,nohttp +com.google.j2objc:j2objc-annotations:1.3=checkstyle,nohttp com.puppycrawl.tools:checkstyle:8.33=checkstyle,nohttp -com.tdunning:t-digest:3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.wavefront:wavefront-sdk-java:2.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.wavefront:wavefront-sdk-java:2.6.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp commons-collections:commons-collections:3.2.2=checkstyle,nohttp commons-logging:commons-logging:1.2=nohttp @@ -36,7 +33,6 @@ org.antlr:antlr4-runtime:4.8-1=checkstyle,nohttp org.apiguardian:apiguardian-api:1.1.0=testCompileClasspath,testRuntimeClasspath org.assertj:assertj-core:3.21.0=testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:2.11.1=checkstyle,nohttp -org.checkerframework:checker-qual:3.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.7.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.7.2=testRuntimeClasspath diff --git a/implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java b/implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java index 7e55f07a7f..61a2c280c4 100644 --- a/implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java +++ b/implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java @@ -172,8 +172,8 @@ public Duration step() { WavefrontClient sender = builder.build(); assertThat(builder).hasFieldOrPropertyWithValue("flushInterval", 15_000L); assertThat(builder).hasFieldOrPropertyWithValue("flushIntervalTimeUnit", TimeUnit.MILLISECONDS); - assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com")); - assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("token", "apiToken"); + assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com")); + assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("token", "apiToken"); assertThat(sender).hasFieldOrPropertyWithValue("batchSize", 20); } diff --git a/samples/micrometer-samples-boot2/gradle.lockfile b/samples/micrometer-samples-boot2/gradle.lockfile index 54fec6685e..ec536ccb05 100644 --- a/samples/micrometer-samples-boot2/gradle.lockfile +++ b/samples/micrometer-samples-boot2/gradle.lockfile @@ -44,10 +44,9 @@ com.netflix.spectator:spectator-reg-atlas:0.135.0=compileClasspath,default,produ com.puppycrawl.tools:checkstyle:8.33=checkstyle,nohttp com.rabbitmq:amqp-client:5.9.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.signalfx.public:signalfx-java:1.0.13=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.tdunning:t-digest:3.2=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.netty:netty-reactive-streams-http:2.0.5=default,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.typesafe.netty:netty-reactive-streams:2.0.5=default,productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.wavefront:wavefront-sdk-java:2.6.5=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.wavefront:wavefront-sdk-java:2.6.6=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp commons-codec:commons-codec:1.14=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle,nohttp diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile index 4473f3a7bc..3c56cc7eb7 100644 --- a/samples/micrometer-samples-core/gradle.lockfile +++ b/samples/micrometer-samples-core/gradle.lockfile @@ -8,14 +8,14 @@ colt:colt:1.2.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,t com.amazonaws:aws-java-sdk-cloudwatch:1.11.1034=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.11.1034=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:jmespath-java:1.11.1034=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.12.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.12.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.charithe:kafka-junit:4.1.11=compileClasspath com.github.charithe:kafka-junit:4.2.0=default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.4.4-7=compileClasspath @@ -50,12 +50,11 @@ com.netflix.spectator:spectator-reg-atlas:0.135.0=compileClasspath,default,runti com.puppycrawl.tools:checkstyle:8.33=checkstyle,nohttp com.rabbitmq:amqp-client:5.13.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.signalfx.public:signalfx-java:1.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.tdunning:t-digest:3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.paranamer:paranamer:2.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.netty:netty-reactive-streams-http:2.0.5=default,runtimeClasspath,testRuntimeClasspath com.typesafe.netty:netty-reactive-streams:2.0.5=default,runtimeClasspath,testRuntimeClasspath com.typesafe.scala-logging:scala-logging_2.13:3.9.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.wavefront:wavefront-sdk-java:2.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.wavefront:wavefront-sdk-java:2.6.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.yammer.metrics:metrics-core:2.2.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp commons-cli:commons-cli:1.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath