open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if not populated returns null for toString

This commit is contained in:
jean-philippe bempel 2020-04-02 19:17:26 +02:00
parent 4d15d5ae96
commit 58ea15e590
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-trace-api/src/main/java/datadog/trace/api/Config.java
View File

@ -204,11 +204,15 @@ public class Config {
/** Used for masking sensitive information when doing toString */ /** Used for masking sensitive information when doing toString */
@ToString.Include(name = "profilingApiKey") @ToString.Include(name = "profilingApiKey")
private String profilingApiKeyMasker() { return "****"; } private String profilingApiKeyMasker() {
return profilingApiKey != null ? "****" : null;
}
/** Used for masking sensitive information when doing toString */ /** Used for masking sensitive information when doing toString */
@ToString.Include(name = "profilingProxyPassword") @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 * this is a random UUID that gets generated on JVM start up and is attached to every root span

5
dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View File

@ -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_ENV = "DD_PROFILING_API_KEY"
private static final DD_PROFILING_API_KEY_OLD_ENV = "DD_PROFILING_APIKEY" 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_TAGS_ENV = "DD_PROFILING_TAGS"
private static final DD_PROFILING_PROXY_PASSWORD_ENV = "DD_PROFILING_PROXY_PASSWORD"
def "verify defaults"() { def "verify defaults"() {
when: when:
@ -409,7 +410,7 @@ class ConfigTest extends DDSpecification {
def "sensitive information removed for toString/debug log"() { def "sensitive information removed for toString/debug log"() {
setup: setup:
environmentVariables.set(DD_PROFILING_API_KEY_ENV, "test-secret-api-key") 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: when:
def config = new Config() def config = new Config()
@ -419,6 +420,8 @@ class ConfigTest extends DDSpecification {
!config.toString().contains("test-secret-api-key") !config.toString().contains("test-secret-api-key")
config.toString().contains("profilingProxyPassword=****"); config.toString().contains("profilingProxyPassword=****");
!config.toString().contains("test-secret-proxy-password") !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"() { def "sys props override env vars"() {