Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Excavator: Upgrades Baseline to the latest version #556

Merged
merged 3 commits into from
Dec 19, 2019
Merged

Excavator: Upgrades Baseline to the latest version #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
330b190
Excavator: Upgrades Baseline to the latest version
svc-excavator-bot Dec 18, 2019
459b32c
Revert automated refactor that would infinite loop
schlosna Dec 19, 2019
19b254b
Suppress UnsafeGaugeRegistration
schlosna Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ...um-registry/src/main/java/com/palantir/tritium/metrics/registry/TaggedMetricRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ default <T> Optional<Gauge<T>> gauge(MetricName metricName) {
* @param gauge gauge
*/
// This differs from MetricRegistry and takes the Gauge directly rather than a Supplier<Gauge>
@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) {
Expand Down