From 330b190882af928df5a4c654e86501a66212f099 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Wed, 18 Dec 2019 23:23:09 +0000 Subject: [PATCH 1/3] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../palantir/tritium/metrics/registry/TaggedMetricRegistry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a8f1a8cf0..4af5ed505 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0' classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1' - classpath 'com.palantir.baseline:gradle-baseline-java:2.43.0' + classpath 'com.palantir.baseline:gradle-baseline-java:2.45.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.13.1' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2' classpath 'com.palantir.metricschema:gradle-metric-schema:0.5.2' diff --git a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java index 6922040ac..b361a51d9 100644 --- a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java +++ b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java @@ -111,7 +111,7 @@ default void registerWithReplacement(MetricName metricName, Gauge gauge) { } remove(metricName).ifPresent(removed -> LoggerFactory.getLogger(getClass()) .debug("Removed previously registered gauge {}", SafeArg.of("metricName", metricName))); - gauge(metricName, gauge); + registerWithReplacement(metricName, gauge); } /** From 459b32cbb64f71b7ee718f5495f201edf4ed93e8 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Thu, 19 Dec 2019 09:43:29 -0500 Subject: [PATCH 2/3] Revert automated refactor that would infinite loop --- .../palantir/tritium/metrics/registry/TaggedMetricRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java index b361a51d9..6922040ac 100644 --- a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java +++ b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java @@ -111,7 +111,7 @@ default void registerWithReplacement(MetricName metricName, Gauge gauge) { } remove(metricName).ifPresent(removed -> LoggerFactory.getLogger(getClass()) .debug("Removed previously registered gauge {}", SafeArg.of("metricName", metricName))); - registerWithReplacement(metricName, gauge); + gauge(metricName, gauge); } /** From 19b254b5a4a51fb99738de74908961ba36b0c667 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Thu, 19 Dec 2019 09:45:41 -0500 Subject: [PATCH 3/3] Suppress UnsafeGaugeRegistration --- .../palantir/tritium/metrics/registry/TaggedMetricRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java index 6922040ac..8e7810d69 100644 --- a/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java +++ b/tritium-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java @@ -103,7 +103,7 @@ default Optional> gauge(MetricName metricName) { * @param gauge gauge */ // This differs from MetricRegistry and takes the Gauge directly rather than a Supplier - @SuppressWarnings("deprecation") // explicitly using as desired + @SuppressWarnings({"deprecation", "UnsafeGaugeRegistration"}) // explicitly using as desired default void registerWithReplacement(MetricName metricName, Gauge gauge) { Gauge existing = gauge(metricName, gauge); if (existing == gauge) {