diff --git a/benchmarks/benchmarks-core/build.gradle b/benchmarks/benchmarks-core/build.gradle
index 534193ed1e..33400720e1 100644
--- a/benchmarks/benchmarks-core/build.gradle
+++ b/benchmarks/benchmarks-core/build.gradle
@@ -3,5 +3,7 @@ dependencies {
compile project(':micrometer-samples-core')
compile 'org.openjdk.jmh:jmh-core:latest.release'
- annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
+ compile 'io.dropwizard.metrics5:metrics-core:latest.release'
+
+ compile 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
}
\ No newline at end of file
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 4d5f526e5b..181f6d6ec3 100644
--- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
@@ -52,6 +52,7 @@ commons-logging:commons-logging:1.2
concurrent:concurrent:1.3.4
dom4j:dom4j:1.6.1
info.ganglia.gmetric4j:gmetric4j:1.0.10
+io.dropwizard.metrics5:metrics-core:5.0.0
io.dropwizard.metrics:metrics-core:4.0.3
io.dropwizard.metrics:metrics-graphite:4.0.3
io.dropwizard.metrics:metrics-jmx:4.0.3
@@ -114,6 +115,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final
org.jboss:jandex:2.0.3.Final
org.latencyutils:LatencyUtils:2.0.3
org.openjdk.jmh:jmh-core:1.21
+org.openjdk.jmh:jmh-generator-annprocess:1.21
org.pcollections:pcollections:3.0.3
org.reactivestreams:reactive-streams:1.0.2
org.slf4j:slf4j-api:1.7.25
diff --git a/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/core/TagsBenchmark.java b/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/core/TagsBenchmark.java
new file mode 100644
index 0000000000..1712343f05
--- /dev/null
+++ b/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/core/TagsBenchmark.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 Pivotal Software, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micrometer.benchmark.core;
+
+import io.micrometer.core.instrument.Tags;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.concurrent.TimeUnit;
+
+@Fork(1)
+@Measurement(iterations = 2)
+@Warmup(iterations = 2)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class TagsBenchmark {
+ @Threads(16)
+ @Benchmark
+ public void tags() {
+ Tags.of("key", "value", "key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5");
+ }
+
+ public static void main(String[] args) throws RunnerException {
+ Options opt = new OptionsBuilder()
+ .include(TagsBenchmark.class.getSimpleName())
+ .build();
+ new Runner(opt).run();
+ }
+}
diff --git a/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/dropwizard/CompareCountersWithMicrometerAndDropwizard.java b/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/dropwizard/CompareCountersWithMicrometerAndDropwizard.java
new file mode 100644
index 0000000000..abe27f426d
--- /dev/null
+++ b/benchmarks/benchmarks-core/src/main/java/io/micrometer/benchmark/dropwizard/CompareCountersWithMicrometerAndDropwizard.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright 2018 Pivotal Software, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micrometer.benchmark.dropwizard;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.profile.GCProfiler;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author John Karp
+ */
+@Fork(1)
+@Measurement(iterations = 2)
+@Warmup(iterations = 2)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class CompareCountersWithMicrometerAndDropwizard {
+ @State(Scope.Benchmark)
+ public static class DropwizardState {
+ com.codahale.metrics.MetricRegistry registry;
+ com.codahale.metrics.Counter counter;
+
+ @Setup(Level.Trial)
+ public void setup() {
+ registry = new com.codahale.metrics.MetricRegistry();
+ counter = registry.counter("counter");
+ }
+
+ @TearDown(Level.Trial)
+ public void tearDown(Blackhole hole) {
+ hole.consume(counter.getCount());
+ }
+ }
+
+ @State(Scope.Benchmark)
+ public static class MicrometerState {
+ io.micrometer.core.instrument.MeterRegistry registry;
+ io.micrometer.core.instrument.Counter counter;
+ io.micrometer.core.instrument.Counter counterWithTags;
+
+ @Setup(Level.Trial)
+ public void setup() {
+ registry = new io.micrometer.core.instrument.simple.SimpleMeterRegistry();
+ counter = registry.counter("untagged");
+ counterWithTags = registry.counter("tagged", "key1", "value1", "key2", "value2");
+ }
+
+ @TearDown(Level.Trial)
+ public void tearDown(Blackhole hole) {
+ for (io.micrometer.core.instrument.Meter m : registry.getMeters()) {
+ if (m instanceof io.micrometer.core.instrument.Counter) {
+ hole.consume(((io.micrometer.core.instrument.Counter) m).count());
+ }
+ }
+ }
+ }
+
+ @State(Scope.Benchmark)
+ public static class Dropwizard5State {
+
+ io.dropwizard.metrics5.MetricRegistry registry;
+ io.dropwizard.metrics5.Counter counter;
+ io.dropwizard.metrics5.Counter counterWithTags;
+
+ @Setup(Level.Trial)
+ public void setup() {
+ registry = new io.dropwizard.metrics5.MetricRegistry();
+ counter = registry.counter("untagged");
+ Map tags = new HashMap<>();
+ tags.put("key1", "value1");
+ tags.put("key2", "value2");
+ counterWithTags = registry.counter(new io.dropwizard.metrics5.MetricName("tagged", tags));
+ }
+
+ @TearDown(Level.Trial)
+ public void tearDown(Blackhole hole) {
+ for (io.dropwizard.metrics5.Counter c : registry.getCounters().values()) {
+ hole.consume(c.getCount());
+ }
+ }
+ }
+
+ @Threads(16)
+// @Benchmark
+ public void dropwizard5Counter(Dropwizard5State state) {
+ state.counter.inc();
+ }
+
+ @Threads(16)
+// @Benchmark
+ public void dropwizard5CounterFixedTags(Dropwizard5State state) {
+ state.counterWithTags.inc();
+ }
+
+ @Threads(16)
+ @Benchmark
+ public void dropwizard5CounterTags(Dropwizard5State state) {
+ Map tags = new HashMap<>();
+ tags.put("key1", "value1");
+ tags.put("key2", "value2");
+ state.registry.counter(new io.dropwizard.metrics5.MetricName("tagged", tags)).inc();
+ }
+
+ @Threads(16)
+// @Benchmark
+ public void micrometerCounter(MicrometerState state) {
+ state.counter.increment();
+ }
+
+ @Threads(16)
+ @Benchmark
+ public void micrometerCounterTags(MicrometerState state) {
+ state.registry.counter("dynamicTags", "key1", "value1", "key2", "value2").increment();
+ }
+
+ @Threads(16)
+// @Benchmark
+ public void micrometerCounterFixedTags(MicrometerState state) {
+ state.counterWithTags.increment();
+ }
+
+ public static void main(String[] args) throws RunnerException {
+ Options opt = new OptionsBuilder()
+ .include(CompareCountersWithMicrometerAndDropwizard.class.getSimpleName())
+ .addProfiler(GCProfiler.class)
+ .build();
+ new Runner(opt).run();
+ }
+}
\ No newline at end of file
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java b/implementations/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java
index c2125c143e..0d3b856a77 100644
--- a/implementations/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java
+++ b/implementations/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java
@@ -211,6 +211,7 @@ private String write(Meter.Id id, @Nullable String type, String... statistics) {
for (int i = 0; i < statistics.length; i += 2) {
sb.append(",\"").append(statistics[i]).append("\":").append(statistics[i + 1]);
}
+
List tags = id.getTags();
sb.append(",\"tags\":{");
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/compile.lockfile
index aa99ad5bb2..a3572ae4e4 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/compile.lockfile
@@ -5,21 +5,23 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-configuration:commons-configuration:1.8
@@ -53,7 +55,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/compileClasspath.lockfile
index aa99ad5bb2..a3572ae4e4 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/compileClasspath.lockfile
@@ -5,21 +5,23 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-configuration:commons-configuration:1.8
@@ -53,7 +55,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/default.lockfile
index aa99ad5bb2..a3572ae4e4 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/default.lockfile
@@ -5,21 +5,23 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-configuration:commons-configuration:1.8
@@ -53,7 +55,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtime.lockfile
index aa99ad5bb2..a3572ae4e4 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtime.lockfile
@@ -5,21 +5,23 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-configuration:commons-configuration:1.8
@@ -53,7 +55,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtimeClasspath.lockfile
index aa99ad5bb2..a3572ae4e4 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -5,21 +5,23 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-configuration:commons-configuration:1.8
@@ -53,7 +55,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompile.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompile.lockfile
index 573bc43ec2..5fa18648f6 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompile.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompile.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.flipkart.zjsonpatch:zjsonpatch:0.4.4
com.github.ben-manes.caffeine:caffeine:2.6.2
@@ -20,9 +20,9 @@ com.hazelcast:hazelcast:3.8.9
com.jayway.jsonpath:json-path:2.4.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-codec:commons-codec:1.10
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
index 573bc43ec2..5fa18648f6 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.flipkart.zjsonpatch:zjsonpatch:0.4.4
com.github.ben-manes.caffeine:caffeine:2.6.2
@@ -20,9 +20,9 @@ com.hazelcast:hazelcast:3.8.9
com.jayway.jsonpath:json-path:2.4.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-codec:commons-codec:1.10
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntime.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntime.lockfile
index 573bc43ec2..5fa18648f6 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntime.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntime.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.flipkart.zjsonpatch:zjsonpatch:0.4.4
com.github.ben-manes.caffeine:caffeine:2.6.2
@@ -20,9 +20,9 @@ com.hazelcast:hazelcast:3.8.9
com.jayway.jsonpath:json-path:2.4.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-codec:commons-codec:1.10
diff --git a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 573bc43ec2..5fa18648f6 100644
--- a/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.flipkart.zjsonpatch:zjsonpatch:0.4.4
com.github.ben-manes.caffeine:caffeine:2.6.2
@@ -20,9 +20,9 @@ com.hazelcast:hazelcast:3.8.9
com.jayway.jsonpath:json-path:2.4.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
commons-codec:commons-codec:1.10
diff --git a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java
index a0b94206f7..ec00358502 100644
--- a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java
+++ b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java
@@ -123,10 +123,10 @@ protected io.micrometer.core.instrument.DistributionSummary newDistributionSumma
HistogramGauges.register(summary, this,
percentile -> id.getName(),
- percentile -> Tags.concat(id.getTags(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())),
+ percentile -> Tags.concat(id.getTagsAsIterable(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())),
ValueAtPercentile::value,
bucket -> id.getName(),
- bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket())));
+ bucket -> Tags.concat(id.getTagsAsIterable(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket())));
return summary;
}
@@ -147,10 +147,10 @@ protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionSt
HistogramGauges.register(timer, this,
percentile -> id.getName(),
- percentile -> Tags.concat(id.getTags(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())),
+ percentile -> Tags.concat(id.getTagsAsIterable(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())),
percentile -> percentile.value(timer.baseTimeUnit()),
bucket -> id.getName(),
- bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit()))));
+ bucket -> Tags.concat(id.getTagsAsIterable(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit()))));
return timer;
}
diff --git a/implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compile.lockfile
index f5120efd76..adcfb9e939 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compile.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.6.0
com.fasterxml.jackson.core:jackson-core:2.6.7
com.fasterxml.jackson.core:jackson-databind:2.6.7.1
@@ -14,8 +14,10 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -57,7 +59,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compileClasspath.lockfile
index f5120efd76..adcfb9e939 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/compileClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.6.0
com.fasterxml.jackson.core:jackson-core:2.6.7
com.fasterxml.jackson.core:jackson-databind:2.6.7.1
@@ -14,8 +14,10 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -57,7 +59,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/default.lockfile
index f5120efd76..adcfb9e939 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/default.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.6.0
com.fasterxml.jackson.core:jackson-core:2.6.7
com.fasterxml.jackson.core:jackson-databind:2.6.7.1
@@ -14,8 +14,10 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -57,7 +59,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtime.lockfile
index f5120efd76..adcfb9e939 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtime.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.6.0
com.fasterxml.jackson.core:jackson-core:2.6.7
com.fasterxml.jackson.core:jackson-databind:2.6.7.1
@@ -14,8 +14,10 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -57,7 +59,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtimeClasspath.lockfile
index f5120efd76..adcfb9e939 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.6.0
com.fasterxml.jackson.core:jackson-core:2.6.7
com.fasterxml.jackson.core:jackson-databind:2.6.7.1
@@ -14,8 +14,10 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -57,7 +59,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompile.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompile.lockfile
index a19e6911b8..3c6fb63ba2 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompile.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompile.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.11
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
index a19e6911b8..3c6fb63ba2 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.11
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntime.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntime.lockfile
index a19e6911b8..3c6fb63ba2 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntime.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntime.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.11
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
diff --git a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
index a19e6911b8..3c6fb63ba2 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.11
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
diff --git a/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java b/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java
index 02c3010b00..1fb6b6dac5 100644
--- a/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java
+++ b/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java
@@ -114,18 +114,18 @@ private Stream functionTimerData(FunctionTimer timer) {
// we can't know anything about max and percentiles originating from a function timer
return Stream.of(
- metricDatum(idWithSuffix(timer.getId(), "count"), wallTime, timer.count()),
- metricDatum(idWithSuffix(timer.getId(), "avg"), wallTime, timer.mean(getBaseTimeUnit())));
+ metricDatum(timer.getId(), "count", wallTime, timer.count()),
+ metricDatum(timer.getId(), "avg", wallTime, timer.mean(getBaseTimeUnit())));
}
private Stream timerData(Timer timer) {
final long wallTime = clock.wallTime();
final Stream.Builder metrics = Stream.builder();
- metrics.add(metricDatum(idWithSuffixAndUnit(timer.getId(), "sum", getBaseTimeUnit().name()), wallTime, timer.totalTime(getBaseTimeUnit())));
- metrics.add(metricDatum(idWithSuffixAndUnit(timer.getId(), "count", "count"), wallTime, timer.count()));
- metrics.add(metricDatum(idWithSuffixAndUnit(timer.getId(), "avg", getBaseTimeUnit().name()), wallTime, timer.mean(getBaseTimeUnit())));
- metrics.add(metricDatum(idWithSuffixAndUnit(timer.getId(), "max", getBaseTimeUnit().name()), wallTime, timer.max(getBaseTimeUnit())));
+ metrics.add(metricDatum(timer.getId(), "sum", getBaseTimeUnit().name(), wallTime, timer.totalTime(getBaseTimeUnit())));
+ metrics.add(metricDatum(timer.getId(), "count", "count", wallTime, timer.count()));
+ metrics.add(metricDatum(timer.getId(), "avg", getBaseTimeUnit().name(), wallTime, timer.mean(getBaseTimeUnit())));
+ metrics.add(metricDatum(timer.getId(), "max", getBaseTimeUnit().name(), wallTime, timer.max(getBaseTimeUnit())));
return metrics.build();
}
@@ -134,10 +134,10 @@ private Stream summaryData(DistributionSummary summary) {
final long wallTime = clock.wallTime();
final Stream.Builder metrics = Stream.builder();
- metrics.add(metricDatum(idWithSuffix(summary.getId(), "sum"), wallTime, summary.totalAmount()));
- metrics.add(metricDatum(idWithSuffix(summary.getId(), "count"), wallTime, summary.count()));
- metrics.add(metricDatum(idWithSuffix(summary.getId(), "avg"), wallTime, summary.mean()));
- metrics.add(metricDatum(idWithSuffix(summary.getId(), "max"), wallTime, summary.max()));
+ metrics.add(metricDatum(summary.getId(), "sum", wallTime, summary.totalAmount()));
+ metrics.add(metricDatum(summary.getId(), "count", wallTime, summary.count()));
+ metrics.add(metricDatum(summary.getId(), "avg", wallTime, summary.mean()));
+ metrics.add(metricDatum(summary.getId(), "max", wallTime, summary.max()));
return metrics.build();
}
@@ -152,18 +152,28 @@ Stream metricData(Meter m) {
@Nullable
private MetricDatum metricDatum(Meter.Id id, long wallTime, double value) {
+ return metricDatum(id, null, null, wallTime, value);
+ }
+
+ @Nullable
+ private MetricDatum metricDatum(Meter.Id id, @Nullable String suffix, long wallTime, double value) {
+ return metricDatum(id, suffix, null, wallTime, value);
+ }
+
+ @Nullable
+ private MetricDatum metricDatum(Meter.Id id, @Nullable String suffix, @Nullable String unit, long wallTime, double value) {
if (Double.isNaN(value)) {
return null;
}
- String metricName = id.getConventionName(config().namingConvention());
+ String metricName = config().namingConvention().name(id.getName() + "." + suffix, id.getType(), id.getBaseUnit());
List tags = id.getConventionTags(config().namingConvention());
return new MetricDatum()
.withMetricName(metricName)
.withDimensions(toDimensions(tags))
.withTimestamp(new Date(wallTime))
.withValue(CloudWatchUtils.clampMetricValue(value))
- .withUnit(toStandardUnit(id.getBaseUnit()));
+ .withUnit(toStandardUnit(unit));
}
private StandardUnit toStandardUnit(@Nullable String unit) {
@@ -192,18 +202,4 @@ private List toDimensions(List tags) {
protected TimeUnit getBaseTimeUnit() {
return TimeUnit.MILLISECONDS;
}
-
- /**
- * Copy tags, unit, and description from an existing id, but change the name.
- */
- private Meter.Id idWithSuffix(Meter.Id id, String suffix) {
- return idWithSuffixAndUnit(id, suffix, id.getBaseUnit());
- }
-
- /**
- * Copy tags and description from an existing id, but change the name and unit.
- */
- private Meter.Id idWithSuffixAndUnit(Meter.Id id, String suffix, @Nullable String unit) {
- return new Meter.Id(id.getName() + "." + suffix, id.getTags(), unit, id.getDescription(), id.getType());
- }
}
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/compile.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-datadog/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/compileClasspath.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-datadog/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/default.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-datadog/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtime.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtimeClasspath.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-datadog/src/main/java/io/micrometer/datadog/DatadogMeterRegistry.java b/implementations/micrometer-registry-datadog/src/main/java/io/micrometer/datadog/DatadogMeterRegistry.java
index b4fbe62b87..840982f0b6 100644
--- a/implementations/micrometer-registry-datadog/src/main/java/io/micrometer/datadog/DatadogMeterRegistry.java
+++ b/implementations/micrometer-registry-datadog/src/main/java/io/micrometer/datadog/DatadogMeterRegistry.java
@@ -78,10 +78,6 @@ private DatadogMeterRegistry(DatadogConfig config, Clock clock, ThreadFactory th
start(threadFactory);
}
- public static Builder builder(DatadogConfig config) {
- return new Builder(config);
- }
-
@Override
public void start(ThreadFactory threadFactory) {
if (config.enabled()) {
@@ -271,11 +267,12 @@ protected TimeUnit getBaseTimeUnit() {
return TimeUnit.MILLISECONDS;
}
- /**
- * Copy tags, unit, and description from an existing id, but change the name.
- */
private Meter.Id idWithSuffix(Meter.Id id, String suffix) {
- return new Meter.Id(id.getName() + "." + suffix, id.getTags(), id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.withName(id.getName() + "." + suffix);
+ }
+
+ public static Builder builder(DatadogConfig config) {
+ return new Builder(config);
}
public static class Builder {
@@ -285,7 +282,7 @@ public static class Builder {
private ThreadFactory threadFactory = Executors.defaultThreadFactory();
private HttpClient httpClient;
- public Builder(DatadogConfig config) {
+ Builder(DatadogConfig config) {
this.config = config;
this.httpClient = new HttpUrlConnectionClient(config.connectTimeout(), config.readTimeout());
}
diff --git a/implementations/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogMetricMetadataTest.java b/implementations/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogMetricMetadataTest.java
index a4619808fa..40dce8605e 100644
--- a/implementations/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogMetricMetadataTest.java
+++ b/implementations/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogMetricMetadataTest.java
@@ -15,28 +15,26 @@
*/
package io.micrometer.datadog;
-import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Statistic;
-import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class DatadogMetricMetadataTest {
-
@Test
void escapesStringsInDescription() {
- DatadogMetricMetadata metricMetadata = new DatadogMetricMetadata(new Meter.Id("name",
- Tags.of(Tag.of("key", "value")),
- null,
- "The /\"recent cpu usage\" for the Java Virtual Machine process",
- Meter.Type.GAUGE),
+ DatadogMetricMetadata metricMetadata = new DatadogMetricMetadata(
+ Counter.builder("name")
+ .tag("key", "value")
+ .description("The /\"recent cpu usage\" for the Java Virtual Machine process")
+ .register(new SimpleMeterRegistry()).getId(),
Statistic.COUNT,
true,
- null);
+ null
+ );
assertThat(metricMetadata.editMetadataBody()).isEqualTo("{\"type\":\"count\",\"description\":\"The /\\\"recent cpu usage\\\" for the Java Virtual Machine process\"}");
}
-
}
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compile.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compileClasspath.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/default.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtime.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtimeClasspath.lockfile
index 35a4fd64e9..e4305f4a6b 100644
--- a/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/checkstyle.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-elastic/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-elastic/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-elastic/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile
index 7bbbd07285..a65e017f14 100644
--- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile
index 7bbbd07285..a65e017f14 100644
--- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile
index 7bbbd07285..a65e017f14 100644
--- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile
index 7bbbd07285..a65e017f14 100644
--- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile
index 7bbbd07285..a65e017f14 100644
--- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryTest.java b/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryTest.java
index 4a2a4abfea..e6a30e4756 100644
--- a/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryTest.java
+++ b/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryTest.java
@@ -17,7 +17,6 @@
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.Tags;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -28,19 +27,17 @@
* @author Johnny Lim
*/
class GangliaMeterRegistryTest {
-
private final GangliaMeterRegistry registry = new GangliaMeterRegistry(GangliaConfig.DEFAULT, Clock.SYSTEM);
@Test
void getMetricNameWhenSuffixIsNullShouldNotAppendSuffix() {
- Meter.Id id = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = registry.counter("name").getId();
assertThat(registry.getMetricName(id, null)).isEqualTo("name");
}
@Test
void getMetricNameWhenSuffixIsNotNullShouldAppendSuffix() {
- Meter.Id id = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = registry.counter("name").getId();
assertThat(registry.getMetricName(id, "suffix")).isEqualTo("nameSuffix");
}
-
}
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/compile.lockfile
index 540203fa65..36fd031afd 100644
--- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/compileClasspath.lockfile
index 540203fa65..36fd031afd 100644
--- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/default.lockfile
index 540203fa65..36fd031afd 100644
--- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtime.lockfile
index 540203fa65..36fd031afd 100644
--- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtimeClasspath.lockfile
index 540203fa65..36fd031afd 100644
--- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteHierarchicalNameMapper.java b/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteHierarchicalNameMapper.java
index 7705358a12..7df1b39a2a 100644
--- a/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteHierarchicalNameMapper.java
+++ b/implementations/micrometer-registry-graphite/src/main/java/io/micrometer/graphite/GraphiteHierarchicalNameMapper.java
@@ -40,7 +40,7 @@ public String toHierarchicalName(Meter.Id id, NamingConvention convention) {
}
}
hierarchicalName.append(id.getConventionName(convention));
- for (Tag tag : id.getTags()) {
+ for (Tag tag : id.getTagsAsIterable()) {
if (!tagsAsPrefix.contains(tag.getKey())) {
hierarchicalName.append('.').append(sanitize(convention.tagKey(tag.getKey())))
.append('.').append(sanitize(convention.tagValue(tag.getValue())));
diff --git a/implementations/micrometer-registry-graphite/src/test/java/io/micrometer/graphite/GraphiteHierarchicalNameMapperTest.java b/implementations/micrometer-registry-graphite/src/test/java/io/micrometer/graphite/GraphiteHierarchicalNameMapperTest.java
index c6b15d9a6d..eb1770f0e8 100644
--- a/implementations/micrometer-registry-graphite/src/test/java/io/micrometer/graphite/GraphiteHierarchicalNameMapperTest.java
+++ b/implementations/micrometer-registry-graphite/src/test/java/io/micrometer/graphite/GraphiteHierarchicalNameMapperTest.java
@@ -17,16 +17,16 @@
import io.micrometer.core.Issue;
import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.config.NamingConvention;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class GraphiteHierarchicalNameMapperTest {
private final GraphiteHierarchicalNameMapper nameMapper = new GraphiteHierarchicalNameMapper("stack", "app.name");
- private final Meter.Id id = new Meter.Id("my.name", Tags.of("app.name", "MYAPP", "stack", "PROD", "other.tag", "value"),
- null, null, Meter.Type.COUNTER);
+ private final Meter.Id id = new SimpleMeterRegistry().counter("my.name",
+ "app.name", "MYAPP", "stack", "PROD", "other.tag", "value").getId();
@Issue("#561")
@Test
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-humio/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-humio/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-humio/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-humio/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-humio/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-humio/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-humio/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-humio/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-humio/src/test/resources/logback.xml b/implementations/micrometer-registry-humio/src/test/resources/logback.xml
new file mode 100644
index 0000000000..33742a140a
--- /dev/null
+++ b/implementations/micrometer-registry-humio/src/test/resources/logback.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-influx/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-influx/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-influx/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-influx/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-influx/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-influx/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-influx/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-influx/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/compile.lockfile
index a9fdd03509..ab715b9de0 100644
--- a/implementations/micrometer-registry-jmx/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/compileClasspath.lockfile
index a9fdd03509..ab715b9de0 100644
--- a/implementations/micrometer-registry-jmx/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/default.lockfile
index a9fdd03509..ab715b9de0 100644
--- a/implementations/micrometer-registry-jmx/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtime.lockfile
index a9fdd03509..ab715b9de0 100644
--- a/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtimeClasspath.lockfile
index a9fdd03509..ab715b9de0 100644
--- a/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-kairos/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-kairos/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-kairos/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compile.lockfile
index 4f4eaa82bc..e86750300e 100644
--- a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compileClasspath.lockfile
index 4f4eaa82bc..e86750300e 100644
--- a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/default.lockfile
index 4f4eaa82bc..e86750300e 100644
--- a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtime.lockfile
index 4f4eaa82bc..e86750300e 100644
--- a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtimeClasspath.lockfile
index 4f4eaa82bc..e86750300e 100644
--- a/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -48,7 +50,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusMeterRegistry.java b/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusMeterRegistry.java
index bb2de58a93..07f1ba507e 100644
--- a/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusMeterRegistry.java
+++ b/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusMeterRegistry.java
@@ -66,7 +66,7 @@ public PrometheusMeterRegistry(PrometheusConfig config, CollectorRegistry regist
}
private static List tagValues(Meter.Id id) {
- return id.getTags().stream().map(Tag::getValue).collect(toList());
+ return stream(id.getTagsAsIterable().spliterator(), false).map(Tag::getValue).collect(toList());
}
/**
diff --git a/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusRenameFilter.java b/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusRenameFilter.java
index 95dbbdae9f..f88e3065fb 100644
--- a/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusRenameFilter.java
+++ b/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusRenameFilter.java
@@ -38,7 +38,6 @@ public class PrometheusRenameFilter implements MeterFilter {
@Override
public Meter.Id map(Meter.Id id) {
String convertedName = MICROMETER_TO_PROMETHEUS_NAMES.get(id.getName());
- return convertedName == null ? id :
- new Meter.Id(convertedName, id.getTags(), id.getBaseUnit(), id.getDescription(), id.getType());
+ return convertedName == null ? id : id.withName(convertedName);
}
}
diff --git a/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheus/PrometheusRenameFilterTest.java b/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheus/PrometheusRenameFilterTest.java
index f43fb1af6f..ba010bb878 100644
--- a/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheus/PrometheusRenameFilterTest.java
+++ b/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheus/PrometheusRenameFilterTest.java
@@ -15,11 +15,12 @@
*/
package io.micrometer.prometheus;
+import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.jupiter.api.Test;
-import java.util.Collections;
-
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -30,17 +31,18 @@
class PrometheusRenameFilterTest {
private final PrometheusRenameFilter filter = new PrometheusRenameFilter();
+ private final MeterRegistry registry = new SimpleMeterRegistry();
@Test
void doesNotChangeUnrelatedMeter() {
- Meter.Id original = new Meter.Id("system.cpu.count", Collections.emptyList(), null, null, Meter.Type.GAUGE);
+ Meter.Id original = Gauge.builder("system.cpu.count", () -> 1.0).register(registry).getId();
Meter.Id actual = filter.map(original);
assertThat(actual).isEqualTo(original);
}
@Test
void doesChangeApplicableMeter() {
- Meter.Id original = new Meter.Id("process.files.open", Collections.emptyList(), null, null, Meter.Type.GAUGE);
+ Meter.Id original = Gauge.builder("process.files.open", () -> 1.0).register(registry).getId();
Meter.Id actual = filter.map(original);
assertThat(actual).isNotEqualTo(original);
assertThat(actual.getName()).isEqualTo("process.open.fds");
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compile.lockfile
index 170c806113..9f0dc593bc 100644
--- a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compileClasspath.lockfile
index 170c806113..9f0dc593bc 100644
--- a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/default.lockfile
index 170c806113..9f0dc593bc 100644
--- a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtime.lockfile
index 170c806113..9f0dc593bc 100644
--- a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtimeClasspath.lockfile
index 170c806113..9f0dc593bc 100644
--- a/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -47,7 +49,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-stackdriver/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-stackdriver/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-stackdriver/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/DatadogStatsdLineBuilder.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/DatadogStatsdLineBuilder.java
index e639bee148..12b3f678ef 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/DatadogStatsdLineBuilder.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/DatadogStatsdLineBuilder.java
@@ -53,7 +53,7 @@ private void updateIfNamingConventionChanged() {
this.namingConvention = next;
this.name = next.name(sanitize(id.getName()), id.getType(), id.getBaseUnit()) + ":";
this.tags = HashTreePMap.empty();
- this.conventionTags = id.getTags().iterator().hasNext() ?
+ this.conventionTags = id.getTagsAsIterable().iterator().hasNext() ?
id.getConventionTags(this.namingConvention).stream()
.map(t -> sanitize(t.getKey()) + ":" + sanitize(t.getValue()))
.collect(Collectors.joining(","))
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/SysdigStatsdLineBuilder.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/SysdigStatsdLineBuilder.java
index bf349e6b61..0565414825 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/SysdigStatsdLineBuilder.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/SysdigStatsdLineBuilder.java
@@ -53,7 +53,7 @@ private void updateIfNamingConventionChanged() {
this.namingConvention = next;
this.name = next.name(id.getName(), id.getType(), id.getBaseUnit()).replace(':', '_');
this.tags = HashTreePMap.empty();
- this.conventionTags = id.getTags().iterator().hasNext() ?
+ this.conventionTags = id.getTagsAsIterable().iterator().hasNext() ?
id.getConventionTags(this.namingConvention).stream()
.map(t -> t.getKey().replace(':', '_') + "=" + t.getValue().replace(':', '_'))
.collect(Collectors.joining(","))
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/TelegrafStatsdLineBuilder.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/TelegrafStatsdLineBuilder.java
index 141a7fd7b8..39d8ecbc53 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/TelegrafStatsdLineBuilder.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/TelegrafStatsdLineBuilder.java
@@ -64,7 +64,7 @@ private void updateIfNamingConventionChanged() {
this.name = telegrafEscape(next.name(id.getName(), id.getType(), id.getBaseUnit()));
this.tags = HashTreePMap.empty();
- this.conventionTags = id.getTags().iterator().hasNext() ?
+ this.conventionTags = id.getTagsAsIterable().iterator().hasNext() ?
id.getConventionTags(this.namingConvention).stream()
.map(t -> telegrafEscape(t.getKey()) + "=" + telegrafEscape(t.getValue()))
.collect(Collectors.joining(","))
diff --git a/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdGaugeTest.java b/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdGaugeTest.java
index 668712d9c5..612d2974c9 100644
--- a/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdGaugeTest.java
+++ b/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdGaugeTest.java
@@ -15,56 +15,63 @@
*/
package io.micrometer.statsd;
-import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
import org.junit.jupiter.api.Test;
-import org.reactivestreams.Subscriber;
-import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
class StatsdGaugeTest {
-
-
private AtomicInteger value = new AtomicInteger(1);
- private StatsdLineBuilder lineBuilder = mock(StatsdLineBuilder.class);
-
- @SuppressWarnings("unchecked")
- private Subscriber subscriber = mock(Subscriber.class);
-
@Test
void shouldAlwaysPublishValue() {
- StatsdGauge alwaysPublishingGauge = gauge(true);
+ AtomicInteger lines = new AtomicInteger(0);
+ MeterRegistry registry = StatsdMeterRegistry.builder(StatsdConfig.DEFAULT)
+ .lineSink(l -> lines.incrementAndGet())
+ .build();
+
+ StatsdGauge alwaysPublishingGauge = (StatsdGauge) Gauge
+ .builder("test", value, AtomicInteger::get).register(registry);
alwaysPublishingGauge.poll();
alwaysPublishingGauge.poll();
- verify(subscriber, times(2)).onNext(any());
+ assertThat(lines.get()).isEqualTo(2);
}
@Test
- void shouldOnlyPublishValue_WhenValueChanges() {
- StatsdGauge gaugePublishingOnChange = gauge(false);
+ void shouldOnlyPublishValueWhenValueChanges() {
+ AtomicInteger lines = new AtomicInteger(0);
+ MeterRegistry registry = StatsdMeterRegistry
+ .builder(new StatsdConfig() {
+ @Override
+ public String get(String key) {
+ return null;
+ }
+
+ @Override
+ public boolean publishUnchangedMeters() {
+ return false;
+ }
+ })
+ .lineSink(l -> lines.incrementAndGet())
+ .build();
+
+ StatsdGauge gaugePublishingOnChange = (StatsdGauge) Gauge
+ .builder("test", value, AtomicInteger::get).register(registry);
gaugePublishingOnChange.poll();
gaugePublishingOnChange.poll();
- verify(subscriber, times(1)).onNext(any());
+ assertThat(lines.get()).isEqualTo(1);
//update value and expect the publisher to be called again
value.incrementAndGet();
gaugePublishingOnChange.poll();
-
- verify(subscriber, times(2)).onNext(any());
+ assertThat(lines.get()).isEqualTo(2);
}
-
-
- private StatsdGauge gauge(boolean alwaysPublish) {
- Meter.Id meterId = new Meter.Id("test", Collections.emptyList(), null, null, Meter.Type.GAUGE);
- return new StatsdGauge<>(meterId, lineBuilder, subscriber, value, AtomicInteger::get, alwaysPublish);
- }
-
}
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/annotationProcessor.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compile.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compileClasspath.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/default.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtime.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontMeterRegistry.java b/implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontMeterRegistry.java
index 4622e8e16c..3da0f152cd 100644
--- a/implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontMeterRegistry.java
+++ b/implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontMeterRegistry.java
@@ -76,10 +76,6 @@ private WavefrontMeterRegistry(WavefrontConfig config, Clock clock, ThreadFactor
start(threadFactory);
}
- public static Builder builder(WavefrontConfig config) {
- return new Builder(config);
- }
-
@Override
public void start(ThreadFactory threadFactory) {
if (config.enabled()) {
@@ -254,11 +250,8 @@ private String writeMetricDirect(Meter.Id id, @Nullable String suffix, double va
"}";
}
- /**
- * Copy tags, unit, and description from an existing id, but change the name.
- */
private Meter.Id idWithSuffix(Meter.Id id, String suffix) {
- return new Meter.Id(id.getName() + "." + suffix, id.getTags(), id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.withName(id.getName() + "." + suffix);
}
@Override
@@ -266,6 +259,10 @@ protected TimeUnit getBaseTimeUnit() {
return TimeUnit.SECONDS;
}
+ public static Builder builder(WavefrontConfig config) {
+ return new Builder(config);
+ }
+
public static class Builder {
private final WavefrontConfig config;
@@ -273,7 +270,7 @@ public static class Builder {
private ThreadFactory threadFactory = Executors.defaultThreadFactory();
private HttpClient httpClient;
- public Builder(WavefrontConfig config) {
+ Builder(WavefrontConfig config) {
this.config = config;
this.httpClient = new HttpUrlConnectionClient(config.connectTimeout(), config.readTimeout());
}
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 2e66279dee..78592500b2 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
@@ -17,7 +17,6 @@
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MockClock;
-import io.micrometer.core.instrument.Tags;
import org.junit.jupiter.api.Test;
import java.util.stream.Stream;
@@ -30,7 +29,6 @@
* @author Johnny Lim
*/
class WavefrontMeterRegistryTest {
-
private final WavefrontConfig config = new WavefrontConfig() {
@Override
public String get(String key) {
@@ -53,7 +51,7 @@ public String apiToken() {
@Test
void addMetric() {
Stream.Builder metricsStreamBuilder = Stream.builder();
- Meter.Id id = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = registry.counter("name").getId();
registry.addMetric(metricsStreamBuilder, id, null, System.currentTimeMillis(), 1d);
assertThat(metricsStreamBuilder.build().count()).isEqualTo(1);
}
@@ -61,9 +59,8 @@ void addMetric() {
@Test
void addMetricWhenNanShouldNotAdd() {
Stream.Builder metricsStreamBuilder = Stream.builder();
- Meter.Id id = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = registry.counter("name").getId();
registry.addMetric(metricsStreamBuilder, id, null, System.currentTimeMillis(), Double.NaN);
assertThat(metricsStreamBuilder.build().count()).isEqualTo(0);
}
-
}
diff --git a/micrometer-core/gradle/dependency-locks/annotationProcessor.lockfile b/micrometer-core/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/micrometer-core/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/micrometer-core/gradle/dependency-locks/apt.lockfile b/micrometer-core/gradle/dependency-locks/apt.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/micrometer-core/gradle/dependency-locks/apt.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/micrometer-core/gradle/dependency-locks/checkstyle.lockfile b/micrometer-core/gradle/dependency-locks/checkstyle.lockfile
new file mode 100644
index 0000000000..c96f1b9205
--- /dev/null
+++ b/micrometer-core/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,16 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.1.3
+com.google.guava:guava:25.1-jre
+com.google.j2objc:j2objc-annotations:1.1
+com.puppycrawl.tools:checkstyle:8.12
+commons-beanutils:commons-beanutils:1.9.3
+commons-cli:commons-cli:1.4
+commons-collections:commons-collections:3.2.2
+net.sf.saxon:Saxon-HE:9.8.0-12
+org.antlr:antlr4-runtime:4.7.1
+org.checkerframework:checker-qual:2.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.14
diff --git a/micrometer-core/gradle/dependency-locks/compile.lockfile b/micrometer-core/gradle/dependency-locks/compile.lockfile
index 9e07004650..00130077c2 100644
--- a/micrometer-core/gradle/dependency-locks/compile.lockfile
+++ b/micrometer-core/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile
+++ b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-core/gradle/dependency-locks/default.lockfile b/micrometer-core/gradle/dependency-locks/default.lockfile
index 9e07004650..00130077c2 100644
--- a/micrometer-core/gradle/dependency-locks/default.lockfile
+++ b/micrometer-core/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-core/gradle/dependency-locks/runtime.lockfile b/micrometer-core/gradle/dependency-locks/runtime.lockfile
index 9e07004650..00130077c2 100644
--- a/micrometer-core/gradle/dependency-locks/runtime.lockfile
+++ b/micrometer-core/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile
index 9e07004650..00130077c2 100644
--- a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -46,7 +48,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Counter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Counter.java
index f51af6d7d3..80cee92d79 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Counter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Counter.java
@@ -17,9 +17,7 @@
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
/**
* Counters monitor monotonically increasing values. Counters may never be reset to a lesser value. If you
@@ -61,7 +59,7 @@ default Iterable measure() {
*/
class Builder {
private final String name;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private String description;
@@ -86,7 +84,7 @@ public Builder tags(String... tags) {
* @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
@@ -96,7 +94,7 @@ public Builder tags(Iterable tags) {
* @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/DistributionSummary.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/DistributionSummary.java
index 30131b4170..f27754be6a 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/DistributionSummary.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/DistributionSummary.java
@@ -22,9 +22,7 @@
import io.micrometer.core.lang.Nullable;
import java.time.Duration;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -117,7 +115,7 @@ default Iterable measure() {
*/
class Builder {
private final String name;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
private DistributionStatisticConfig.Builder distributionConfigBuilder = DistributionStatisticConfig.builder();
@Nullable
@@ -141,24 +139,23 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual distribution summary.
- * @return The distribution summary builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The distribution summary builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
-
/**
* @param description Description text of the eventual distribution summary.
* @return The distribution summary builder with added description.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
index 3a59d13b37..86346d73d0 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
@@ -17,9 +17,7 @@
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
import java.util.function.ToDoubleFunction;
/**
@@ -50,7 +48,7 @@ default Iterable measure() {
class Builder {
private final String name;
private final ToDoubleFunction f;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private final T obj;
@@ -76,21 +74,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The function counter builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The function counter builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionTimer.java
index 759a212da5..d08e87190f 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionTimer.java
@@ -17,9 +17,7 @@
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.ToDoubleFunction;
import java.util.function.ToLongFunction;
@@ -79,7 +77,7 @@ class Builder {
private final ToLongFunction countFunction;
private final ToDoubleFunction totalTimeFunction;
private final TimeUnit totalTimeFunctionUnit;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private final T obj;
@@ -107,21 +105,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The function timer builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The function timer builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Gauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Gauge.java
index abf5020ee6..5739c04e8a 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Gauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Gauge.java
@@ -19,9 +19,7 @@
import io.micrometer.core.instrument.distribution.HistogramGauges;
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
import java.util.function.Supplier;
import java.util.function.ToDoubleFunction;
@@ -79,7 +77,7 @@ default Iterable measure() {
class Builder {
private final String name;
private final ToDoubleFunction f;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
private boolean strongReference = false;
@Nullable
@@ -109,21 +107,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The gauge builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The gauge builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/ImmutableTag.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/ImmutableTag.java
index 1ea2172128..0d4c7ee340 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/ImmutableTag.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/ImmutableTag.java
@@ -53,7 +53,9 @@ public boolean equals(@Nullable Object o) {
@Override
public int hashCode() {
- return Objects.hash(key, value);
+ int result = key.hashCode();
+ result = 31 * result + value.hashCode();
+ return result;
}
@Override
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java
index 9839a62454..452197ed4c 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java
@@ -18,9 +18,7 @@
import io.micrometer.core.annotation.Timed;
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -190,7 +188,7 @@ public double duration(TimeUnit unit) {
*/
class Builder {
private final String name;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private String description;
@@ -208,21 +206,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual long task timer.
- * @return The long task timer builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The long task timer builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java
index f40c452604..75dfefe59d 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java
@@ -20,13 +20,16 @@
import io.micrometer.core.instrument.distribution.HistogramGauges;
import io.micrometer.core.lang.Nullable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
import static java.util.Collections.singletonList;
-import static java.util.stream.StreamSupport.stream;
/**
* A named and dimensioned producer of one or more measurements.
@@ -178,7 +181,7 @@ public static void consume(Meter meter,
*/
class Id {
private final String name;
- private final List tags;
+ private final Tags tags;
private final Type type;
@Nullable
@@ -191,22 +194,17 @@ class Id {
private final String baseUnit;
@Incubating(since = "1.1.0")
- public Id(String name, Iterable tags, @Nullable String baseUnit, @Nullable String description, Type type,
+ Id(String name, Tags tags, @Nullable String baseUnit, @Nullable String description, Type type,
@Nullable Meter.Id syntheticAssociation) {
this.name = name;
-
- this.tags = Collections.unmodifiableList(stream(tags.spliterator(), false)
- .sorted(Comparator.comparing(Tag::getKey))
- .distinct()
- .collect(Collectors.toList()));
-
+ this.tags = tags;
this.baseUnit = baseUnit;
this.description = description;
this.type = type;
this.syntheticAssociation = syntheticAssociation;
}
- public Id(String name, Iterable tags, @Nullable String baseUnit, @Nullable String description, Type type) {
+ Id(String name, Tags tags, @Nullable String baseUnit, @Nullable String description, Type type) {
this(name, tags, baseUnit, description, type, null);
}
@@ -225,7 +223,7 @@ public Id withName(String newName) {
* the tag value.
*
* @param tag The tag to add.
- * @return A new id with the provided tag. The source id remains unchanged.
+ * @return A new id with the provided tag added. The source id remains unchanged.
*/
public Id withTag(Tag tag) {
return withTags(singletonList(tag));
@@ -235,14 +233,24 @@ public Id withTag(Tag tag) {
* Generate a new id with an additional tag. If the key of the provided tag already exists, this overwrites
* the tag value.
*
- * @param tag The tag to add.
- * @return A new id with the provided tag. The source id remains unchanged.
+ * @param tags The tag to add.
+ * @return A new id with the provided tags added. The source id remains unchanged.
* @since 1.1.0
*/
- public Id withTags(Iterable tag) {
- return new Id(name, Tags.concat(tags, tag), baseUnit, description, type);
+ public Id withTags(Iterable tags) {
+ return new Id(name, Tags.concat(getTags(), tags), baseUnit, description, type);
}
+ /**
+ * Generate a new id replacing all tags with new ones.
+ *
+ * @param tags The tag to add.
+ * @return A new id with the only the provided tags. The source id remains unchanged.
+ * @since 1.1.0
+ */
+ public Id replaceTags(Iterable tags) {
+ return new Id(name, Tags.of(tags), baseUnit, description, type);
+ }
/**
* Generate a new id with an additional tag with a tag key of "statistic". If the "statistic" tag already exists,
@@ -276,6 +284,12 @@ public String getName() {
* @return A set of dimensions that allows you to break down the name.
*/
public List getTags() {
+ List tags = new ArrayList<>();
+ this.tags.forEach(tags::add);
+ return Collections.unmodifiableList(tags);
+ }
+
+ public Iterable getTagsAsIterable() {
return tags;
}
@@ -315,7 +329,7 @@ public String getConventionName(NamingConvention namingConvention) {
* @return A list of tags that have been stylized to a particular monitoring system's expectations.
*/
public List getConventionTags(NamingConvention namingConvention) {
- return tags.stream()
+ return StreamSupport.stream(tags.spliterator(), false)
.map(t -> Tag.of(namingConvention.tagKey(t.getKey()), namingConvention.tagValue(t.getValue())))
.collect(Collectors.toList());
}
@@ -347,7 +361,9 @@ public boolean equals(@Nullable Object o) {
@Override
public int hashCode() {
- return Objects.hash(name, tags);
+ int result = name.hashCode();
+ result = 31 * result + tags.hashCode();
+ return result;
}
/**
@@ -384,7 +400,7 @@ class Builder {
private final String name;
private final Type type;
private final Iterable measurements;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private String description;
@@ -411,7 +427,7 @@ public Builder tags(String... tags) {
* @return The custom meter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
@@ -421,7 +437,7 @@ public Builder tags(Iterable tags) {
* @return The custom meter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
index cbbb27eebc..6fbf043260 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
@@ -57,7 +57,7 @@
public abstract class MeterRegistry implements AutoCloseable {
protected final Clock clock;
private final Object meterMapLock = new Object();
- private final List filters = new CopyOnWriteArrayList<>();
+ private volatile MeterFilter[] filters = new MeterFilter[0];
private final List> meterAddedListeners = new CopyOnWriteArrayList<>();
private final List> meterRemovedListeners = new CopyOnWriteArrayList<>();
private final Config config = new Config();
@@ -597,8 +597,11 @@ private Meter getOrCreateMeter(@Nullable DistributionStatisticConfig config,
}
private boolean accept(Meter.Id id) {
- return this.filters.stream()
- .noneMatch((filter) -> filter.accept(id) == MeterFilterReply.DENY);
+ for (MeterFilter filter : filters) {
+ if (filter.accept(id) == MeterFilterReply.DENY)
+ return false;
+ }
+ return true;
}
/**
@@ -685,8 +688,11 @@ public Config commonTags(String... tags) {
* @param filter The filter to add to the registry.
* @return This configuration instance.
*/
- public Config meterFilter(MeterFilter filter) {
- filters.add(filter);
+ public synchronized Config meterFilter(MeterFilter filter) {
+ MeterFilter[] newFilters = new MeterFilter[filters.length + 1];
+ System.arraycopy(filters, 0, newFilters, 0, filters.length);
+ newFilters[filters.length] = filter;
+ filters = newFilters;
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/MultiGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/MultiGauge.java
index ceb394201d..054b4b63c1 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/MultiGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/MultiGauge.java
@@ -18,8 +18,6 @@
import io.micrometer.core.annotation.Incubating;
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.ToDoubleFunction;
@@ -109,7 +107,7 @@ public static Row of(Tags uniqueTags, T obj, ToDoubleFunction valueFuncti
*/
public static class Builder {
private final String name;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private String description;
@@ -130,21 +128,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The gauge builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The gauge builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Tag.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Tag.java
index 1be7193a13..64797e06e6 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Tag.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Tag.java
@@ -20,7 +20,7 @@
*
* @author Jon Schneider
*/
-public interface Tag {
+public interface Tag extends Comparable {
String getKey();
String getValue();
@@ -28,4 +28,9 @@ public interface Tag {
static Tag of(String key, String value) {
return new ImmutableTag(key, value);
}
+
+ @Override
+ default int compareTo(Tag o) {
+ return getKey().compareTo(o.getKey());
+ }
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java
index edcbcd042f..12077db241 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java
@@ -19,9 +19,10 @@
import java.util.*;
import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
/**
- * An immutable collection of {@link Tag Tags}.
+ * An immutable collection of {@link Tag Tags} that are guaranteed to be sorted and deduplicated by tag key.
*
* @author Jon Schneider
* @author Maciej Walkowiak
@@ -29,12 +30,34 @@
*/
public final class Tags implements Iterable {
- private static final Tags EMPTY = new Tags(Collections.emptyMap());
+ private static final Tags EMPTY = new Tags(new Tag[]{});
- private final Map tags;
+ private final Tag[] tags;
+ private int last;
- private Tags(Map tags) {
- this.tags = Collections.unmodifiableMap(tags);
+ private Tags(Tag[] tags) {
+ this.tags = tags;
+ Arrays.sort(this.tags);
+ dedup();
+ }
+
+ private void dedup() {
+ int n = tags.length;
+
+ if (n == 0 || n == 1) {
+ last = n;
+ return;
+ }
+
+ // index of next unique element
+ int j = 0;
+
+ for (int i = 0; i < n - 1; i++)
+ if (!tags[i].getKey().equals(tags[i + 1].getKey()))
+ tags[j++] = tags[i];
+
+ tags[j++] = tags[n - 1];
+ last = j;
}
/**
@@ -78,7 +101,10 @@ public Tags and(@Nullable Tag... tags) {
if (tags == null || tags.length == 0) {
return this;
}
- return and(Arrays.asList(tags));
+ Tag[] newTags = new Tag[this.tags.length + tags.length];
+ System.arraycopy(this.tags, 0, newTags, 0, this.tags.length);
+ System.arraycopy(tags, 0, newTags, this.tags.length, tags.length);
+ return new Tags(newTags);
}
/**
@@ -91,14 +117,36 @@ public Tags and(@Nullable Iterable tags) {
if (tags == null || !tags.iterator().hasNext()) {
return this;
}
- Map merged = new LinkedHashMap<>(this.tags);
- tags.forEach(tag -> merged.put(tag.getKey(), tag));
- return new Tags(merged);
+
+ if (this.tags.length == 0) {
+ return Tags.of(tags);
+ }
+
+ return and(Tags.of(tags).tags);
}
@Override
public Iterator iterator() {
- return tags.values().iterator();
+ return new ArrayIterator();
+ }
+
+ private class ArrayIterator implements Iterator {
+ private int currentIndex = 0;
+
+ @Override
+ public boolean hasNext() {
+ return currentIndex < last;
+ }
+
+ @Override
+ public Tag next() {
+ return tags[currentIndex++];
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException("cannot remove items from tags");
+ }
}
/**
@@ -107,17 +155,17 @@ public Iterator iterator() {
* @return a tags stream
*/
public Stream stream() {
- return tags.values().stream();
+ return Arrays.stream(tags);
}
@Override
public int hashCode() {
- return tags.hashCode();
+ return Arrays.hashCode(tags);
}
@Override
public boolean equals(@Nullable Object obj) {
- return this == obj || obj != null && getClass() == obj.getClass() && tags.equals(((Tags) obj).tags);
+ return this == obj || obj != null && getClass() == obj.getClass() && Arrays.equals(tags, ((Tags) obj).tags);
}
/**
@@ -151,8 +199,13 @@ public static Tags concat(Iterable tags, String... keyValues) {
public static Tags of(Iterable tags) {
if (tags instanceof Tags) {
return (Tags) tags;
+ } else if (tags instanceof Collection) {
+ @SuppressWarnings("unchecked")
+ Collection tagsCollection = (Collection) tags;
+ return new Tags(tagsCollection.toArray(new Tag[0]));
+ } else {
+ return new Tags(StreamSupport.stream(tags.spliterator(), false).toArray(Tag[]::new));
}
- return empty().and(tags);
}
/**
@@ -163,7 +216,7 @@ public static Tags of(Iterable tags) {
* @return a new {@link Tags} instance
*/
public static Tags of(String key, String value) {
- return empty().and(key, value);
+ return new Tags(new Tag[]{Tag.of(key, value)});
}
/**
@@ -173,7 +226,17 @@ public static Tags of(String key, String value) {
* @return a new {@link Tags} instance
*/
public static Tags of(String... keyValues) {
- return empty().and(keyValues);
+ if (keyValues.length == 0) {
+ return empty();
+ }
+ if (keyValues.length % 2 == 1) {
+ throw new IllegalArgumentException("size must be even, it is a set of key=value pairs");
+ }
+ Tag[] tags = new Tag[keyValues.length / 2];
+ for (int i = 0; i < keyValues.length; i += 2) {
+ tags[i / 2] = Tag.of(keyValues[i], keyValues[i + 1]);
+ }
+ return new Tags(tags);
}
/**
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/TimeGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/TimeGauge.java
index 2fbb145e19..6771e83aa3 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/TimeGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/TimeGauge.java
@@ -18,8 +18,6 @@
import io.micrometer.core.instrument.util.TimeUtils;
import io.micrometer.core.lang.Nullable;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.ToDoubleFunction;
@@ -56,7 +54,7 @@ class Builder {
private final String name;
private final TimeUnit fUnits;
private final ToDoubleFunction f;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
@Nullable
private final T obj;
@@ -80,21 +78,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The time gauge builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return The time gauge builder with a single added tag.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
index cd2ccf6246..993494615d 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
@@ -24,9 +24,7 @@
import io.micrometer.core.lang.Nullable;
import java.time.Duration;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
@@ -263,7 +261,7 @@ public long stop(Timer timer) {
*/
class Builder {
private final String name;
- private final List tags = new ArrayList<>();
+ private Tags tags = Tags.empty();
private final DistributionStatisticConfig.Builder distributionConfigBuilder;
@Nullable
@@ -288,21 +286,21 @@ public Builder tags(String... tags) {
}
/**
- * @param tags Tags to add to the eventual meter.
- * @return The timer builder with added tags.
+ * @param tags Tags to add to the eventual counter.
+ * @return The counter builder with added tags.
*/
public Builder tags(Iterable tags) {
- tags.forEach(this.tags::add);
+ this.tags = this.tags.and(tags);
return this;
}
/**
* @param key The tag key.
* @param value The tag value.
- * @return This builder.
+ * @return The counter builder with a single added tag.
*/
public Builder tag(String key, String value) {
- tags.add(Tag.of(key, value));
+ this.tags = tags.and(key, value);
return this;
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java
index b6ba24b1a3..a6c29d295a 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java
@@ -22,11 +22,7 @@
import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.core.lang.Nullable;
-import okhttp3.Call;
-import okhttp3.EventListener;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
+import okhttp3.*;
import java.io.IOException;
import java.util.Collections;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java
index 9fdd3448ae..cbe60579df 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCounter.java
@@ -44,9 +44,9 @@ Counter newNoopMeter() {
@Override
Counter registerNewMeter(MeterRegistry registry) {
return Counter.builder(getId().getName())
- .tags(getId().getTags())
- .description(getId().getDescription())
- .baseUnit(getId().getBaseUnit())
- .register(registry);
+ .tags(getId().getTagsAsIterable())
+ .description(getId().getDescription())
+ .baseUnit(getId().getBaseUnit())
+ .register(registry);
}
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCustomMeter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCustomMeter.java
index 1cce297dfc..6022ccf2fe 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCustomMeter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeCustomMeter.java
@@ -28,7 +28,7 @@ class CompositeCustomMeter extends DefaultMeter implements CompositeMeter {
@Override
public void add(MeterRegistry registry) {
Meter.builder(getId().getName(), getType(), measure())
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.baseUnit(getId().getBaseUnit())
.register(registry);
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java
index 7a6f2663ab..f7da866f91 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeDistributionSummary.java
@@ -67,7 +67,7 @@ DistributionSummary newNoopMeter() {
@Override
DistributionSummary registerNewMeter(MeterRegistry registry) {
return DistributionSummary.builder(getId().getName())
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.baseUnit(getId().getBaseUnit())
.publishPercentiles(distributionStatisticConfig.getPercentiles())
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
index 45514b8679..432e7e5679 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
@@ -52,7 +52,7 @@ FunctionCounter registerNewMeter(MeterRegistry registry) {
}
return FunctionCounter.builder(getId().getName(), obj, f)
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.baseUnit(getId().getBaseUnit())
.register(registry);
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
index 50bc862ab8..59333d9e88 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
@@ -69,7 +69,7 @@ FunctionTimer registerNewMeter(MeterRegistry registry) {
return FunctionTimer.builder(getId().getName(), obj, countFunction,
totalTimeFunction, totalTimeFunctionUnit)
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.register(registry);
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
index a9ecf6ccad..e9478279b5 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
@@ -52,7 +52,7 @@ Gauge registerNewMeter(MeterRegistry registry) {
}
return Gauge.builder(getId().getName(), obj, f)
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.baseUnit(getId().getBaseUnit())
.register(registry);
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java
index fee5e52e72..64c0dc75e3 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeLongTaskTimer.java
@@ -85,7 +85,7 @@ LongTaskTimer newNoopMeter() {
@Override
LongTaskTimer registerNewMeter(MeterRegistry registry) {
return LongTaskTimer.builder(getId().getName())
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.register(registry);
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
index 2ceb5a15df..7b8b98c99f 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
@@ -60,7 +60,7 @@ TimeGauge registerNewMeter(MeterRegistry registry) {
}
return TimeGauge.builder(getId().getName(), obj, fUnit, f)
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.register(registry);
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java
index 1677e8088d..6be093f4cf 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimer.java
@@ -117,7 +117,7 @@ Timer newNoopMeter() {
@Override
Timer registerNewMeter(MeterRegistry registry) {
Timer.Builder builder = Timer.builder(getId().getName())
- .tags(getId().getTags())
+ .tags(getId().getTagsAsIterable())
.description(getId().getDescription())
.maximumExpectedValue(Duration.ofNanos(distributionStatisticConfig.getMaximumExpectedValue()))
.minimumExpectedValue(Duration.ofNanos(distributionStatisticConfig.getMinimumExpectedValue()))
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/config/MeterFilter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/config/MeterFilter.java
index 921edad25e..772f9ce8d8 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/config/MeterFilter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/config/MeterFilter.java
@@ -27,8 +27,8 @@
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.function.Function;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toList;
import static java.util.stream.StreamSupport.stream;
/**
@@ -52,9 +52,7 @@ static MeterFilter commonTags(Iterable tags) {
return new MeterFilter() {
@Override
public Meter.Id map(Meter.Id id) {
- List allTags = new ArrayList<>(id.getTags());
- tags.forEach(allTags::add);
- return new Meter.Id(id.getName(), allTags, id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.withTags(Tags.concat(tags, id.getTagsAsIterable()));
}
};
}
@@ -75,13 +73,13 @@ public Meter.Id map(Meter.Id id) {
return id;
List tags = new ArrayList<>();
- for (Tag tag : id.getTags()) {
+ for (Tag tag : id.getTagsAsIterable()) {
if (tag.getKey().equals(fromTagKey))
tags.add(Tag.of(toTagKey, tag.getValue()));
else tags.add(tag);
}
- return new Meter.Id(id.getName(), tags, id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.replaceTags(tags);
}
};
}
@@ -96,16 +94,16 @@ static MeterFilter ignoreTags(String... tagKeys) {
return new MeterFilter() {
@Override
public Meter.Id map(Meter.Id id) {
- List tags = stream(id.getTags().spliterator(), false)
+ List tags = stream(id.getTagsAsIterable().spliterator(), false)
.filter(t -> {
for (String tagKey : tagKeys) {
if (t.getKey().equals(tagKey))
return false;
}
return true;
- }).collect(Collectors.toList());
+ }).collect(toList());
- return new Meter.Id(id.getName(), tags, id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.replaceTags(tags);
}
};
}
@@ -124,7 +122,7 @@ static MeterFilter replaceTagValues(String tagKey, Function repl
return new MeterFilter() {
@Override
public Meter.Id map(Meter.Id id) {
- List tags = stream(id.getTags().spliterator(), false)
+ List tags = stream(id.getTagsAsIterable().spliterator(), false)
.map(t -> {
if (!t.getKey().equals(tagKey))
return t;
@@ -134,9 +132,9 @@ public Meter.Id map(Meter.Id id) {
}
return Tag.of(tagKey, replacement.apply(t.getValue()));
})
- .collect(Collectors.toList());
+ .collect(toList());
- return new Meter.Id(id.getName(), tags, id.getBaseUnit(), id.getDescription(), id.getType());
+ return id.replaceTags(tags);
}
};
}
@@ -249,7 +247,7 @@ static MeterFilter maximumAllowableTags(String meterNamePrefix, String tagKey, i
@Override
public MeterFilterReply accept(Meter.Id id) {
- String value = getTagValue(id);
+ String value = matchNameAndGetTagValue(id);
if (value != null) {
if (!observedTagValues.contains(value)) {
if (observedTagValues.size() >= maximumTagValues) {
@@ -261,13 +259,14 @@ public MeterFilterReply accept(Meter.Id id) {
return MeterFilterReply.NEUTRAL;
}
- private String getTagValue(Meter.Id id) {
- return (id.getName().startsWith(meterNamePrefix) ? id.getTag(tagKey) : null);
+ @Nullable
+ private String matchNameAndGetTagValue(Meter.Id id) {
+ return id.getName().startsWith(meterNamePrefix) ? id.getTag(tagKey) : null;
}
@Override
public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
- String value = getTagValue(id);
+ String value = matchNameAndGetTagValue(id);
if (value != null) {
if (!observedTagValues.contains(value)) {
if (observedTagValues.size() >= maximumTagValues) {
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java
index 3051e92c31..0095f89035 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java
@@ -45,20 +45,20 @@ public static HistogramGauges registerWithCommonFormat(Timer timer, MeterRegistr
Meter.Id id = timer.getId();
return HistogramGauges.register(timer, registry,
percentile -> id.getName() + ".percentile",
- percentile -> Tags.concat(id.getTags(), "phi", DoubleFormat.decimalOrNan(percentile.percentile())),
+ percentile -> Tags.concat(id.getTagsAsIterable(), "phi", DoubleFormat.decimalOrNan(percentile.percentile())),
percentile -> percentile.value(timer.baseTimeUnit()),
bucket -> id.getName() + ".histogram",
- bucket -> Tags.concat(id.getTags(), "le", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit()))));
+ bucket -> Tags.concat(id.getTagsAsIterable(), "le", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit()))));
}
public static HistogramGauges registerWithCommonFormat(DistributionSummary summary, MeterRegistry registry) {
Meter.Id id = summary.getId();
return HistogramGauges.register(summary, registry,
percentile -> id.getName() + ".percentile",
- percentile -> Tags.concat(id.getTags(), "phi", DoubleFormat.decimalOrNan(percentile.percentile())),
+ percentile -> Tags.concat(id.getTagsAsIterable(), "phi", DoubleFormat.decimalOrNan(percentile.percentile())),
ValueAtPercentile::value,
bucket -> id.getName() + ".histogram",
- bucket -> Tags.concat(id.getTags(), "le", DoubleFormat.decimalOrWhole(bucket.bucket())));
+ bucket -> Tags.concat(id.getTagsAsIterable(), "le", DoubleFormat.decimalOrWhole(bucket.bucket())));
}
public static HistogramGauges register(HistogramSupport meter, MeterRegistry registry,
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/noop/NoopTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/noop/NoopTimer.java
index 5a9a128ebb..81381fac91 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/noop/NoopTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/noop/NoopTimer.java
@@ -15,8 +15,8 @@
*/
package io.micrometer.core.instrument.noop;
-import io.micrometer.core.instrument.distribution.HistogramSnapshot;
import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.distribution.HistogramSnapshot;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/search/RequiredSearch.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/search/RequiredSearch.java
index 92ac9e0766..282b01534d 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/search/RequiredSearch.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/search/RequiredSearch.java
@@ -44,7 +44,6 @@ public final class RequiredSearch {
Predicate nameMatches;
-
private RequiredSearch(MeterRegistry registry) {
this.registry = registry;
}
@@ -189,9 +188,9 @@ public Meter meter() {
private M findOne(Class clazz) {
Optional meter = meterStream()
- .filter(clazz::isInstance)
- .findAny()
- .map(clazz::cast);
+ .filter(clazz::isInstance)
+ .findAny()
+ .map(clazz::cast);
if (meter.isPresent()) {
return meter.get();
@@ -236,11 +235,11 @@ private Stream meterStream() {
boolean requiredKeysPresent = true;
if (!requiredTagKeys.isEmpty()) {
final List tagKeys = new ArrayList<>();
- m.getId().getTags().forEach(t -> tagKeys.add(t.getKey()));
+ m.getId().getTagsAsIterable().forEach(t -> tagKeys.add(t.getKey()));
requiredKeysPresent = tagKeys.containsAll(requiredTagKeys);
}
- return m.getId().getTags().containsAll(requiredTags) && requiredKeysPresent;
+ return requiredKeysPresent && m.getId().getTags().containsAll(requiredTags);
});
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/search/Search.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/search/Search.java
index 5dab0a9e4f..a28418ebe4 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/search/Search.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/search/Search.java
@@ -206,7 +206,7 @@ private Stream meterStream() {
requiredKeysPresent = tagKeys.containsAll(requiredTagKeys);
}
- return m.getId().getTags().containsAll(tags) && requiredKeysPresent;
+ return requiredKeysPresent && m.getId().getTags().containsAll(tags);
});
}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/HierarchicalNameMapper.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/HierarchicalNameMapper.java
index 9efadd3ac7..bd170f5695 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/HierarchicalNameMapper.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/HierarchicalNameMapper.java
@@ -30,18 +30,10 @@ public interface HierarchicalNameMapper {
* Sort tags alphabetically by key and append tag key values to the name with '.', e.g.
* {@code http_server_requests.response.200.method.GET}
*/
- HierarchicalNameMapper DEFAULT = (id, convention) -> {
- String tags = "";
-
- if (id.getTags().iterator().hasNext()) {
- tags = "." + id.getConventionTags(convention).stream()
- .map(t -> t.getKey() + "." + t.getValue())
- .map(nameSegment -> nameSegment.replace(" ", "_"))
- .collect(Collectors.joining("."));
- }
-
- return id.getConventionName(convention) + tags;
- };
+ HierarchicalNameMapper DEFAULT = (id, convention) -> id.getConventionName(convention) + id.getConventionTags(convention).stream()
+ .map(t -> "." + t.getKey() + "." + t.getValue())
+ .map(nameSegment -> nameSegment.replace(" ", "_"))
+ .collect(Collectors.joining(""));
String toHierarchicalName(Meter.Id id, NamingConvention convention);
}
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java
index 7f50b284e8..46f82f167b 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java
@@ -26,13 +26,9 @@
import java.time.Duration;
import java.util.concurrent.atomic.AtomicInteger;
-import static java.util.Collections.emptyList;
import static java.util.stream.StreamSupport.stream;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.*;
/**
* Tests for {@link MeterFilter}.
@@ -47,7 +43,7 @@ private static Condition tag(String tagKey) {
private static Condition tag(String tagKey, @Nullable String tagValue) {
return new Condition<>(
- id -> stream(id.getTags().spliterator(), false)
+ id -> stream(id.getTagsAsIterable().spliterator(), false)
.anyMatch(t -> t.getKey().equals(tagKey) && (tagValue == null || t.getValue().equals(tagValue))),
"Must have a tag with key '" + tagKey + "'");
}
@@ -101,8 +97,8 @@ void renameTags() {
void maximumAllowableMetrics() {
MeterFilter filter = MeterFilter.maximumAllowableMetrics(1);
- Meter.Id id = new Meter.Id("name", emptyList(), null, null, Meter.Type.COUNTER);
- Meter.Id id2 = new Meter.Id("name2", emptyList(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id2 = new Meter.Id("name2", Tags.empty(), null, null, Meter.Type.COUNTER);
assertThat(filter.accept(id)).isEqualTo(MeterFilterReply.NEUTRAL);
assertThat(filter.accept(id)).isEqualTo(MeterFilterReply.NEUTRAL);
@@ -186,7 +182,7 @@ void maximumAllowableTagsWhenAlreadyInAllowableTagValuesShouldNotAffect() {
@Test
void minExpectedOnSummary() {
MeterFilter filter = MeterFilter.minExpected("name", 100);
- Meter.Id timer = new Meter.Id("name", emptyList(), null, null, Meter.Type.DISTRIBUTION_SUMMARY);
+ Meter.Id timer = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.DISTRIBUTION_SUMMARY);
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT))
.satisfies(conf -> assertThat(conf.getMinimumExpectedValue()).isEqualTo(100));
@@ -195,7 +191,7 @@ void minExpectedOnSummary() {
@Test
void maxExpectedOnSummary() {
MeterFilter filter = MeterFilter.maxExpected("name", 100);
- Meter.Id timer = new Meter.Id("name", emptyList(), null, null, Meter.Type.DISTRIBUTION_SUMMARY);
+ Meter.Id timer = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.DISTRIBUTION_SUMMARY);
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT))
.satisfies(conf -> assertThat(conf.getMaximumExpectedValue()).isEqualTo(100));
@@ -204,7 +200,7 @@ void maxExpectedOnSummary() {
@Test
void minExpectedOnTimer() {
MeterFilter filter = MeterFilter.minExpected("name", Duration.ofNanos(100));
- Meter.Id timer = new Meter.Id("name", emptyList(), null, null, Meter.Type.TIMER);
+ Meter.Id timer = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.TIMER);
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT))
.satisfies(conf -> assertThat(conf.getMinimumExpectedValue()).isEqualTo(100));
@@ -213,7 +209,7 @@ void minExpectedOnTimer() {
@Test
void maxExpectedOnTimer() {
MeterFilter filter = MeterFilter.maxExpected("name", Duration.ofNanos(100));
- Meter.Id timer = new Meter.Id("name", emptyList(), null, null, Meter.Type.TIMER);
+ Meter.Id timer = new Meter.Id("name", Tags.empty(), null, null, Meter.Type.TIMER);
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT))
.satisfies(conf -> assertThat(conf.getMaximumExpectedValue()).isEqualTo(100));
@@ -221,8 +217,8 @@ void maxExpectedOnTimer() {
@Test
void denyUnless() {
- Meter.Id id1 = new Meter.Id("my.counter", emptyList(), null, null, Meter.Type.COUNTER);
- Meter.Id id2 = new Meter.Id("other.counter", emptyList(), null, null, Meter.Type.COUNTER);
+ Meter.Id id1 = new Meter.Id("my.counter", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id2 = new Meter.Id("other.counter", Tags.empty(), null, null, Meter.Type.COUNTER);
MeterFilter filter = MeterFilter.denyUnless(id -> id.getName().startsWith("my"));
assertThat(filter.accept(id1)).isEqualTo(MeterFilterReply.NEUTRAL);
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterIdTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterIdTest.java
index ba3d8b65d8..cd826b4828 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterIdTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterIdTest.java
@@ -17,20 +17,19 @@
import org.junit.jupiter.api.Test;
-import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;
class MeterIdTest {
@Test
void withStatistic() {
- Meter.Id id = new Meter.Id("my.id", emptyList(), null, null, Meter.Type.TIMER);
+ Meter.Id id = new Meter.Id("my.id", Tags.empty(), null, null, Meter.Type.TIMER);
assertThat(id.withTag(Statistic.TOTAL_TIME).getTags()).contains(Tag.of("statistic", "total"));
}
@Test
void equalsAndHashCode() {
- Meter.Id id = new Meter.Id("my.id", emptyList(), null, null, Meter.Type.COUNTER);
- Meter.Id id2 = new Meter.Id("my.id", emptyList(), null, null, Meter.Type.COUNTER);
+ Meter.Id id = new Meter.Id("my.id", Tags.empty(), null, null, Meter.Type.COUNTER);
+ Meter.Id id2 = new Meter.Id("my.id", Tags.empty(), null, null, Meter.Type.COUNTER);
assertThat(id).isEqualTo(id2);
assertThat(id.hashCode()).isEqualTo(id2.hashCode());
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/TagsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/TagsTest.java
index 3a8ed762da..fad2ba0794 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/TagsTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/TagsTest.java
@@ -31,6 +31,14 @@
*/
class TagsTest {
+ @Test
+ void dedup() {
+ assertThat(Tags.of("k1", "v1", "k2", "v2")).containsExactly(Tag.of("k1", "v1"), Tag.of("k2", "v2"));
+ assertThat(Tags.of("k1", "v1", "k1", "v2")).containsExactly(Tag.of("k1", "v2"));
+ assertThat(Tags.of("k1", "v1", "k1", "v2", "k3", "v3")).containsExactly(Tag.of("k1", "v2"), Tag.of("k3", "v3"));
+ assertThat(Tags.of("k1", "v1", "k2", "v2", "k2", "v3")).containsExactly(Tag.of("k1", "v1"), Tag.of("k2", "v3"));
+ }
+
@Test
void createsListWithSingleTag() {
Iterable tags = Tags.of("k1", "v1");
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepFunctionCounterTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepFunctionCounterTest.java
index ebd4c4ec4b..a429f2b465 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepFunctionCounterTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepFunctionCounterTest.java
@@ -15,27 +15,51 @@
*/
package io.micrometer.core.instrument.step;
-import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
+import io.micrometer.core.instrument.Tags;
import org.junit.jupiter.api.Test;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;
class StepFunctionCounterTest {
+ private MockClock clock = new MockClock();
+
+ private StepRegistryConfig config = new StepRegistryConfig() {
+ @Override
+ public String prefix() {
+ return "test";
+ }
+
+ @Override
+ public String get(String key) {
+ return null;
+ }
+ };
+
+ private MeterRegistry registry = new StepMeterRegistry(config, clock) {
+ @Override
+ protected void publish() {
+ }
+
+ @Override
+ protected TimeUnit getBaseTimeUnit() {
+ return TimeUnit.SECONDS;
+ }
+ };
+
@Test
void count() {
AtomicInteger n = new AtomicInteger(1);
- MockClock clock = new MockClock();
- StepFunctionCounter counter = new StepFunctionCounter<>(
- new Meter.Id("my.counter", emptyList(), null, null, Meter.Type.COUNTER),
- clock, 1, n, AtomicInteger::get);
+ FunctionCounter counter = registry.more().counter("my.counter", Tags.empty(), n);
+ assertThat(counter).isInstanceOf(StepFunctionCounter.class);
assertThat(counter.count()).isEqualTo(0);
- clock.add(1, TimeUnit.MILLISECONDS);
+ clock.add(config.step());
assertThat(counter.count()).isEqualTo(1);
}
}
diff --git a/micrometer-core/src/test/resources/logback.xml b/micrometer-core/src/test/resources/logback.xml
index 7af567224e..a6a937808d 100644
--- a/micrometer-core/src/test/resources/logback.xml
+++ b/micrometer-core/src/test/resources/logback.xml
@@ -31,5 +31,16 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/micrometer-jersey2/gradle/dependency-locks/annotationProcessor.lockfile b/micrometer-jersey2/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/micrometer-jersey2/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/micrometer-jersey2/gradle/dependency-locks/compile.lockfile b/micrometer-jersey2/gradle/dependency-locks/compile.lockfile
index 74cf8fb87d..01dbb75abb 100644
--- a/micrometer-jersey2/gradle/dependency-locks/compile.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/compile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -50,7 +52,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-jersey2/gradle/dependency-locks/compileClasspath.lockfile
index 74cf8fb87d..01dbb75abb 100644
--- a/micrometer-jersey2/gradle/dependency-locks/compileClasspath.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -50,7 +52,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/default.lockfile b/micrometer-jersey2/gradle/dependency-locks/default.lockfile
index 74cf8fb87d..01dbb75abb 100644
--- a/micrometer-jersey2/gradle/dependency-locks/default.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/default.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -50,7 +52,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/runtime.lockfile b/micrometer-jersey2/gradle/dependency-locks/runtime.lockfile
index 74cf8fb87d..01dbb75abb 100644
--- a/micrometer-jersey2/gradle/dependency-locks/runtime.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/runtime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -50,7 +52,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-jersey2/gradle/dependency-locks/runtimeClasspath.lockfile
index 74cf8fb87d..01dbb75abb 100644
--- a/micrometer-jersey2/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -50,7 +52,7 @@ org.apache.tomcat.embed:tomcat-embed-core:8.5.34
org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/testCompile.lockfile b/micrometer-jersey2/gradle/dependency-locks/testCompile.lockfile
index b557360626..ceb503359a 100644
--- a/micrometer-jersey2/gradle/dependency-locks/testCompile.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/testCompile.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -53,7 +55,7 @@ org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.assertj:assertj-core:3.11.1
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-jersey2/gradle/dependency-locks/testCompileClasspath.lockfile
index b557360626..ceb503359a 100644
--- a/micrometer-jersey2/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -53,7 +55,7 @@ org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.assertj:assertj-core:3.11.1
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/testRuntime.lockfile b/micrometer-jersey2/gradle/dependency-locks/testRuntime.lockfile
index 8a2acf41c3..e6437b5765 100644
--- a/micrometer-jersey2/gradle/dependency-locks/testRuntime.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/testRuntime.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -54,7 +56,7 @@ org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.assertj:assertj-core:3.11.1
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 8a2acf41c3..e6437b5765 100644
--- a/micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -7,8 +7,10 @@ ch.qos.logback:logback-core:1.2.3
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.1.3
-com.google.guava:guava:26.0-jre
+com.google.errorprone:error_prone_annotations:2.2.0
+com.google.guava:failureaccess:1.0
+com.google.guava:guava:27.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.hazelcast:hazelcast:3.8.9
com.netflix.archaius:archaius-core:0.4.1
@@ -54,7 +56,7 @@ org.apache.tomcat:tomcat-annotations-api:8.5.34
org.aspectj:aspectjweaver:1.8.13
org.assertj:assertj-core:3.11.1
org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.14
+org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jetty:jetty-http:9.4.12.RC2
org.eclipse.jetty:jetty-io:9.4.12.RC2
org.eclipse.jetty:jetty-server:9.4.12.RC2
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile
index fa797b2370..51d71465fe 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -36,9 +36,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile
index fa797b2370..51d71465fe 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -36,9 +36,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile
index fa797b2370..51d71465fe 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -36,9 +36,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile
index fa797b2370..51d71465fe 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -36,9 +36,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile
index fa797b2370..51d71465fe 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -36,9 +36,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile
index 57be3ed8b2..0b199b1c15 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
aopalliance:aopalliance:1.0
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -47,9 +47,9 @@ com.jayway.jsonpath:json-path:2.2.0
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile
index 57be3ed8b2..0b199b1c15 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
aopalliance:aopalliance:1.0
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -47,9 +47,9 @@ com.jayway.jsonpath:json-path:2.2.0
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile
index 69cbc58c3e..d5c37de846 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
aopalliance:aopalliance:1.0
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -47,9 +47,9 @@ com.jayway.jsonpath:json-path:2.2.0
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 69cbc58c3e..d5c37de846 100644
--- a/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,9 +5,9 @@ antlr:antlr:2.7.7
aopalliance:aopalliance:1.0
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -47,9 +47,9 @@ com.jayway.jsonpath:json-path:2.2.0
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.13
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/micrometer-test/gradle/dependency-locks/annotationProcessor.lockfile b/micrometer-test/gradle/dependency-locks/annotationProcessor.lockfile
new file mode 100644
index 0000000000..656c5dbccf
--- /dev/null
+++ b/micrometer-test/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,3 @@
+# 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.
diff --git a/micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java b/micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java
index 56d1e3adf3..54c94ee63e 100644
--- a/micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java
+++ b/micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java
@@ -98,7 +98,7 @@ void addCommonTags(MeterRegistry registry) {
Counter c = registry.counter("foo");
assertThat(registry.get("foo").tags("k", "v").counter()).isSameAs(c);
- assertThat(c.getId().getTags()).hasSize(1);
+ assertThat(c.getId().getTagsAsIterable()).hasSize(1);
}
@Test
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 628f1482e1..5f7fbd168f 100644
--- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -4,9 +4,9 @@
antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.8.0
com.fasterxml.jackson.core:jackson-core:2.8.11
com.fasterxml.jackson.core:jackson-databind:2.8.11.2
@@ -37,9 +37,9 @@ com.hazelcast:hazelcast:3.7.8
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
com.squareup.okio:okio:1.14.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
index c894b92ddd..0a3ac362f4 100644
--- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,14 +5,14 @@ antlr:antlr:2.7.7
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
colt:colt:1.2.0
-com.amazonaws:aws-java-sdk-cloudwatch:1.11.430
-com.amazonaws:aws-java-sdk-core:1.11.430
-com.amazonaws:jmespath-java:1.11.430
+com.amazonaws:aws-java-sdk-cloudwatch:1.11.436
+com.amazonaws:aws-java-sdk-core:1.11.436
+com.amazonaws:jmespath-java:1.11.436
com.fasterxml.jackson.core:jackson-annotations:2.9.0
-com.fasterxml.jackson.core:jackson-core:2.9.6
-com.fasterxml.jackson.core:jackson-databind:2.9.6
+com.fasterxml.jackson.core:jackson-core:2.9.7
+com.fasterxml.jackson.core:jackson-databind:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.6
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.7
com.fasterxml:classmate:1.3.0
com.github.ben-manes.caffeine:caffeine:2.6.2
com.google.api.grpc:proto-google-cloud-monitoring-v3:1.31.0
@@ -38,9 +38,9 @@ com.hazelcast:hazelcast:3.8.9
com.microsoft.azure:applicationinsights-core:2.2.0
com.netflix.archaius:archaius-core:0.4.1
com.netflix.hystrix:hystrix-core:1.5.12
-com.netflix.spectator:spectator-api:0.78.0
-com.netflix.spectator:spectator-ext-ipc:0.78.0
-com.netflix.spectator:spectator-reg-atlas:0.78.0
+com.netflix.spectator:spectator-api:0.79.0
+com.netflix.spectator:spectator-ext-ipc:0.79.0
+com.netflix.spectator:spectator-reg-atlas:0.79.0
com.rabbitmq:amqp-client:4.4.1
com.signalfx.public:signalfx-java:0.0.48
com.squareup.okhttp3:okhttp:3.11.0
diff --git a/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleConfig.java b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleConfig.java
index e0c7178611..5895e78b81 100644
--- a/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleConfig.java
+++ b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleConfig.java
@@ -16,12 +16,14 @@
package io.micrometer.core.samples.utils;
import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
// Run: git update-index --assume-unchanged **/SampleConfig.java
// If you legitimately need to change this file, you can undo this with: git update-index --no-assume-unchanged **/SampleConfig.java
public class SampleConfig {
public static MeterRegistry myMonitoringSystem() {
// Pick a monitoring system here to use in your samples.
- return SampleRegistries.prometheus();
+// return SampleRegistries.prometheus();
+ return new SimpleMeterRegistry();
}
}