From 58ea15e590baca4aa5894cd3033b0c4894dcf759 Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Thu, 2 Apr 2020 19:17:26 +0200
Subject: [PATCH] if not populated returns null for toString

---
 dd-trace-api/src/main/java/datadog/trace/api/Config.java  | 8 ++++++--
 .../src/test/groovy/datadog/trace/api/ConfigTest.groovy   | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Config.java b/dd-trace-api/src/main/java/datadog/trace/api/Config.java
index 38fdc20eff..430b01adf0 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/Config.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/Config.java
@@ -204,11 +204,15 @@ public class Config {
 
   /** Used for masking sensitive information when doing toString */
   @ToString.Include(name = "profilingApiKey")
-  private String profilingApiKeyMasker() { return "****"; }
+  private String profilingApiKeyMasker() {
+    return profilingApiKey != null ? "****" : null;
+  }
 
   /** Used for masking sensitive information when doing toString */
   @ToString.Include(name = "profilingProxyPassword")
-  private String profilingProxyPasswordMasker() { return "****"; }
+  private String profilingProxyPasswordMasker() {
+    return profilingProxyPassword != null ? "****" : null;
+  }
 
   /**
    * this is a random UUID that gets generated on JVM start up and is attached to every root span
diff --git a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
index 5959849288..4eb3ef7ad3 100644
--- a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
+++ b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
@@ -93,6 +93,7 @@ class ConfigTest extends DDSpecification {
   private static final DD_PROFILING_API_KEY_ENV = "DD_PROFILING_API_KEY"
   private static final DD_PROFILING_API_KEY_OLD_ENV = "DD_PROFILING_APIKEY"
   private static final DD_PROFILING_TAGS_ENV = "DD_PROFILING_TAGS"
+  private static final DD_PROFILING_PROXY_PASSWORD_ENV = "DD_PROFILING_PROXY_PASSWORD"
 
   def "verify defaults"() {
     when:
@@ -409,7 +410,7 @@ class ConfigTest extends DDSpecification {
   def "sensitive information removed for toString/debug log"() {
     setup:
     environmentVariables.set(DD_PROFILING_API_KEY_ENV, "test-secret-api-key")
-    environmentVariables.set(PROFILING_PROXY_PASSWORD, "test-secret-proxy-password")
+    environmentVariables.set(DD_PROFILING_PROXY_PASSWORD_ENV, "test-secret-proxy-password")
 
     when:
     def config = new Config()
@@ -419,6 +420,8 @@ class ConfigTest extends DDSpecification {
     !config.toString().contains("test-secret-api-key")
     config.toString().contains("profilingProxyPassword=****");
     !config.toString().contains("test-secret-proxy-password")
+    config.getProfilingApiKey() == "test-secret-api-key"
+    config.getProfilingProxyPassword() == "test-secret-proxy-password"
   }
 
   def "sys props override env vars"() {