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

Replace '-' with '_' in configuration parameter names

This commit is contained in:
Nikolay Martynov 2018-10-26 09:54:04 -04:00
parent 601993fcb4
commit 950ab63f64
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,7 @@ public class Config {
} }
private static String propertyToEnvironmentName(final String name) { private static String propertyToEnvironmentName(final String name) {
return name.toUpperCase().replace(".", "_"); return name.toUpperCase().replace(".", "_").replace("-", "_");
} }
private static Map<String, String> getPropertyMapValue( private static Map<String, String> getPropertyMapValue(

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

@ -18,6 +18,7 @@ class ConfigTest extends Specification {
private static final DD_SERVICE_MAPPING_ENV = "DD_SERVICE_MAPPING" private static final DD_SERVICE_MAPPING_ENV = "DD_SERVICE_MAPPING"
private static final DD_SPAN_TAGS_ENV = "DD_SPAN_TAGS" private static final DD_SPAN_TAGS_ENV = "DD_SPAN_TAGS"
private static final DD_HEADER_TAGS_ENV = "DD_HEADER_TAGS" private static final DD_HEADER_TAGS_ENV = "DD_HEADER_TAGS"
private static final DD_JMXFETCH_METRICS_CONFIGS_ENV = "DD_JMXFETCH_METRICS_CONFIGS"
def "verify defaults"() { def "verify defaults"() {
when: when:
@ -89,6 +90,7 @@ class ConfigTest extends Specification {
setup: setup:
environmentVariables.set(DD_SERVICE_NAME_ENV, "still something else") environmentVariables.set(DD_SERVICE_NAME_ENV, "still something else")
environmentVariables.set(DD_WRITER_TYPE_ENV, "LoggingWriter") environmentVariables.set(DD_WRITER_TYPE_ENV, "LoggingWriter")
environmentVariables.set(DD_JMXFETCH_METRICS_CONFIGS_ENV, "some/file")
when: when:
def config = new Config() def config = new Config()
@ -96,6 +98,7 @@ class ConfigTest extends Specification {
then: then:
config.serviceName == "still something else" config.serviceName == "still something else"
config.writerType == "LoggingWriter" config.writerType == "LoggingWriter"
config.jmxFetchMetricsConfigs == ["some/file"]
} }
def "sys props override env vars"() { def "sys props override env vars"() {