From 13d81d084077e2d04285e46c69cc381d6db54078 Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Fri, 5 Oct 2018 22:34:59 -0500 Subject: [PATCH] Remove dropwizard dependency from ganglia implementation (fixes #903) --- .../gradle/dependency-locks/compile.lockfile | 5 +- .../compileClasspath.lockfile | 5 +- .../gradle/dependency-locks/default.lockfile | 5 +- .../gradle/dependency-locks/runtime.lockfile | 5 +- .../runtimeClasspath.lockfile | 5 +- .../dependency-locks/testCompile.lockfile | 5 +- .../testCompileClasspath.lockfile | 5 +- .../dependency-locks/testRuntime.lockfile | 5 +- .../testRuntimeClasspath.lockfile | 5 +- .../micrometer-registry-ganglia/build.gradle | 2 +- .../gradle/dependency-locks/compile.lockfile | 5 +- .../compileClasspath.lockfile | 5 +- .../gradle/dependency-locks/default.lockfile | 5 +- .../gradle/dependency-locks/runtime.lockfile | 5 +- .../runtimeClasspath.lockfile | 5 +- .../dependency-locks/testCompile.lockfile | 5 +- .../testCompileClasspath.lockfile | 5 +- .../dependency-locks/testRuntime.lockfile | 5 +- .../testRuntimeClasspath.lockfile | 5 +- .../io/micrometer/ganglia/GangliaConfig.java | 3 +- .../ganglia/GangliaMeterRegistry.java | 158 ++++++++++++++---- .../io/micrometer/core/instrument/Meter.java | 2 +- .../gradle/dependency-locks/compile.lockfile | 5 +- .../compileClasspath.lockfile | 5 +- .../gradle/dependency-locks/default.lockfile | 5 +- .../gradle/dependency-locks/runtime.lockfile | 5 +- .../runtimeClasspath.lockfile | 5 +- .../dependency-locks/testCompile.lockfile | 5 +- .../testCompileClasspath.lockfile | 5 +- .../dependency-locks/testRuntime.lockfile | 5 +- .../testRuntimeClasspath.lockfile | 5 +- .../gradle/dependency-locks/compile.lockfile | 5 +- .../compileClasspath.lockfile | 5 +- .../gradle/dependency-locks/default.lockfile | 5 +- .../gradle/dependency-locks/runtime.lockfile | 5 +- .../runtimeClasspath.lockfile | 5 +- .../dependency-locks/testCompile.lockfile | 5 +- .../testCompileClasspath.lockfile | 5 +- .../dependency-locks/testRuntime.lockfile | 5 +- .../testRuntimeClasspath.lockfile | 5 +- .../main/resources/application-ganglia.yml | 5 +- .../gradle/dependency-locks/compile.lockfile | 5 +- .../compileClasspath.lockfile | 5 +- .../gradle/dependency-locks/default.lockfile | 5 +- .../gradle/dependency-locks/runtime.lockfile | 5 +- .../runtimeClasspath.lockfile | 5 +- .../dependency-locks/testCompile.lockfile | 5 +- .../testCompileClasspath.lockfile | 5 +- .../dependency-locks/testRuntime.lockfile | 5 +- .../testRuntimeClasspath.lockfile | 5 +- scripts/ganglia.sh | 2 + 51 files changed, 230 insertions(+), 167 deletions(-) diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compile.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/compileClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/default.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtime.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompile.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntime.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index e16af3ef0d..57781e5418 100644 --- a/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/benchmarks/benchmarks-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -76,7 +75,7 @@ joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:4.6 -org.acplt:oncrpc:1.0.7 +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.5 diff --git a/implementations/micrometer-registry-ganglia/build.gradle b/implementations/micrometer-registry-ganglia/build.gradle index 651ea1c73d..1a7f37efd3 100644 --- a/implementations/micrometer-registry-ganglia/build.gradle +++ b/implementations/micrometer-registry-ganglia/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'org.junit.platform.gradle.plugin' dependencies { compile project(':micrometer-core') - compile 'io.dropwizard.metrics:metrics-ganglia:3.+' + compile 'info.ganglia.gmetric4j:gmetric4j:latest.release' testCompile project(':micrometer-test') } \ No newline at end of file diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile index bb1172861b..f12c294dce 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compile.lockfile @@ -19,9 +19,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -42,7 +41,7 @@ javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 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 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile index bb1172861b..f12c294dce 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/compileClasspath.lockfile @@ -19,9 +19,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -42,7 +41,7 @@ javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 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 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile index bb1172861b..f12c294dce 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/default.lockfile @@ -19,9 +19,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -42,7 +41,7 @@ javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 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 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile index bb1172861b..f12c294dce 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtime.lockfile @@ -19,9 +19,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -42,7 +41,7 @@ javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 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 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile index bb1172861b..f12c294dce 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/runtimeClasspath.lockfile @@ -19,9 +19,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -42,7 +41,7 @@ javax.persistence:javax.persistence-api:2.2 javax.servlet:javax.servlet-api:3.1.0 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 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 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompile.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompile.lockfile index a40f0bb538..b92c70e77f 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompile.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompile.lockfile @@ -26,9 +26,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -53,7 +52,7 @@ net.minidev:accessors-smart:1.2 net.minidev:json-smart:2.3 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.7 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile index a40f0bb538..b92c70e77f 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile @@ -26,9 +26,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -53,7 +52,7 @@ net.minidev:accessors-smart:1.2 net.minidev:json-smart:2.3 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.7 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntime.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntime.lockfile index a40f0bb538..b92c70e77f 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntime.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntime.lockfile @@ -26,9 +26,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -53,7 +52,7 @@ net.minidev:accessors-smart:1.2 net.minidev:json-smart:2.3 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.7 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile index a40f0bb538..b92c70e77f 100644 --- a/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -26,9 +26,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.netty:netty-buffer:4.1.29.Final io.netty:netty-codec-http2:4.1.29.Final io.netty:netty-codec-http:4.1.29.Final @@ -53,7 +52,7 @@ net.minidev:accessors-smart:1.2 net.minidev:json-smart:2.3 net.sf.ehcache:ehcache:2.10.4 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.7 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java index 75da552c1a..532c547148 100644 --- a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java +++ b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaConfig.java @@ -17,6 +17,7 @@ import info.ganglia.gmetric4j.gmetric.GMetric; import io.micrometer.core.instrument.dropwizard.DropwizardConfig; +import io.micrometer.core.instrument.step.StepRegistryConfig; import io.micrometer.core.lang.Nullable; import java.util.concurrent.TimeUnit; @@ -26,7 +27,7 @@ * * @author Jon Schneider */ -public interface GangliaConfig extends DropwizardConfig { +public interface GangliaConfig extends StepRegistryConfig { /** * Accept configuration defaults */ diff --git a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java index 3847be1075..2b282fe975 100644 --- a/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java +++ b/implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java @@ -16,40 +16,58 @@ package io.micrometer.ganglia; import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.ganglia.GangliaReporter; import info.ganglia.gmetric4j.gmetric.GMetric; -import io.micrometer.core.instrument.Clock; -import io.micrometer.core.instrument.dropwizard.DropwizardMeterRegistry; +import info.ganglia.gmetric4j.gmetric.GMetricSlope; +import info.ganglia.gmetric4j.gmetric.GMetricType; +import info.ganglia.gmetric4j.gmetric.GangliaException; +import io.micrometer.core.instrument.*; +import io.micrometer.core.instrument.config.NamingConvention; +import io.micrometer.core.instrument.distribution.HistogramSnapshot; +import io.micrometer.core.instrument.step.StepMeterRegistry; +import io.micrometer.core.instrument.util.DoubleFormat; import io.micrometer.core.instrument.util.HierarchicalNameMapper; +import io.micrometer.core.lang.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.TimeUnit; -public class GangliaMeterRegistry extends DropwizardMeterRegistry { - private final GangliaReporter reporter; +import static io.micrometer.core.instrument.Meter.Type.consume; + +/** + * @author Jon Schneider + */ +public class GangliaMeterRegistry extends StepMeterRegistry { + private final Logger logger = LoggerFactory.getLogger(GangliaMeterRegistry.class); private final GangliaConfig config; + private final HierarchicalNameMapper nameMapper; + private final GMetric ganglia; + /** + * @param config The registry configuration. + * @param clock The clock to use for timings. + */ public GangliaMeterRegistry(GangliaConfig config, Clock clock) { this(config, clock, HierarchicalNameMapper.DEFAULT); } + /** + * @param config The registry configuration. + * @param clock The clock to use for timings. + * @param nameMapper The name mapper to use in converting dimensional metrics to hierarchical names. + */ public GangliaMeterRegistry(GangliaConfig config, Clock clock, HierarchicalNameMapper nameMapper) { - this(config, clock, nameMapper, new MetricRegistry()); - } + super(config, clock); - public GangliaMeterRegistry(GangliaConfig config, Clock clock, HierarchicalNameMapper nameMapper, MetricRegistry metricRegistry) { // Technically, Ganglia doesn't have any constraints on metric or tag names, but the encoding of Unicode can look // horrible in the UI. So be aware... - super(config, metricRegistry, nameMapper, clock); this.config = config; + this.nameMapper = nameMapper; + this.config().namingConvention(NamingConvention.camelCase); try { - final GMetric ganglia = new GMetric(config.host(), config.port(), config.addressingMode(), config.ttl()); - this.reporter = GangliaReporter.forRegistry(getDropwizardRegistry()) - .convertRatesTo(config.rateUnits()) - .convertDurationsTo(config.durationUnits()) - .build(ganglia); - + this.ganglia = new GMetric(config.host(), config.port(), config.addressingMode(), config.ttl()); if (config.enabled()) start(); } catch (IOException e) { @@ -57,26 +75,110 @@ public GangliaMeterRegistry(GangliaConfig config, Clock clock, HierarchicalNameM } } - public void stop() { - this.reporter.stop(); + /** + * @param config The registry configuration. + * @param clock The clock to use for timings. + * @param nameMapper The name mapper to use in converting dimensional metrics to hierarchical names. + * @param metricRegistry Ignored as of Micrometer 1.1.0. + * @deprecated The Ganglia registry no longer uses Dropwizard as of Micrometer 1.1.0, because Dropwizard + * dropped support for Ganglia in its 4.0.0 release. + */ + @SuppressWarnings("unused") + @Deprecated + public GangliaMeterRegistry(GangliaConfig config, Clock clock, HierarchicalNameMapper nameMapper, MetricRegistry metricRegistry) { + this(config, clock, nameMapper); } - public void start() { - this.reporter.start(config.step().getSeconds(), TimeUnit.SECONDS); + @Override + protected void publish() { + for (Meter meter : this.getMeters()) { + consume(meter, + this::announceGauge, + this::announceCounter, + this::announceTimer, + this::announceSummary, + this::announceLongTaskTimer, + this::announceTimeGauge, + this::announceFunctionCounter, + this::announceFunctionTimer, + this::announceMeter); + } + } - @Override - public void close() { - if (config.enabled()) { - reporter.report(); + private void announceMeter(Meter meter) { + for (Measurement measurement : meter.measure()) { + announce(meter, measurement.getValue(), measurement.getStatistic().toString().toLowerCase()); + } + } + + private void announceFunctionTimer(FunctionTimer functionTimer) { + announce(functionTimer, functionTimer.count(),"count"); + announce(functionTimer, functionTimer.totalTime(getBaseTimeUnit()), "sum"); + announce(functionTimer, functionTimer.mean(getBaseTimeUnit()), "avg"); + } + + private void announceFunctionCounter(FunctionCounter functionCounter) { + announce(functionCounter, functionCounter.count()); + } + + private void announceTimeGauge(TimeGauge timeGauge) { + announce(timeGauge, timeGauge.value(getBaseTimeUnit())); + } + + private void announceLongTaskTimer(LongTaskTimer longTaskTimer) { + announce(longTaskTimer, longTaskTimer.activeTasks(), "activeTasks"); + announce(longTaskTimer, longTaskTimer.duration(getBaseTimeUnit()), "duration"); + } + + private void announceSummary(DistributionSummary summary) { + HistogramSnapshot snapshot = summary.takeSnapshot(); + announce(summary, snapshot.count(), "count"); + announce(summary, snapshot.total(), "sum"); + announce(summary, snapshot.mean(), "avg"); + announce(summary, snapshot.max(), "max"); + } + + private void announceTimer(Timer timer) { + HistogramSnapshot snapshot = timer.takeSnapshot(); + announce(timer, snapshot.count(), "count"); + announce(timer, snapshot.total(getBaseTimeUnit()), "sum"); + announce(timer, snapshot.mean(getBaseTimeUnit()), "avg"); + announce(timer, snapshot.max(getBaseTimeUnit()), "max"); + } + + private void announceCounter(Counter counter) { + announce(counter, counter.count()); + } + + private void announceGauge(Gauge gauge) { + announce(gauge, gauge.value()); + } + + private void announce(Meter meter, double value) { + announce(meter, value, null); + } + + private void announce(Meter meter, double value, @Nullable String suffix) { + Meter.Id id = meter.getId(); + String baseUnit = id.getBaseUnit(); + try { + ganglia.announce(nameMapper.toHierarchicalName(id.withName(id.getName() + "." + suffix), + config().namingConvention()), + DoubleFormat.decimalOrNan(value), + GMetricType.DOUBLE, + baseUnit == null ? "" : baseUnit, + GMetricSlope.BOTH, + (int) config.step().getSeconds(), + 0, + "MICROMETER"); + } catch (GangliaException e) { + logger.warn("Unable to publish metric " + id.getName() + " to ganglia", e); } - stop(); - this.reporter.close(); - super.close(); } @Override - protected Double nullGaugeValue() { - return Double.NaN; + protected TimeUnit getBaseTimeUnit() { + return TimeUnit.MILLISECONDS; } } diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java index a09b3029d3..ce192c6825 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java @@ -140,7 +140,7 @@ public static T match(Meter meter, * @param visitMeter function to apply as a fallback * @since 1.1.0 */ - public static void match(Meter meter, + public static void consume(Meter meter, Consumer visitGauge, Consumer visitCounter, Consumer visitTimer, diff --git a/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile index 71b8776a7c..a4234f6cc8 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/compile.lockfile @@ -34,9 +34,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -72,7 +71,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile index 71b8776a7c..a4234f6cc8 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/compileClasspath.lockfile @@ -34,9 +34,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -72,7 +71,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile index 71b8776a7c..a4234f6cc8 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/default.lockfile @@ -34,9 +34,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -72,7 +71,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile index 71b8776a7c..a4234f6cc8 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/runtime.lockfile @@ -34,9 +34,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -72,7 +71,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile index 71b8776a7c..a4234f6cc8 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/runtimeClasspath.lockfile @@ -34,9 +34,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -72,7 +71,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile index acb2222f28..c849f0e1f7 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/testCompile.lockfile @@ -47,9 +47,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.github.resilience4j:resilience4j-core:0.13.1 @@ -96,7 +95,7 @@ net.minidev:accessors-smart:1.1 net.minidev:json-smart:2.2.1 net.sf.ehcache:ehcache:2.10.5 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile index acb2222f28..c849f0e1f7 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile @@ -47,9 +47,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.github.resilience4j:resilience4j-core:0.13.1 @@ -96,7 +95,7 @@ net.minidev:accessors-smart:1.1 net.minidev:json-smart:2.2.1 net.sf.ehcache:ehcache:2.10.5 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile index d780917a0a..2106a27a70 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/testRuntime.lockfile @@ -48,9 +48,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.github.resilience4j:resilience4j-core:0.13.1 @@ -101,7 +100,7 @@ net.minidev:accessors-smart:1.1 net.minidev:json-smart:2.2.1 net.sf.ehcache:ehcache:2.10.5 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 diff --git a/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile index d780917a0a..2106a27a70 100644 --- a/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -48,9 +48,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.github.resilience4j:resilience4j-core:0.13.1 @@ -101,7 +100,7 @@ net.minidev:accessors-smart:1.1 net.minidev:json-smart:2.2.1 net.sf.ehcache:ehcache:2.10.5 net.sf.jopt-simple:jopt-simple:5.0.3 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.antlr:antlr4-runtime:4.7.1 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/compile.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/compileClasspath.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/default.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtime.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/runtimeClasspath.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompile.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testCompileClasspath.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntime.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile index ffbb868fbb..ffb4b91c0a 100644 --- a/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/samples/micrometer-samples-boot1/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -35,9 +35,8 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:3.1.5 -io.dropwizard.metrics:metrics-ganglia:3.1.5 io.dropwizard.metrics:metrics-graphite:3.1.5 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -73,7 +72,7 @@ javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 joda-time:joda-time:2.9.9 net.sf.ehcache:ehcache:2.10.5 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 diff --git a/samples/micrometer-samples-boot1/src/main/resources/application-ganglia.yml b/samples/micrometer-samples-boot1/src/main/resources/application-ganglia.yml index d4a4fe7a73..b221a99968 100644 --- a/samples/micrometer-samples-boot1/src/main/resources/application-ganglia.yml +++ b/samples/micrometer-samples-boot1/src/main/resources/application-ganglia.yml @@ -14,4 +14,7 @@ # limitations under the License. # -management.metrics.export.ganglia.enabled: true +management.metrics.export.ganglia: + enabled: true + step: PT10S + addressing-mode: unicast diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compile.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/default.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtime.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompile.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntime.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 159d5be7fe..22757bd4ea 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -38,9 +38,8 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 concurrent:concurrent:1.3.4 dom4j:dom4j:1.6.1 -info.ganglia.gmetric4j:gmetric4j:1.0.7 +info.ganglia.gmetric4j:gmetric4j:1.0.10 io.dropwizard.metrics:metrics-core:4.0.3 -io.dropwizard.metrics:metrics-ganglia:3.2.6 io.dropwizard.metrics:metrics-graphite:4.0.3 io.dropwizard.metrics:metrics-jmx:4.0.3 io.grpc:grpc-context:1.14.0 @@ -75,7 +74,7 @@ javax.servlet:javax.servlet-api:3.1.0 joda-time:joda-time:2.8.1 net.bytebuddy:byte-buddy:1.6.14 net.sf.ehcache:ehcache:2.10.4 -org.acplt:oncrpc:1.0.7 +org.acplt.remotetea:remotetea-oncrpc:1.1.2 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.5 org.apache.httpcomponents:httpclient:4.5.5 diff --git a/scripts/ganglia.sh b/scripts/ganglia.sh index b5cec1f5f6..a57056a983 100755 --- a/scripts/ganglia.sh +++ b/scripts/ganglia.sh @@ -5,6 +5,8 @@ if [ ! -f .ganglia ]; then mkdir -p .ganglia/data fi +rm -r $(pwd)/.ganglia + docker run \ -v $(pwd)/.ganglia/etc:/etc/ganglia \ -v $(pwd)/.ganglia/data:/var/lib/ganglia \