Skip to content

Add ^ and $ to 'excluded_filesystems' and 'excluded_disks' config keys #37752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2025

Conversation

jose-manuel-almaza
Copy link
Contributor

@jose-manuel-almaza jose-manuel-almaza commented Jun 9, 2025

What does this PR do?

This PR updates the regular expression handling in Go to ensure consistent behavior with the previous Python implementation for 'excluded_filesystems' and 'excluded_disks' config keys.

Motivation

In the original Python code, exclude patterns were applied using re.match(), which implicitly anchors the pattern at the start of the string. Additionally, we were appending a $ to the pattern, effectively enforcing that the entire string must match the given word (i.e., full-string match).

In Go, regexp.MatchString() behaves different, it matches anywhere in the string unless explicitly anchored. As a result, patterns like tmpfs$ were incorrectly matching strings like devtmpfs as we detected during our deployment on staging.

To ensure equivalent semantics, we now explicitly wrap all exclude patterns with ^ and $, so that MatchString() behaves like a full-string match (^pattern$). This guarantees that only exact matches (as originally intended) are excluded.

Describe how you validated your changes

Following a TDD methodology when fixing a bug, the first thing added were tests that failed, and then the code that fixed them was added.

Possible Drawbacks / Trade-offs

Additional Notes

@jose-manuel-almaza jose-manuel-almaza requested a review from a team as a code owner June 9, 2025 16:08
@github-actions github-actions bot added team/agent-runtimes short review PR is simple enough to be reviewed quickly labels Jun 9, 2025
@jose-manuel-almaza jose-manuel-almaza added changelog/no-changelog and removed short review PR is simple enough to be reviewed quickly team/agent-runtimes labels Jun 9, 2025
@jose-manuel-almaza jose-manuel-almaza added the qa/done QA done before merge and regressions are covered by tests label Jun 9, 2025
Copy link

cit-pr-commenter bot commented Jun 9, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: dd47c528-e68d-4fff-aed7-7b87fa50fcb7

Baseline: fb0309c
Comparison: da8564d
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +2.14 [-0.68, +4.96] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization +0.79 [+0.73, +0.86] 1 Logs bounds checks dashboard
quality_gate_idle_all_features memory utilization +0.12 [+0.04, +0.20] 1 Logs bounds checks dashboard
otlp_ingest_logs memory utilization +0.10 [-0.03, +0.23] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.09 [-0.45, +0.63] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.07 [-0.49, +0.64] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.06 [-0.55, +0.66] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.04 [-0.54, +0.63] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.03 [-0.58, +0.64] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.01 [-0.55, +0.58] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.27, +0.26] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.05 [-0.29, +0.19] 1 Logs
ddot_metrics memory utilization -0.06 [-0.18, +0.06] 1 Logs
ddot_logs memory utilization -0.08 [-0.23, +0.06] 1 Logs
otlp_ingest_metrics memory utilization -0.10 [-0.26, +0.07] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.14 [-0.76, +0.49] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.22 [-0.27, -0.16] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.30 [-0.35, -0.25] 1 Logs
docker_containers_memory memory utilization -0.64 [-0.74, -0.55] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.83 [-1.71, +0.05] 1 Logs
docker_containers_cpu % cpu utilization -1.41 [-4.36, +1.54] 1 Logs
file_tree memory utilization -2.61 [-2.81, -2.42] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
docker_containers_cpu simple_check_run 10/10
docker_containers_memory memory_usage 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Jun 9, 2025

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor fb0309c

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${+0}$$ $${696.06}$$ < $${752.99}$$ $${-0.02}$$ $${176.0}$$ < $${187.44}$$
agent_deb_amd64_fips $${0}$$ $${694.29}$$ < $${751.36}$$ $${-0}$$ $${175.52}$$ < $${187.06}$$
agent_heroku_amd64 $${0}$$ $${358.56}$$ < $${369.68}$$ $${+0.01}$$ $${96.51}$$ < $${99.55}$$
agent_msi $${+0.01}$$ $${959.88}$$ < $${987.01}$$ $${+0.04}$$ $${146.46}$$ < $${150.72}$$
agent_rpm_amd64 $${+0}$$ $${696.05}$$ < $${752.98}$$ $${-0}$$ $${177.53}$$ < $${190.03}$$
agent_rpm_amd64_fips $${0}$$ $${694.28}$$ < $${751.35}$$ $${+0.05}$$ $${177.43}$$ < $${189.81}$$
agent_rpm_arm64 $${0}$$ $${686.0}$$ < $${739.42}$$ $${+0.01}$$ $${161.01}$$ < $${171.23}$$
agent_rpm_arm64_fips $${+0}$$ $${684.36}$$ < $${737.91}$$ $${+0.02}$$ $${160.09}$$ < $${170.22}$$
agent_suse_amd64 $${+0}$$ $${696.05}$$ < $${752.98}$$ $${-0}$$ $${177.53}$$ < $${190.03}$$
agent_suse_amd64_fips $${0}$$ $${694.28}$$ < $${751.35}$$ $${+0.05}$$ $${177.43}$$ < $${189.81}$$
agent_suse_arm64 $${0}$$ $${686.0}$$ < $${739.42}$$ $${+0.01}$$ $${161.01}$$ < $${171.23}$$
agent_suse_arm64_fips $${+0}$$ $${684.36}$$ < $${737.91}$$ $${+0.02}$$ $${160.09}$$ < $${170.22}$$
docker_agent_amd64 $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_arm64 $${-0}$$ $${793.26}$$ < $${858.97}$$ $${+0.01}$$ $${255.99}$$ < $${274.36}$$
docker_agent_jmx_amd64 $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_jmx_arm64 $${-0}$$ $${793.26}$$ < $${858.97}$$ $${+0.01}$$ $${255.99}$$ < $${274.36}$$
docker_agent_windows1809 $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows1809_core $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows1809_core_jmx $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows1809_jmx $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows2022 $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows2022_core $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows2022_core_jmx $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_agent_windows2022_jmx $${+0}$$ $${779.85}$$ < $${849.39}$$ $${+0}$$ $${268.59}$$ < $${288.34}$$
docker_cluster_agent_amd64 $${+0.01}$$ $${259.21}$$ < $${259.73}$$ $${+0}$$ $${102.88}$$ < $${103.68}$$
docker_cluster_agent_arm64 $${+0}$$ $${273.59}$$ < $${274.24}$$ $${-0.02}$$ $${97.59}$$ < $${98.45}$$
docker_cws_instrumentation_amd64 $${0}$$ $${7.08}$$ < $${7.12}$$ $${-0}$$ $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${0}$$ $${6.69}$$ < $${6.92}$$ $${-0}$$ $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${0}$$ $${38.93}$$ < $${39.57}$$ $${-0}$$ $${14.95}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${+0}$$ $${37.52}$$ < $${38.2}$$ $${+0}$$ $${13.96}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${30.61}$$ < $${31.52}$$ $${+0}$$ $${8.03}$$ < $${8.97}$$
dogstatsd_deb_arm64 $${0}$$ $${29.16}$$ < $${30.08}$$ $${-0}$$ $${6.97}$$ < $${7.92}$$
dogstatsd_rpm_amd64 $${0}$$ $${30.61}$$ < $${31.52}$$ $${-0}$$ $${8.04}$$ < $${8.98}$$
dogstatsd_suse_amd64 $${0}$$ $${30.61}$$ < $${31.52}$$ $${-0}$$ $${8.04}$$ < $${8.98}$$
iot_agent_deb_amd64 $${0}$$ $${50.49}$$ < $${60.17}$$ $${+0.01}$$ $${12.85}$$ < $${15.82}$$
iot_agent_deb_arm64 $${+0}$$ $${47.94}$$ < $${56.94}$$ $${-0}$$ $${11.15}$$ < $${13.86}$$
iot_agent_deb_armhf $${0}$$ $${47.52}$$ < $${56.41}$$ $${-0}$$ $${11.21}$$ < $${13.86}$$
iot_agent_rpm_amd64 $${0}$$ $${50.49}$$ < $${60.18}$$ $${+0}$$ $${12.87}$$ < $${15.84}$$
iot_agent_rpm_arm64 $${+0}$$ $${47.94}$$ < $${56.94}$$ $${+0}$$ $${11.17}$$ < $${13.76}$$
iot_agent_suse_amd64 $${0}$$ $${50.49}$$ < $${60.18}$$ $${+0}$$ $${12.87}$$ < $${15.84}$$

regExpList := []regexp.Regexp{}
for _, slice := range slices {
for _, val := range slice {
expr := fmt.Sprintf("^%s$", val)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/DataDog/integrations-core/blob/master/disk/datadog_checks/disk/disk.py#L365

it does not look like the python version adds the beginning anchor (^)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. But not needed because it's implicit.
We use Pattern.match here and according to its documentation:

If zero or more characters at the beginning of string match this regular expression, return a corresponding Match. Return None if the string does not match the pattern; note that this is different from a zero-length match.

However, in the go version we need to explicitly indicate this to reproduce the same behavior as in python since MatchString used here behaves differently, returning true if it finds the string, regardless of the position.

MatchString reports whether the string s contains any match of the regular expression re.

Added some tests to confirm this point.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the PR description to make this clearer.

@github-actions github-actions bot added short review PR is simple enough to be reviewed quickly medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Jun 9, 2025
@jose-manuel-almaza
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Jun 10, 2025

View all feedbacks in Devflow UI.

2025-06-10 15:07:38 UTC ℹ️ Start processing command /merge


2025-06-10 15:07:46 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 47m (p90).


2025-06-10 15:50:45 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 39ac529 into main Jun 10, 2025
239 checks passed
@dd-mergequeue dd-mergequeue bot deleted the jose/add-end-of-string-to-config-keys branch June 10, 2025 15:50
@github-actions github-actions bot added this to the 7.68.0 milestone Jun 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/agent-runtimes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants