diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index aea10c2a0e..2ff434cafa 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -28,23 +30,27 @@ com.google.cloud:google-cloud-core:1.50.0 com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 -com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.errorprone:error_prone_annotations:2.0.18 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -75,10 +81,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -87,25 +94,32 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 -net.sf.jopt-simple:jopt-simple:4.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.2 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.14 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -114,11 +128,19 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 org.openjdk.jmh:jmh-core:1.21 org.openjdk.jmh:jmh-generator-annprocess:1.21 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetrics.java index b4bc39b689..0ca8f714c4 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetrics.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetrics.java @@ -28,7 +28,9 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; +import java.util.function.ToDoubleFunction; import static java.util.Collections.emptyList; @@ -122,8 +124,8 @@ public void bindTo(MeterRegistry registry) { registerMetricsEventually("consumer-metrics", (o, tags) -> { registerGaugeForObject(registry, o, "connection-count", tags, "The current number of active connections.", "connections"); - registerGaugeForObject(registry, o, "connections-creation-total", tags, "New connections established.", "connections"); - registerGaugeForObject(registry, o, "connections-close-total", tags, "Connections closed.", "connections"); + registerGaugeForObject(registry, o, "connection-creation-total", tags, "New connections established.", "connections"); + registerGaugeForObject(registry, o, "connection-close-total", tags, "Connections closed.", "connections"); registerGaugeForObject(registry, o, "io-ratio", tags, "The fraction of time the I/O thread spent doing I/O.", null); registerGaugeForObject(registry, o, "io-wait-ratio", tags, "The fraction of time the I/O thread spent waiting.", null); registerGaugeForObject(registry, o, "select-total", tags, "Number of times the I/O layer checked for new I/O to perform.", null); @@ -149,11 +151,14 @@ public void bindTo(MeterRegistry registry) { } private void registerGaugeForObject(MeterRegistry registry, ObjectName o, String jmxMetricName, String meterName, Tags allTags, String description, @Nullable String baseUnit) { - Gauge.builder(METRIC_NAME_PREFIX + meterName, mBeanServer, s -> safeDouble(() -> s.getAttribute(o, jmxMetricName))) + final AtomicReference gauge = new AtomicReference<>(); + gauge.set(Gauge + .builder(METRIC_NAME_PREFIX + meterName, mBeanServer, + getJmxAttribute(registry, gauge, o, jmxMetricName)) .description(description) .baseUnit(baseUnit) .tags(allTags) - .register(registry); + .register(registry)); } private void registerGaugeForObject(MeterRegistry registry, ObjectName o, String jmxMetricName, Tags allTags, String description, @Nullable String baseUnit) { @@ -161,19 +166,33 @@ private void registerGaugeForObject(MeterRegistry registry, ObjectName o, String } private void registerFunctionCounterForObject(MeterRegistry registry, ObjectName o, String jmxMetricName, Tags allTags, String description, @Nullable String baseUnit) { - FunctionCounter.builder(METRIC_NAME_PREFIX + sanitize(jmxMetricName), mBeanServer, s -> safeDouble(() -> s.getAttribute(o, jmxMetricName))) + final AtomicReference counter = new AtomicReference<>(); + counter.set(FunctionCounter + .builder(METRIC_NAME_PREFIX + sanitize(jmxMetricName), mBeanServer, + getJmxAttribute(registry, counter, o, jmxMetricName)) .description(description) .baseUnit(baseUnit) .tags(allTags) - .register(registry); + .register(registry)); } private void registerTimeGaugeForObject(MeterRegistry registry, ObjectName o, String jmxMetricName, String meterName, Tags allTags, String description) { - TimeGauge.builder(METRIC_NAME_PREFIX + meterName, mBeanServer, TimeUnit.MILLISECONDS, - s -> safeDouble(() -> s.getAttribute(o, jmxMetricName))) + final AtomicReference timeGauge = new AtomicReference<>(); + timeGauge.set(TimeGauge.builder(METRIC_NAME_PREFIX + meterName, mBeanServer, TimeUnit.MILLISECONDS, + getJmxAttribute(registry, timeGauge, o, jmxMetricName)) .description(description) .tags(allTags) - .register(registry); + .register(registry)); + } + + private ToDoubleFunction getJmxAttribute(MeterRegistry registry, AtomicReference meter, + ObjectName o, String jmxMetricName) { + return s -> safeDouble(jmxMetricName, () -> { + if (!s.isRegistered(o)) { + registry.remove(meter.get()); + } + return s.getAttribute(o, jmxMetricName); + }); } private void registerTimeGaugeForObject(MeterRegistry registry, ObjectName o, String jmxMetricName, Tags allTags, String description) { @@ -209,27 +228,28 @@ private void registerMetricsEventually(String type, BiConsumer throw new RuntimeException("Error registering Kafka JMX based metrics", e); } - NotificationListener notificationListener = new NotificationListener() { - - @Override - public void handleNotification(Notification notification, Object handback) { - MBeanServerNotification mbs = (MBeanServerNotification) notification; - ObjectName o = mbs.getMBeanName(); - perObject.accept(o, Tags.concat(tags, nameTag(o))); - try { - mBeanServer.removeNotificationListener(MBeanServerDelegate.DELEGATE_NAME, this); - } catch (InstanceNotFoundException | ListenerNotFoundException ex) { - throw new RuntimeException(ex); - } - } + registerNotificationListener(type, perObject); + } + /** + * This notification listener should remain indefinitely since new Kafka consumers can be added at any time. + * + * @param type The Kafka JMX type to listen for. + * @param perObject Metric registration handler when a new MBean is created. + */ + private void registerNotificationListener(String type, BiConsumer perObject) { + NotificationListener notificationListener = (notification, handback) -> { + MBeanServerNotification mbs = (MBeanServerNotification) notification; + ObjectName o = mbs.getMBeanName(); + perObject.accept(o, Tags.concat(tags, nameTag(o))); }; NotificationFilter filter = (NotificationFilter) notification -> { if (!MBeanServerNotification.REGISTRATION_NOTIFICATION.equals(notification.getType())) return false; ObjectName obj = ((MBeanServerNotification) notification).getMBeanName(); - return obj.getDomain().equals(JMX_DOMAIN) && obj.getKeyProperty("type").equals(type); + return obj.getDomain().equals(JMX_DOMAIN) && obj.getKeyProperty("type").equals(type) && + obj.getKeyProperty("partition") == null && obj.getKeyProperty("topic") == null; }; try { @@ -239,7 +259,7 @@ public void handleNotification(Notification notification, Object handback) { } } - private double safeDouble(Callable callable) { + private double safeDouble(String jmxMetricName, Callable callable) { try { return Double.parseDouble(callable.call().toString()); } catch (Exception e) { @@ -255,16 +275,10 @@ private Iterable nameTag(ObjectName name) { tags = Tags.concat(tags, "client.id", clientId); } - String topic = name.getKeyProperty("topic"); - if (topic != null) { - tags = Tags.concat(tags, "topic", topic); - } - return tags; } private static String sanitize(String value) { return value.replaceAll("-", "."); } - } diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetricsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetricsTest.java index 5116ec9119..ede1661fcb 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetricsTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetricsTest.java @@ -27,6 +27,8 @@ import java.util.Collections; import java.util.Properties; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; @@ -72,4 +74,20 @@ void kafkaMajorVersion() { assertThat(kafkaConsumerMetrics.kafkaMajorVersion(Tags.of("client.id", "consumer-1"))).isGreaterThanOrEqualTo(2); } + + @Test + void newConsumersAreDiscoveredByListener() throws InterruptedException { + MeterRegistry registry = new SimpleMeterRegistry(); + kafkaConsumerMetrics.bindTo(registry); + + CountDownLatch latch = new CountDownLatch(1); + registry.config().onMeterAdded(m -> { + if (m.getId().getName().contains("kafka")) + latch.countDown(); + }); + + createConsumer(); + + latch.await(10, TimeUnit.SECONDS); + } } diff --git a/samples/micrometer-samples-core/build.gradle b/samples/micrometer-samples-core/build.gradle index c4128daea6..7a474d349f 100644 --- a/samples/micrometer-samples-core/build.gradle +++ b/samples/micrometer-samples-core/build.gradle @@ -14,6 +14,7 @@ dependencies { } compile 'io.prometheus:simpleclient_pushgateway:latest.release' - compile 'io.projectreactor.netty:reactor-netty:latest.release' + compile 'org.apache.kafka:kafka-clients:latest.release' + compile 'com.github.charithe:kafka-junit:4.1.2' } \ No newline at end of file diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 3b3ec51c4a..b7b59b463e 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -5,9 +5,10 @@ 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.438 -com.amazonaws:aws-java-sdk-core:1.11.438 -com.amazonaws:jmespath-java:1.11.438 +com.101tec:zkclient:0.10 +com.amazonaws:aws-java-sdk-cloudwatch:1.11.440 +com.amazonaws:aws-java-sdk-core:1.11.440 +com.amazonaws:jmespath-java:1.11.440 com.fasterxml.jackson.core:jackson-annotations:2.9.0 com.fasterxml.jackson.core:jackson-core:2.9.7 com.fasterxml.jackson.core:jackson-databind:2.9.7 @@ -15,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.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.github.charithe:kafka-junit:4.1.2 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.32.0 com.google.api.grpc:proto-google-common-protos:1.12.0 com.google.api.grpc:proto-google-iam-v1:0.12.0 @@ -29,22 +31,26 @@ com.google.cloud:google-cloud-monitoring:1.50.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.errorprone:error_prone_annotations:2.2.0 -com.google.guava:guava:20.0 +com.google.guava:guava:23.3-jre com.google.http-client:google-http-client-jackson2:1.24.1 com.google.http-client:google-http-client:1.24.1 +com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 com.hazelcast:hazelcast:3.11 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.79.0 -com.netflix.spectator:spectator-ext-ipc:0.79.0 -com.netflix.spectator:spectator-reg-atlas:0.79.0 +com.netflix.spectator:spectator-api:0.80.0 +com.netflix.spectator:spectator-ext-ipc:0.80.0 +com.netflix.spectator:spectator-reg-atlas:0.80.0 com.rabbitmq:amqp-client:4.4.1 com.signalfx.public:signalfx-java:0.0.48 com.squareup.okhttp3:okhttp:3.11.0 com.squareup.okio:okio:1.14.0 +com.typesafe.scala-logging:scala-logging_2.12:3.9.0 +com.yammer.metrics:metrics-core:2.2.0 +commons-cli:commons-cli:1.2 commons-codec:commons-codec:1.10 commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 @@ -74,10 +80,11 @@ io.netty:netty-resolver:4.1.29.Final io.netty:netty-transport-native-epoll:4.1.29.Final io.netty:netty-transport-native-unix-common:4.1.29.Final io.netty:netty-transport:4.1.29.Final +io.netty:netty:3.10.5.Final io.opencensus:opencensus-api:0.12.3 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3 -io.projectreactor.netty:reactor-netty:0.8.1.RELEASE -io.projectreactor:reactor-core:3.2.1.RELEASE +io.projectreactor.netty:reactor-netty:0.8.2.RELEASE +io.projectreactor:reactor-core:3.2.2.RELEASE io.prometheus:simpleclient:0.5.0 io.prometheus:simpleclient_common:0.5.0 io.prometheus:simpleclient_pushgateway:0.5.0 @@ -86,23 +93,31 @@ javax.cache:cache-api:1.1.0 javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.9.2 +junit:junit:4.12 +log4j:log4j:1.2.17 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.6 +net.sf.jopt-simple:jopt-simple:5.0.4 org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 +org.apache.curator:curator-test:4.0.0 org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpcore:4.4.9 +org.apache.kafka:kafka-clients:2.0.0 +org.apache.kafka:kafka_2.12:2.0.0 org.apache.logging.log4j:log4j-api:2.11.1 org.apache.logging.log4j:log4j-core:2.11.1 org.apache.tomcat.embed:tomcat-embed-core:8.5.34 org.apache.tomcat:tomcat-annotations-api:8.5.34 +org.apache.zookeeper:zookeeper:3.5.3-beta org.aspectj:aspectjweaver:1.8.13 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 org.eclipse.jetty:jetty-util:9.4.12.RC2 +org.hamcrest:hamcrest-core:1.3 org.hdrhistogram:HdrHistogram:2.1.9 org.hibernate.common:hibernate-commons-annotations:5.0.1.Final org.hibernate:hibernate-core:5.3.0.Beta1 @@ -111,9 +126,17 @@ org.javassist:javassist:3.22.0-GA org.jboss.logging:jboss-logging:3.3.1.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final org.jboss:jandex:2.0.3.Final +org.junit.jupiter:junit-jupiter-api:5.1.0-M1 +org.junit.platform:junit-platform-commons:1.1.0-M1 org.latencyutils:LatencyUtils:2.0.3 +org.lz4:lz4-java:1.4.1 +org.opentest4j:opentest4j:1.0.0 org.pcollections:pcollections:3.0.3 org.reactivestreams:reactive-streams:1.0.2 +org.scala-lang:scala-library:2.12.6 +org.scala-lang:scala-reflect:2.12.6 +org.slf4j:log4j-over-slf4j:1.7.22 org.slf4j:slf4j-api:1.7.25 org.threeten:threetenbp:1.3.3 +org.xerial.snappy:snappy-java:1.1.7.1 software.amazon.ion:ion-java:1.0.2 diff --git a/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/KafkaMetricsSample.java b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/KafkaMetricsSample.java new file mode 100644 index 0000000000..e8c9df09a2 --- /dev/null +++ b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/KafkaMetricsSample.java @@ -0,0 +1,57 @@ +/** + * 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.core.samples; + +import com.github.charithe.kafka.EphemeralKafkaBroker; +import com.github.charithe.kafka.KafkaHelper; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.binder.kafka.KafkaConsumerMetrics; +import io.micrometer.core.samples.utils.SampleConfig; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import reactor.core.publisher.Flux; + +import java.time.Duration; + +import static java.util.Collections.singletonList; + +public class KafkaMetricsSample { + private final static String TOPIC = "my-example-topic"; + + public static void main(String[] args) throws Exception { + EphemeralKafkaBroker broker = EphemeralKafkaBroker.create(); + broker.start(); + KafkaHelper kafkaHelper = KafkaHelper.createFor(broker); + + MeterRegistry registry = SampleConfig.myMonitoringSystem(); + new KafkaConsumerMetrics().bindTo(registry); + + KafkaConsumer consumer = kafkaHelper.createStringConsumer(); + KafkaProducer producer = kafkaHelper.createStringProducer(); + + consumer.subscribe(singletonList(TOPIC)); + + Flux.interval(Duration.ofMillis(10)) + .doOnEach(n -> producer.send(new ProducerRecord<>(TOPIC, "hello", "world"))) + .subscribe(); + + for(;;) { + consumer.poll(Duration.ofMillis(100)); + consumer.commitAsync(); + } + } +} diff --git a/scripts/graphite.sh b/scripts/graphite.sh index d7c9300a34..49cefb0069 100755 --- a/scripts/graphite.sh +++ b/scripts/graphite.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash docker run -d\ - --restart=always\ -p 8081:80\ -p 2003-2004:2003-2004\ -p 2023-2024:2023-2024\