Skip to content

Commit b890dea

Browse files
BridgeARBridgeAR
committed
chore(ci): update config registry script and add backfilled option
The backfilled option showed some issue with the current state of the supported-configurations.json. This is fixed by this PR by adding setting backfilled 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 In addition, change DD_TRACE_RATE_LIMIT and DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL decimal types to integers.
1 parent b577e17 commit b890dea

5 files changed

Lines changed: 104 additions & 78 deletions

File tree

‎.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ namespace environment {
6060
"then defaults to http://localhost:8126.")) \
6161
MACRO(DD_TRACE_DEBUG, BOOLEAN, false) \
6262
MACRO(DD_TRACE_ENABLED, BOOLEAN, true) \
63-
MACRO(DD_TRACE_RATE_LIMIT, DECIMAL, 100.0) \
63+
MACRO(DD_TRACE_RATE_LIMIT, INT, 100) \
6464
MACRO(DD_TRACE_REPORT_HOSTNAME, BOOLEAN, false) \
65-
MACRO(DD_TRACE_SAMPLE_RATE, DECIMAL, 1.0) \
65+
MACRO(DD_TRACE_SAMPLE_RATE, DECIMAL, 1) \
6666
MACRO(DD_TRACE_SAMPLING_RULES, ARRAY, "[]") \
6767
MACRO(DD_TRACE_STARTUP_LOGS, BOOLEAN, true) \
6868
MACRO(DD_TRACE_TAGS_PROPAGATION_MAX_LENGTH, INT, 512) \
6969
MACRO(DD_VERSION, STRING, "") \
7070
MACRO(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED, BOOLEAN, true) \
7171
MACRO(DD_TELEMETRY_HEARTBEAT_INTERVAL, DECIMAL, 10) \
72-
MACRO(DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, DECIMAL, 86400.0) \
72+
MACRO(DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL, INT, 86400) \
7373
MACRO(DD_TELEMETRY_METRICS_ENABLED, BOOLEAN, true) \
7474
MACRO(DD_TELEMETRY_METRICS_INTERVAL_SECONDS, DECIMAL, 60) \
7575
MACRO(DD_TELEMETRY_DEBUG, BOOLEAN, false) \

