Skip to content

Commit 967246f

Browse files
authored
chore(ci): update config registry with backfilled option (#304)
The backfilled option showed some issue with the current state of the supported-configurations.json. This is fixed by this PR by setting the backfilled option to true as well as updating the generation script to: - lower case types - use true and false as boolean - use exact decimal values as defined in the macro The script now also preserves the former implementation used, if re-run. In addition, change DD_TRACE_RATE_LIMIT and DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL decimal types to integers. The DD_INSTRUMENTATION_INSTALL_ID, DD_INSTRUMENTATION_INSTALL_TYPE, DD_INSTRUMENTATION_INSTALL_TIME, and DD_EXTERNAL_ENV default values were changed from an empty string to nullptr, since that seemed more suitable for these configurations.
1 parent b577e17 commit 967246f

File tree

5 files changed

+147
-103
lines changed

5 files changed

+147
-103
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ validate_supported_configurations_v2_local_file:
2121
extends: .validate_supported_configurations_v2_local_file
2222
variables:
2323
LOCAL_JSON_PATH: "supported-configurations.json"
24-
BACKFILLED: false
24+
BACKFILLED: true
2525

2626
update_central_configurations_version_range_v2:
2727
stage: config-validation

.gitlab/config-registry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variables:
1919
- when: on_success
2020
variables:
2121
LOCAL_JSON_PATH: ""
22-
BACKFILLED: ""
22+
BACKFILLED: "true"
2323
before_script:
2424
- *download-scripts-from-template
2525
script:

include/datadog/environment.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ namespace environment {
3535
// The runtime default is resolved in C++ configuration finalization
3636
// logic. The description is emitted as the "default" field in
3737
// metadata/supported-configurations.json.
38+
// - nullptr
39+
// There is no default value. This is emitted as JSON null in
40+
// metadata/supported-configurations.json.
3841
#define DD_LIST_ENVIRONMENT_VARIABLES(MACRO) \
3942
MACRO(DD_AGENT_HOST, STRING, "localhost") \
4043
MACRO(DD_ENV, STRING, "") \
@@ -60,29 +63,29 @@ namespace environment {
6063
"then defaults to http://localhost:8126.")) \
6164
MACRO(DD_TRACE_DEBUG, BOOLEAN, false) \
6265
MACRO(DD_TRACE_ENABLED, BOOLEAN, true) \
63-
MACRO(DD_TRACE_RATE_LIMIT, DECIMAL, 100.0) \
66+
MACRO(DD_TRACE_RATE_LIMIT, INT, 100) \
6467
MACRO(DD_TRACE_REPORT_HOSTNAME, BOOLEAN, false) \
65-
MACRO(DD_TRACE_SAMPLE_RATE, DECIMAL, 1.0) \
68+
MACRO(DD_TRACE_SAMPLE_RATE, DECIMAL, 1) \
6669
MACRO(DD_TRACE_SAMPLING_RULES, ARRAY, "[]") \
6770
MACRO(DD_TRACE_STARTUP_LOGS, BOOLEAN, true) \
6871
MACRO(DD_TRACE_TAGS_PROPAGATION_MAX_LENGTH, INT, 512) \
6972
MACRO(DD_VERSION, STRING, "") \
7073
MACRO(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED, BOOLEAN, true) \
7174
MACRO(DD_TELEMETRY_HEARTBEAT_INTERVAL, DECIMAL, 10) \
72-
MACRO(DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, DECIMAL, 86400.0) \
75+
MACRO(DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, INT, 86400) \
7376
MACRO(DD_TELEMETRY_METRICS_ENABLED, BOOLEAN, true) \
7477
MACRO(DD_TELEMETRY_METRICS_INTERVAL_SECONDS, DECIMAL, 60) \
7578
MACRO(DD_TELEMETRY_DEBUG, BOOLEAN, false) \
7679
MACRO(DD_TRACE_BAGGAGE_MAX_ITEMS, INT, 64) \
7780
MACRO(DD_TRACE_BAGGAGE_MAX_BYTES, INT, 8192) \
7881
MACRO(DD_TELEMETRY_LOG_COLLECTION_ENABLED, BOOLEAN, true) \
79-
MACRO(DD_INSTRUMENTATION_INSTALL_ID, STRING, "") \
80-
MACRO(DD_INSTRUMENTATION_INSTALL_TYPE, STRING, "") \
81-
MACRO(DD_INSTRUMENTATION_INSTALL_TIME, STRING, "") \
82+
MACRO(DD_INSTRUMENTATION_INSTALL_ID, STRING, nullptr) \
83+
MACRO(DD_INSTRUMENTATION_INSTALL_TYPE, STRING, nullptr) \
84+
MACRO(DD_INSTRUMENTATION_INSTALL_TIME, STRING, nullptr) \
8285
MACRO(DD_APM_TRACING_ENABLED, BOOLEAN, true) \
8386
MACRO(DD_TRACE_RESOURCE_RENAMING_ENABLED, BOOLEAN, false) \
8487
MACRO(DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT, BOOLEAN, false) \
85-
MACRO(DD_EXTERNAL_ENV, STRING, "")
88+
MACRO(DD_EXTERNAL_ENV, STRING, nullptr)
8689

8790
#define ENV_DEFAULT_RESOLVED_IN_CODE(X) X
8891
#define WITH_COMMA(ARG, TYPE, DEFAULT_VALUE) ARG,

0 commit comments

Comments
 (0)