Implement caching for GenerateContainerIDFromOriginInfo #32351

wdhif · 2024-12-18T16:29:12Z

What does this PR do?

Implement caching for GenerateContainerIDFromOriginInfo using the github.com/DataDog/datadog-agent/pkg/util/cache implementation.

Motivation

This is needed to fully support GenerateContainerIDFromOriginInfo use cases.

Describe how you validated your changes

Validated using the following patch:

diff --git a/comp/core/tagger/impl-remote/remote.go b/comp/core/tagger/impl-remote/remote.go
index 7dd668b18a..da9c5ed25e 100644
--- a/comp/core/tagger/impl-remote/remote.go
+++ b/comp/core/tagger/impl-remote/remote.go
@@ -45,7 +45,7 @@ import (
 const (
        noTimeout         = 0 * time.Minute
        streamRecvTimeout = 10 * time.Minute
-       cacheExpiration   = 1 * time.Minute
+       cacheExpiration   = 10 * time.Second
 )

 var (
diff --git a/pkg/util/cache/cache.go b/pkg/util/cache/cache.go
index e78a1562fd..f2c751d12a 100644
--- a/pkg/util/cache/cache.go
+++ b/pkg/util/cache/cache.go
@@ -7,6 +7,7 @@
 package cache

 import (
+       "github.com/DataDog/datadog-agent/pkg/util/log"
        "strings"
        "time"

@@ -88,8 +89,10 @@ func Get[T any](key string, cb func() (T, error)) (T, error) {
 //     cached with the given expire duration and returned.
 func GetWithExpiration[T any](key string, cb func() (T, error), expire time.Duration) (T, error) {
        if x, found := Cache.Get(key); found {
+               log.Errorf("w: hit for key %s", key)
                return x.(T), nil
        }
+       log.Errorf("w: miss for key %s", key)

        res, err := cb()
        // We don't cache errors

And with the same QA process as #32295
We can see the logs:

2024-12-19 09:59:01 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:02 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:02 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:06 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:07 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:95 in ]) | w: miss for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:10 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:12 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py
2024-12-19 09:59:14 UTC | TRACE | ERROR | (pkg/util/cache/cache.go:92 in ]) | w: hit for key agent/remoteTagger/container_id/7c61e76f-5e3c-4989-b479-b977dd9cfe48/dd-trace-py

And that we still have the traces correctly tagged:

Possible Drawbacks / Trade-offs

N/A

Additional Notes

N/A

cit-pr-commenter · 2024-12-18T16:36:36Z

Go Package Import Differences

Baseline: 1aa7a6f
Comparison: 8c21d2c

binary	os	arch	change
trace-agent	linux	amd64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache
trace-agent	linux	arm64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache
trace-agent	windows	amd64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache
trace-agent	darwin	amd64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache
trace-agent	darwin	arm64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache
heroku-trace-agent	linux	amd64	+1, -0 +github.com/DataDog/datadog-agent/pkg/util/cache

agent-platform-auto-pr · 2024-12-18T16:53:39Z

Test changes on VM

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

inv aws.create-vm --pipeline-id=51723967 --os-family=ubuntu

Note: This applies to commit 8c21d2c

agent-platform-auto-pr · 2024-12-18T16:54:16Z

Uncompressed package size comparison

Comparison with ancestor 1aa7a6f7439162fc1d7a28edb1bfed8d6800156c

Diff per package

package	diff	status	size	ancestor	threshold
datadog-heroku-agent-amd64-deb	0.21MB	⚠️	505.07MB	504.86MB	70.00MB
datadog-agent-x86_64-rpm	0.21MB	⚠️	1197.36MB	1197.15MB	140.00MB
datadog-agent-x86_64-suse	0.21MB	⚠️	1197.36MB	1197.15MB	140.00MB
datadog-agent-aarch64-rpm	0.21MB	⚠️	943.32MB	943.11MB	140.00MB
datadog-agent-amd64-deb	0.20MB	⚠️	1188.09MB	1187.89MB	140.00MB
datadog-agent-arm64-deb	0.20MB	⚠️	934.08MB	933.87MB	140.00MB
datadog-iot-agent-arm64-deb	0.01MB	⚠️	108.80MB	108.79MB	10.00MB
datadog-iot-agent-aarch64-rpm	0.01MB	⚠️	108.87MB	108.86MB	10.00MB
datadog-iot-agent-amd64-deb	0.00MB	✅	113.32MB	113.32MB	10.00MB
datadog-iot-agent-x86_64-rpm	0.00MB	✅	113.39MB	113.39MB	10.00MB
datadog-iot-agent-x86_64-suse	0.00MB	✅	113.39MB	113.39MB	10.00MB
datadog-dogstatsd-amd64-deb	0.00MB	✅	78.57MB	78.57MB	10.00MB
datadog-dogstatsd-x86_64-rpm	0.00MB	✅	78.64MB	78.64MB	10.00MB
datadog-dogstatsd-x86_64-suse	0.00MB	✅	78.64MB	78.64MB	10.00MB
datadog-dogstatsd-arm64-deb	0.00MB	✅	55.77MB	55.77MB	10.00MB

Decision

⚠️ Warning

jeremy-hanna

👍

comp/core/tagger/impl-remote/remote.go

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

…Interval Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

cit-pr-commenter · 2024-12-20T11:00:46Z

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: b64a3e68-26b1-4331-89fe-8e10c136ad94

Baseline: 1aa7a6f
Comparison: 8c21d2c
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.16	[+0.48, +1.84]	1	Logs
➖	file_tree	memory utilization	+0.87	[+0.74, +1.00]	1	Logs
➖	quality_gate_logs	% cpu utilization	+0.85	[-2.41, +4.10]	1	Logs
➖	quality_gate_idle	memory utilization	+0.25	[+0.21, +0.29]	1	Logs bounds checks dashboard
➖	file_to_blackhole_500ms_latency	egress throughput	+0.23	[-0.55, +1.01]	1	Logs
➖	quality_gate_idle_all_features	memory utilization	+0.22	[+0.14, +0.30]	1	Logs bounds checks dashboard
➖	tcp_syslog_to_blackhole	ingress throughput	+0.17	[+0.11, +0.23]	1	Logs
➖	file_to_blackhole_0ms_latency_http2	egress throughput	+0.12	[-0.77, +1.00]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	+0.10	[-0.62, +0.81]	1	Logs
➖	file_to_blackhole_300ms_latency	egress throughput	+0.02	[-0.63, +0.66]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	+0.01	[-0.11, +0.13]	1	Logs
➖	tcp_dd_logs_filter_exclude	ingress throughput	+0.00	[-0.01, +0.01]	1	Logs
➖	file_to_blackhole_0ms_latency_http1	egress throughput	-0.01	[-0.84, +0.81]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	-0.02	[-0.91, +0.87]	1	Logs
➖	file_to_blackhole_1000ms_latency_linear_load	egress throughput	-0.52	[-0.98, -0.06]	1	Logs
➖	otel_to_otel_logs	ingress throughput	-0.65	[-1.34, +0.03]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	-0.71	[-1.50, +0.08]	1	Logs

Bounds Checks: ❌ Failed

perf	experiment	bounds_check_name	replicates_passed	links
❌	quality_gate_idle	memory_usage	8/10	bounds checks dashboard
❌	file_to_blackhole_100ms_latency	lost_bytes	9/10
❌	quality_gate_idle_all_features	memory_usage	9/10	bounds checks dashboard
✅	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	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_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:

Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
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.
Its configuration does not mark it "erratic".

CI Pass/Fail Decision

❌ Failed. Some Quality Gates were violated.

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_all_features, bounds check memory_usage: 9/10 replicas passed. Failed 1 which is > 0. Gate FAILED.
quality_gate_idle, bounds check memory_usage: 8/10 replicas passed. Failed 2 which is > 0. Gate FAILED.

gabedos

LGTM. Unfortunate we couldn't extract the callback func out.

comp/core/tagger/impl-remote/remote.go

wdhif · 2024-12-23T09:51:10Z

/merge

dd-devflow · 2024-12-23T09:51:20Z

Devflow running: `/merge`

View all feedbacks in Devflow UI.

2024-12-23 09:51:20 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2024-12-23 13:51:22 UTC ⚠️ MergeQueue: This merge request was unqueued

wassim.dhif@datadoghq.com unqueued this merge request: It did not become mergeable within the expected time

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

wdhif · 2024-12-23T14:17:11Z

/merge

dd-devflow · 2024-12-23T14:17:19Z

Devflow running: `/merge`

View all feedbacks in Devflow UI.

2024-12-23 14:17:19 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 35m.

2024-12-23 14:51:24 UTC ℹ️ MergeQueue: This merge request was merged

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

github-actions bot added team/agent-shared-components medium review PR review might take time labels Dec 18, 2024

wdhif added changelog/no-changelog qa/done QA done before merge and regressions are covered by tests labels Dec 18, 2024

wdhif force-pushed the CONTP-15/wassim.dhif/external-data-caching branch from 6bfd3b9 to 0eedc89 Compare December 19, 2024 09:58

github-actions bot added short review PR is simple enough to be reviewed quickly and removed medium review PR review might take time labels Dec 19, 2024

wdhif force-pushed the CONTP-15/wassim.dhif/external-data-caching branch 2 times, most recently from 9bc0515 to a9a05e8 Compare December 19, 2024 14:53

wdhif marked this pull request as ready for review December 19, 2024 15:50

wdhif requested review from a team as code owners December 19, 2024 15:50

wdhif requested a review from dustmop December 19, 2024 15:50

jeremy-hanna approved these changes Dec 19, 2024

View reviewed changes

DataDog deleted a comment from cit-pr-commenter bot Dec 19, 2024

clamoriniere reviewed Dec 19, 2024

View reviewed changes

comp/core/tagger/impl-remote/remote.go Show resolved Hide resolved

clamoriniere reviewed Dec 19, 2024

View reviewed changes

comp/core/tagger/impl-remote/remote.go Outdated Show resolved Hide resolved

github-actions bot added medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Dec 19, 2024

wdhif added 3 commits December 19, 2024 19:57

chore(tagger): fix curl example for OriginInfo resolution

ca50c5c

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

feat(tagger): implement caching for GenerateContainerIDFromOriginInfo

1a2a499

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

fix(tagger): reduce GenerateContainerIDFromOriginInfo backoff.Initial…

75b9ade

…Interval Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

wdhif force-pushed the CONTP-15/wassim.dhif/external-data-caching branch from a9a05e8 to 75b9ade Compare December 20, 2024 09:59

gabedos approved these changes Dec 20, 2024

View reviewed changes

wdhif added the team/container-platform The Container Platform Team label Dec 20, 2024

clamoriniere reviewed Dec 23, 2024

View reviewed changes

comp/core/tagger/impl-remote/remote.go Outdated Show resolved Hide resolved

clamoriniere approved these changes Dec 23, 2024

View reviewed changes

wdhif force-pushed the CONTP-15/wassim.dhif/external-data-caching branch 2 times, most recently from 07cddfb to 28cb4e2 Compare December 23, 2024 10:32

fix: improve code

8c21d2c

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

wdhif force-pushed the CONTP-15/wassim.dhif/external-data-caching branch from 28cb4e2 to 8c21d2c Compare December 23, 2024 10:51

dd-mergequeue bot merged commit e9e9a26 into main Dec 23, 2024
231 checks passed

dd-mergequeue bot deleted the CONTP-15/wassim.dhif/external-data-caching branch December 23, 2024 14:51

github-actions bot added this to the 7.62.0 milestone Dec 23, 2024

louis-cqrl pushed a commit that referenced this pull request Dec 25, 2024

Implement caching for GenerateContainerIDFromOriginInfo (#32351)

e12263f

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement caching for GenerateContainerIDFromOriginInfo #32351

Implement caching for GenerateContainerIDFromOriginInfo #32351

wdhif commented Dec 18, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 18, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 18, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 18, 2024 •

edited

Loading

jeremy-hanna left a comment

cit-pr-commenter bot commented Dec 20, 2024 •

edited

Loading

Fine details of change detection per experiment

Explanation

gabedos left a comment

wdhif commented Dec 23, 2024

dd-devflow bot commented Dec 23, 2024 •

edited

Loading

wdhif commented Dec 23, 2024

dd-devflow bot commented Dec 23, 2024 •

edited

Loading

Implement caching for GenerateContainerIDFromOriginInfo #32351

Implement caching for GenerateContainerIDFromOriginInfo #32351

Conversation

wdhif commented Dec 18, 2024 • edited Loading

What does this PR do?

Motivation

Describe how you validated your changes

Possible Drawbacks / Trade-offs

Additional Notes

cit-pr-commenter bot commented Dec 18, 2024 • edited Loading

Go Package Import Differences

agent-platform-auto-pr bot commented Dec 18, 2024 • edited Loading

Test changes on VM

agent-platform-auto-pr bot commented Dec 18, 2024 • edited Loading

Uncompressed package size comparison

Decision

jeremy-hanna left a comment

Choose a reason for hiding this comment

cit-pr-commenter bot commented Dec 20, 2024 • edited Loading

Regression Detector

Regression Detector Results

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

Bounds Checks: ❌ Failed

Explanation

CI Pass/Fail Decision

gabedos left a comment

Choose a reason for hiding this comment

wdhif commented Dec 23, 2024

dd-devflow bot commented Dec 23, 2024 • edited Loading

Devflow running: /merge

wdhif commented Dec 23, 2024

dd-devflow bot commented Dec 23, 2024 • edited Loading

Devflow running: /merge

wdhif commented Dec 18, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 18, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 18, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 18, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 20, 2024 •

edited

Loading

dd-devflow bot commented Dec 23, 2024 •

edited

Loading

Devflow running: `/merge`

dd-devflow bot commented Dec 23, 2024 •

edited

Loading

Devflow running: `/merge`