Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AppSecActivationSmokeTest extends AbstractSmokeTest {
waitForTelemetryFlat {
final configurations = (List<Map<String, Object>>) it?.payload?.configuration ?: []
final enabledConfig = configurations.find {
it.name == 'appsec_enabled'
it.name == 'DD_APPSEC_ENABLED'
}
if (!enabledConfig) {
return false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ class TelemetryRequestBodySpecification extends DDSpecification {

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

def 'use snake_case for setting keys'() {
def 'use environment variable for setting keys'() {
setup:
TelemetryRequestBody req = new TelemetryRequestBody(RequestType.APP_CLIENT_CONFIGURATION_CHANGE)

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

then:
drainToString(req) == ',"configuration":[{"name":"this_is_a_key","value":"value","origin":"remote_config","seq_id":0}]'
drainToString(req) == ',"configuration":[{"name":"DD_THIS_IS_A_KEY","value":"value","origin":"remote_config","seq_id":0}]'
}

def 'add debug flag'() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class TelemetryServiceSpecification extends DDSpecification {
bodySize > 0

when: 'sending first part of data'
telemetryService = new TelemetryService(testHttpClient, bodySize + 510, false)
telemetryService = new TelemetryService(testHttpClient, bodySize + 512, false)

telemetryService.addConfiguration(configuration)
telemetryService.addIntegration(integration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class TestTelemetryRouter extends TelemetryRouter {
PayloadAssertions instrumentationConfigId(String id) {
boolean checked = false
this.payload['configuration'].each { v ->
if (v['name'] == 'instrumentation_config_id') {
if (v['name'] == 'DD_INSTRUMENTATION_CONFIG_ID') {
assert v['value'] == id
checked = true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package datadog.trace.api;

import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName;

import java.util.Arrays;
import java.util.BitSet;
import java.util.HashSet;
Expand Down Expand Up @@ -51,7 +53,7 @@ private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId,
}

public String normalizedKey() {
return key.toLowerCase().replace(".", "_");
return propertyNameToEnvironmentVariableName(key);
}

public String stringValue() {
Expand Down
Loading