Skip to content
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

[Backport 7.61.x] discovery: put service name generated from container tags in a separate field #32081

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 14eca6c from #31951.


…te field

<!--

  • Contributors are encouraged to read our CONTRIBUTING documentation.
  • Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests.
  • The pull request:
    • Should only fix one issue or add one feature at a time.
    • Must update the test suite for the relevant functionality.
    • Should pass all status checks before being reviewed or merged.
  • Commit titles should be prefixed with general area of pull request's change.
  • Please fill the below sections if possible with relevant information or links.
    -->

What does this PR do?

This PR adds two fields to the Service Discovery payload for the service name generated from container tags introduced in #31306:

  • ContainerServiceName: to prevent overriding the service name generated by looking at process information.
  • ContainerServiceNameSource: the name of the tag that was used to generate the service name.

Motivation

Describe how you validated your changes

<!--
Validate your changes before merge, ensuring that:

  • Your PR is tested by static / unit / integrations / e2e tests
  • Your PR description details which e2e tests cover your changes, if any
  • The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation.

If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge.

Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet.
-->

Covered by automatic tests.

Possible Drawbacks / Trade-offs

Additional Notes

<!--

  • Anything else we should know when reviewing?
  • Include benchmarking information here whenever possible.
  • Include info about alternatives that were considered and why the proposed
    version was chosen.
    -->

@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from a team as a code owner December 12, 2024 08:12
@agent-platform-auto-pr agent-platform-auto-pr bot added component/system-probe team/usm The USM team qa/done QA done before merge and regressions are covered by tests backport bot medium review PR review might take time labels Dec 12, 2024
@agent-platform-auto-pr
Copy link
Contributor Author

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

inv create-vm --pipeline-id=50924537 --os-family=ubuntu

Note: This applies to commit 4e6427e

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: ab71d239-2f01-4424-a9a8-5fcfae8a0e78

Baseline: 0450ad4
Comparison: 4e6427e
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
uds_dogstatsd_to_api_cpu % cpu utilization +1.83 [+1.09, +2.57] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.77 [+0.71, +0.84] 1 Logs
otel_to_otel_logs ingress throughput +0.36 [-0.33, +1.04] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.13 [-0.65, +0.92] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.08 [-0.67, +0.84] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.01, +0.01] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.09, +0.09] 1 Logs
file_tree memory utilization -0.01 [-0.17, +0.15] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.01 [-0.64, +0.61] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.05 [-0.78, +0.68] 1 Logs
quality_gate_logs % cpu utilization -0.10 [-3.04, +2.85] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.11 [-0.58, +0.35] 1 Logs
quality_gate_idle memory utilization -0.25 [-0.29, -0.21] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput -0.26 [-1.01, +0.50] 1 Logs
pycheck_lots_of_tags % cpu utilization -0.48 [-3.99, +3.03] 1 Logs
quality_gate_idle_all_features memory utilization -0.74 [-0.86, -0.62] 1 Logs bounds checks dashboard
basic_py_check % cpu utilization -1.14 [-5.04, +2.77] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_0ms_latency lost_bytes 8/10
file_to_blackhole_500ms_latency lost_bytes 8/10
file_to_blackhole_0ms_latency 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 memory_usage 10/10
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10
quality_gate_logs memory_usage 10/10

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_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@FlorentClarret
Copy link
Member

/merge

@dd-devflow
Copy link

dd-devflow bot commented Dec 12, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-12-12 10:13:15 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in 7.61.x is 25m.


2024-12-12 10:46:30 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 3905210 into 7.61.x Dec 12, 2024
366 checks passed
@dd-mergequeue dd-mergequeue bot deleted the backport-31951-to-7.61.x branch December 12, 2024 10:46
@github-actions github-actions bot added this to the 7.61.0 milestone Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot changelog/no-changelog component/system-probe medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/usm The USM team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants