From d28a06629bd76e56943ca5b2f769e7d4fa2ef781 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Sat, 9 Nov 2019 19:17:27 +0000
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version (#493)
---
.baseline/checkstyle/checkstyle.xml | 3 +++
build.gradle | 2 +-
.../com/palantir/tritium/event/InstrumentationProperties.java | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index d698c182e..d1d0ffaf0 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -53,6 +53,9 @@
+
+
+
diff --git a/build.gradle b/build.gradle
index e0525b2ee..d5700976c 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.28.1'
+ classpath 'com.palantir.baseline:gradle-baseline-java:2.29.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationProperties.java b/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationProperties.java
index 500f0279c..1776f029c 100644
--- a/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationProperties.java
+++ b/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationProperties.java
@@ -22,6 +22,7 @@
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMap;
import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
import com.palantir.tritium.api.functions.BooleanSupplier;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -112,7 +113,7 @@ private static Map createInstrumentationSystemProperties() {
.collect(ImmutableMap.toImmutableMap(
entry -> String.valueOf(entry.getKey()),
entry -> String.valueOf(entry.getValue())));
- log.debug("Reloaded instrumentation properties {}", map);
+ log.debug("Reloaded instrumentation properties {}", UnsafeArg.of("instrumentationProperties", map));
return map;
}
}