‎supported-configurations.json‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,287 +4,287 @@
44
{
55
"default": "localhost",
66
"implementation": "A",
7-
"type": "STRING"
7+
"type": "string"
88
}
99
],
1010
"DD_APM_TRACING_ENABLED": [
1111
{
12-
"default": "1",
12+
"default": "true",
1313
"implementation": "A",
14-
"type": "BOOLEAN"
14+
"type": "boolean"
1515
}
1616
],
1717
"DD_ENV": [
1818
{
1919
"default": "",
2020
"implementation": "A",
21-
"type": "STRING"
21+
"type": "string"
2222
}
2323
],
2424
"DD_EXTERNAL_ENV": [
2525
{
2626
"default": "",
2727
"implementation": "A",
28-
"type": "STRING"
28+
"type": "string"
2929
}
3030
],
3131
"DD_INSTRUMENTATION_INSTALL_ID": [
3232
{
3333
"default": "",
3434
"implementation": "A",
35-
"type": "STRING"
35+
"type": "string"
3636
}
3737
],
3838
"DD_INSTRUMENTATION_INSTALL_TIME": [
3939
{
4040
"default": "",
4141
"implementation": "A",
42-
"type": "STRING"
42+
"type": "string"
4343
}
4444
],
4545
"DD_INSTRUMENTATION_INSTALL_TYPE": [
4646
{
4747
"default": "",
4848
"implementation": "A",
49-
"type": "STRING"
49+
"type": "string"
5050
}
5151
],
5252
"DD_INSTRUMENTATION_TELEMETRY_ENABLED": [
5353
{
54-
"default": "1",
54+
"default": "true",
5555
"implementation": "A",
56-
"type": "BOOLEAN"
56+
"type": "boolean"
5757
}
5858
],
5959
"DD_PROPAGATION_STYLE_EXTRACT": [
6060
{
6161
"default": "datadog,tracecontext,baggage",
62-
"implementation": "A",
63-
"type": "ARRAY"
62+
"implementation": "C",
63+
"type": "array"
6464
}
6565
],
6666
"DD_PROPAGATION_STYLE_INJECT": [
6767
{
6868
"default": "datadog,tracecontext,baggage",
6969
"implementation": "A",
70-
"type": "ARRAY"
70+
"type": "array"
7171
}
7272
],
7373
"DD_REMOTE_CONFIGURATION_ENABLED": [
7474
{
75-
"default": "1",
75+
"default": "true",
7676
"implementation": "A",
77-
"type": "BOOLEAN"
77+
"type": "boolean"
7878
}
7979
],
8080
"DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS": [
8181
{
82-
"default": "5",
82+
"default": "5.0",
8383
"implementation": "A",
84-
"type": "DECIMAL"
84+
"type": "decimal"
8585
}
8686
],
8787
"DD_SERVICE": [
8888
{
8989
"default": "",
90-
"implementation": "A",
91-
"type": "STRING"
90+
"implementation": "F",
91+
"type": "string"
9292
}
9393
],
9494
"DD_SPAN_SAMPLING_RULES": [
9595
{
9696
"default": "[]",
9797
"implementation": "A",
98-
"type": "ARRAY"
98+
"type": "array"
9999
}
100100
],
101101
"DD_SPAN_SAMPLING_RULES_FILE": [
102102
{
103103
"default": "",
104-
"implementation": "A",
105-
"type": "STRING"
104+
"implementation": "B",
105+
"type": "string"
106106
}
107107
],
108108
"DD_TAGS": [
109109
{
110110
"default": "",
111111
"implementation": "A",
112-
"type": "MAP"
112+
"type": "map"
113113
}
114114
],
115115
"DD_TELEMETRY_DEBUG": [
116116
{
117-
"default": "0",
117+
"default": "false",
118118
"implementation": "A",
119-
"type": "BOOLEAN"
119+
"type": "boolean"
120120
}
121121
],
122122
"DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": [
123123
{
124124
"default": "86400",
125125
"implementation": "A",
126-
"type": "DECIMAL"
126+
"type": "int"
127127
}
128128
],
129129
"DD_TELEMETRY_HEARTBEAT_INTERVAL": [
130130
{
131131
"default": "10",
132-
"implementation": "A",
133-
"type": "DECIMAL"
132+
"implementation": "D",
133+
"type": "decimal"
134134
}
135135
],
136136
"DD_TELEMETRY_LOG_COLLECTION_ENABLED": [
137137
{
138-
"default": "1",
138+
"default": "true",
139139
"implementation": "A",
140-
"type": "BOOLEAN"
140+
"type": "boolean"
141141
}
142142
],
143143
"DD_TELEMETRY_METRICS_ENABLED": [
144144
{
145-
"default": "1",
145+
"default": "true",
146146
"implementation": "A",
147-
"type": "BOOLEAN"
147+
"type": "boolean"
148148
}
149149
],
150150
"DD_TELEMETRY_METRICS_INTERVAL_SECONDS": [
151151
{
152152
"default": "60",
153153
"implementation": "A",
154-
"type": "DECIMAL"
154+
"type": "decimal"
155155
}
156156
],
157157
"DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": [
158158
{
159-
"default": "1",
159+
"default": "true",
160160
"implementation": "A",
161-
"type": "BOOLEAN"
161+
"type": "boolean"
162162
}
163163
],
164164
"DD_TRACE_AGENT_PORT": [
165165
{
166166
"default": "8126",
167167
"implementation": "A",
168-
"type": "INT"
168+
"type": "int"
169169
}
170170
],
171171
"DD_TRACE_AGENT_URL": [
172172
{
173173
"default": "",
174174
"implementation": "A",
175-
"type": "STRING"
175+
"type": "string"
176176
}
177177
],
178178
"DD_TRACE_BAGGAGE_MAX_BYTES": [
179179
{
180180
"default": "8192",
181181
"implementation": "A",
182-
"type": "INT"
182+
"type": "int"
183183
}
184184
],
185185
"DD_TRACE_BAGGAGE_MAX_ITEMS": [
186186
{
187187
"default": "64",
188188
"implementation": "A",
189-
"type": "INT"
189+
"type": "int"
190190
}
191191
],
192192
"DD_TRACE_DEBUG": [
193193
{
194-
"default": "0",
195-
"implementation": "A",
196-
"type": "BOOLEAN"
194+
"default": "false",
195+
"implementation": "B",
196+
"type": "boolean"
197197
}
198198
],
199199
"DD_TRACE_ENABLED": [
200200
{
201-
"default": "1",
201+
"default": "true",
202202
"implementation": "A",
203-
"type": "BOOLEAN"
203+
"type": "boolean"
204204
}
205205
],
206206
"DD_TRACE_PROPAGATION_STYLE": [
207207
{
208208
"default": "datadog,tracecontext,baggage",
209-
"implementation": "A",
210-
"type": "ARRAY"
209+
"implementation": "D",
210+
"type": "array"
211211
}
212212
],
213213
"DD_TRACE_PROPAGATION_STYLE_EXTRACT": [
214214
{
215215
"default": "datadog,tracecontext,baggage",
216-
"implementation": "A",
217-
"type": "ARRAY"
216+
"implementation": "D",
217+
"type": "array"
218218
}
219219
],
220220
"DD_TRACE_PROPAGATION_STYLE_INJECT": [
221221
{
222222
"default": "datadog,tracecontext,baggage",
223-
"implementation": "A",
224-
"type": "ARRAY"
223+
"implementation": "D",
224+
"type": "array"
225225
}
226226
],
227227
"DD_TRACE_RATE_LIMIT": [
228228
{
229229
"default": "100",
230230
"implementation": "A",
231-
"type": "DECIMAL"
231+
"type": "int"
232232
}
233233
],
234234
"DD_TRACE_REPORT_HOSTNAME": [
235235
{
236-
"default": "0",
236+
"default": "false",
237237
"implementation": "A",
238-
"type": "BOOLEAN"
238+
"type": "boolean"
239239
}
240240
],
241241
"DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT": [
242242
{
243-
"default": "0",
243+
"default": "false",
244244
"implementation": "A",
245-
"type": "BOOLEAN"
245+
"type": "boolean"
246246
}
247247
],
248248
"DD_TRACE_RESOURCE_RENAMING_ENABLED": [
249249
{
250-
"default": "0",
250+
"default": "false",
251251
"implementation": "A",
252-
"type": "BOOLEAN"
252+
"type": "boolean"
253253
}
254254
],
255255
"DD_TRACE_SAMPLE_RATE": [
256256
{
257257
"default": "1",
258-
"implementation": "A",
259-
"type": "DECIMAL"
258+
"implementation": "C",
259+
"type": "decimal"
260260
}
261261
],
262262
"DD_TRACE_SAMPLING_RULES": [
263263
{
264264
"default": "[]",
265-
"implementation": "A",
266-
"type": "ARRAY"
265+
"implementation": "D",
266+
"type": "array"
267267
}
268268
],
269269
"DD_TRACE_STARTUP_LOGS": [
270270
{
271-
"default": "1",
272-
"implementation": "A",
273-
"type": "BOOLEAN"
271+
"default": "true",
272+
"implementation": "C",
273+
"type": "boolean"
274274
}
275275
],
276276
"DD_TRACE_TAGS_PROPAGATION_MAX_LENGTH": [
277277
{
278278
"default": "512",
279279
"implementation": "A",
280-
"type": "INT"
280+
"type": "int"
281281
}
282282
],
283283
"DD_VERSION": [
284284
{
285285
"default": "",
286286
"implementation": "A",
287-
"type": "STRING"
287+
"type": "string"
288288
}
289289
]
290290
},

0 commit comments

Comments
 (0)