Skip to content

Commit 846bd84

Browse files
committed
init
1 parent 969d21d commit 846bd84

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

telemetry/src/test/groovy/datadog/telemetry/TelemetryRequestBodySpecification.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ class TelemetryRequestBodySpecification extends DDSpecification {
7979

8080
then:
8181
drainToString(req) == ',"configuration":[' +
82-
'{"name":"string","value":"bar","origin":"remote_config","seq_id":0},' +
83-
'{"name":"int","value":"2342","origin":"default","seq_id":0},' +
84-
'{"name":"double","value":"123.456","origin":"env_var","seq_id":0},' +
85-
'{"name":"map","value":"key1:value1,key2:432.32,key3:324","origin":"jvm_prop","seq_id":0},' +
86-
'{"name":"list","value":"1,2,3","origin":"default","seq_id":0},' +
87-
'{"name":"null","value":null,"origin":"default","seq_id":0}]'
82+
'{"name":"DD_STRING","value":"bar","origin":"remote_config","seq_id":0},' +
83+
'{"name":"DD_INT","value":"2342","origin":"default","seq_id":0},' +
84+
'{"name":"DD_DOUBLE","value":"123.456","origin":"env_var","seq_id":0},' +
85+
'{"name":"DD_MAP","value":"key1:value1,key2:432.32,key3:324","origin":"jvm_prop","seq_id":0},' +
86+
'{"name":"DD_LIST","value":"1,2,3","origin":"default","seq_id":0},' +
87+
'{"name":"DD_NULL","value":null,"origin":"default","seq_id":0}]'
8888
}
8989

90-
def 'use snake_case for setting keys'() {
90+
def 'use environment variable for setting keys'() {
9191
setup:
9292
TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)
9393

@@ -102,7 +102,7 @@ class TelemetryRequestBodySpecification extends DDSpecification {
102102
req.endConfiguration()
103103

104104
then:
105-
drainToString(req) == ',"configuration":[{"name":"this_is_a_key","value":"value","origin":"remote_config","seq_id":0}]'
105+
drainToString(req) == ',"configuration":[{"name":"DD_THIS_IS_A_KEY","value":"value","origin":"remote_config","seq_id":0}]'
106106
}
107107

108108
def 'add debug flag'() {

utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package datadog.trace.api;
22

3+
import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName;
4+
35
import java.util.Arrays;
46
import java.util.BitSet;
57
import java.util.HashSet;
@@ -51,7 +53,7 @@ private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId,
5153
}
5254

5355
public String normalizedKey() {
54-
return key.toLowerCase().replace(".", "_");
56+
return propertyNameToEnvironmentVariableName(key);
5557
}
5658

5759
public String stringValue() {

0 commit comments

Comments
 (0)