Skip to content

Commit 0f3b1b2

Browse files
committed
fix(config): move OPW/Vector logs+traces keys to ignored_keys (#1690)
## Summary OPW logs and traces routing is entirely out of scope for ADP, so the `observability_pipelines_worker.{logs,traces}.{enabled,url}` and `vector.{logs,traces}.{enabled,url}` keys have no effect on ADP behavior. Moving them from `unsupported.rs` (which surfaces `Incompatible` warnings to operators) to `ignored_keys.yaml` (silently ignored) avoids misleading noise for users who have these keys set. These annotations were added in #1655 but I think this was a mistake. ## Test plan - [ ] `cargo check --workspace` passes - [ ] Verify config registry emits no warning for `observability_pipelines_worker.logs.enabled` when set Co-authored-by: jesse.szwedko <jesse.szwedko@datadoghq.com>
1 parent 17e6738 commit 0f3b1b2

2 files changed

Lines changed: 16 additions & 95 deletions

File tree

lib/saluki-components/etc/ignored_keys.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,6 +2484,14 @@
24842484
reason: initial bulk
24852485
- name: notable_events.enabled
24862486
reason: initial bulk
2487+
- name: observability_pipelines_worker.logs.enabled
2488+
reason: OPW logs routing out of scope for ADP
2489+
- name: observability_pipelines_worker.logs.url
2490+
reason: OPW logs routing out of scope for ADP
2491+
- name: observability_pipelines_worker.traces.enabled
2492+
reason: OPW traces routing out of scope for ADP
2493+
- name: observability_pipelines_worker.traces.url
2494+
reason: OPW traces routing out of scope for ADP
24872495
- name: ol_proxy_config.additional_endpoints
24882496
reason: initial bulk
24892497
- name: ol_proxy_config.api_key
@@ -3348,6 +3356,14 @@
33483356
reason: initial bulk
33493357
- name: use_networkv2_check
33503358
reason: initial bulk
3359+
- name: vector.logs.enabled
3360+
reason: OPW logs routing out of scope for ADP
3361+
- name: vector.logs.url
3362+
reason: OPW logs routing out of scope for ADP
3363+
- name: vector.traces.enabled
3364+
reason: OPW traces routing out of scope for ADP
3365+
- name: vector.traces.url
3366+
reason: OPW traces routing out of scope for ADP
33513367
- name: vsock_addr
33523368
reason: initial bulk
33533369
- name: win_skip_com_init

lib/saluki-components/src/config_registry/datadog/unsupported.rs

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -230,54 +230,6 @@ crate::declare_annotations! {
230230
test_json: None,
231231
};
232232

233-
/// `observability_pipelines_worker.logs.enabled` - route logs to OPW.
234-
OBSERVABILITY_PIPELINES_WORKER_LOGS_ENABLED = SalukiAnnotation {
235-
schema: &schema::OBSERVABILITY_PIPELINES_WORKER_LOGS_ENABLED,
236-
// Logs OPW routing is out of scope for ADP. #1586
237-
support_level: SupportLevel::Incompatible(Severity::High),
238-
additional_yaml_paths: &[],
239-
env_var_override: None,
240-
used_by: &[],
241-
value_type_override: None,
242-
test_json: None,
243-
};
244-
245-
/// `observability_pipelines_worker.logs.url` - OPW logs intake URL.
246-
OBSERVABILITY_PIPELINES_WORKER_LOGS_URL = SalukiAnnotation {
247-
schema: &schema::OBSERVABILITY_PIPELINES_WORKER_LOGS_URL,
248-
// Logs OPW routing is out of scope for ADP. #1586
249-
support_level: SupportLevel::Incompatible(Severity::High),
250-
additional_yaml_paths: &[],
251-
env_var_override: None,
252-
used_by: &[],
253-
value_type_override: None,
254-
test_json: None,
255-
};
256-
257-
/// `observability_pipelines_worker.traces.enabled` - route traces to OPW.
258-
OBSERVABILITY_PIPELINES_WORKER_TRACES_ENABLED = SalukiAnnotation {
259-
schema: &schema::OBSERVABILITY_PIPELINES_WORKER_TRACES_ENABLED,
260-
// Traces OPW routing is out of scope for ADP. #1586
261-
support_level: SupportLevel::Incompatible(Severity::High),
262-
additional_yaml_paths: &[],
263-
env_var_override: None,
264-
used_by: &[],
265-
value_type_override: None,
266-
test_json: None,
267-
};
268-
269-
/// `observability_pipelines_worker.traces.url` - OPW traces intake URL.
270-
OBSERVABILITY_PIPELINES_WORKER_TRACES_URL = SalukiAnnotation {
271-
schema: &schema::OBSERVABILITY_PIPELINES_WORKER_TRACES_URL,
272-
// Traces OPW routing is out of scope for ADP. #1586
273-
support_level: SupportLevel::Incompatible(Severity::High),
274-
additional_yaml_paths: &[],
275-
env_var_override: None,
276-
used_by: &[],
277-
value_type_override: None,
278-
test_json: None,
279-
};
280-
281233
/// `serializer_experimental_use_v3_api.compression_level` - V3 API compression level.
282234
SERIALIZER_EXPERIMENTAL_USE_V3_API_COMPRESSION_LEVEL = SalukiAnnotation {
283235
schema: &schema::SERIALIZER_EXPERIMENTAL_USE_V3_API_COMPRESSION_LEVEL,
@@ -458,51 +410,4 @@ crate::declare_annotations! {
458410
test_json: None,
459411
};
460412

461-
/// `vector.logs.enabled` - route logs to OPW (legacy alias).
462-
VECTOR_LOGS_ENABLED = SalukiAnnotation {
463-
schema: &schema::VECTOR_LOGS_ENABLED,
464-
// Logs OPW routing is out of scope for ADP. #1586
465-
support_level: SupportLevel::Incompatible(Severity::High),
466-
additional_yaml_paths: &[],
467-
env_var_override: None,
468-
used_by: &[],
469-
value_type_override: None,
470-
test_json: None,
471-
};
472-
473-
/// `vector.logs.url` - OPW logs intake URL (legacy alias).
474-
VECTOR_LOGS_URL = SalukiAnnotation {
475-
schema: &schema::VECTOR_LOGS_URL,
476-
// Logs OPW routing is out of scope for ADP. #1586
477-
support_level: SupportLevel::Incompatible(Severity::High),
478-
additional_yaml_paths: &[],
479-
env_var_override: None,
480-
used_by: &[],
481-
value_type_override: None,
482-
test_json: None,
483-
};
484-
485-
/// `vector.traces.enabled` - route traces to OPW (legacy alias).
486-
VECTOR_TRACES_ENABLED = SalukiAnnotation {
487-
schema: &schema::VECTOR_TRACES_ENABLED,
488-
// Traces OPW routing is out of scope for ADP. #1586
489-
support_level: SupportLevel::Incompatible(Severity::High),
490-
additional_yaml_paths: &[],
491-
env_var_override: None,
492-
used_by: &[],
493-
value_type_override: None,
494-
test_json: None,
495-
};
496-
497-
/// `vector.traces.url` - OPW traces intake URL (legacy alias).
498-
VECTOR_TRACES_URL = SalukiAnnotation {
499-
schema: &schema::VECTOR_TRACES_URL,
500-
// Traces OPW routing is out of scope for ADP. #1586
501-
support_level: SupportLevel::Incompatible(Severity::High),
502-
additional_yaml_paths: &[],
503-
env_var_override: None,
504-
used_by: &[],
505-
value_type_override: None,
506-
test_json: None,
507-
};
508413
}

0 commit comments

Comments
 (0)