Skip to content

Use context based logger#2698

Merged
khewonc merged 1 commit intomainfrom
khewonc/ctx-logger-ddai
Mar 3, 2026
Merged

Use context based logger#2698
khewonc merged 1 commit intomainfrom
khewonc/ctx-logger-ddai

Conversation

@khewonc
Copy link
Collaborator

@khewonc khewonc commented Mar 3, 2026

What does this PR do?

Pass context instead of logger in functions

Motivation

https://datadoghq.atlassian.net/browse/CONTP-1334
Follow-up to #2519

Additional Notes

Skipping DDA v2 reconcile methods

Minimum Agent Versions

Are there minimum versions of the Datadog Agent and/or Cluster Agent required?

  • Agent: vX.Y.Z
  • Cluster Agent: vX.Y.Z

Describe your test plan

Logs will mostly be the same as before. The main differences are:

  • Delete DaemonSetDeleted DaemonSet for DS deletion
  • Delete DaemonSetDeleted ExtendedDaemonSet for EDS deletion

Checklist

  • PR has at least one valid label: bug, enhancement, refactoring, documentation, tooling, and/or dependencies
  • PR has a milestone or the qa/skip-qa label
  • All commits are signed (see: signing commits)

@khewonc khewonc added this to the v1.25.0 milestone Mar 3, 2026
@khewonc khewonc requested a review from a team March 3, 2026 19:27
@khewonc khewonc requested a review from a team as a code owner March 3, 2026 19:27
func (r *Reconciler) overrideDependencies(logger logr.Logger, resourceManagers feature.ResourceManagers, instance *datadoghqv1alpha1.DatadogAgentInternal) error {
errs := override.Dependencies(logger, resourceManagers, instance.GetObjectMeta(), &instance.Spec)
func (r *Reconciler) overrideDependencies(ctx context.Context, resourceManagers feature.ResourceManagers, instance *datadoghqv1alpha1.DatadogAgentInternal) error {
errs := override.Dependencies(ctrl.LoggerFrom(ctx), resourceManagers, instance.GetObjectMeta(), &instance.Spec)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

override.Dependencies is also used in controller v2, which I'm not going to modify to use context based logging since it won't be used starting in operator 1.27. This can be changed to pass context instead of logging then

@codecov-commenter
Copy link

codecov-commenter commented Mar 3, 2026

Codecov Report

❌ Patch coverage is 12.50000% with 77 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.99%. Comparing base (355ade2) to head (44ec6fd).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...er/datadogagentinternal/controller_reconcile_v2.go 0.00% 21 Missing ⚠️
...dogagentinternal/controller_reconcile_v2_common.go 11.76% 15 Missing ⚠️
...datadogagentinternal/controller_reconcile_agent.go 0.00% 10 Missing ⚠️
...oller/datadogagentinternal/component_reconciler.go 0.00% 8 Missing ⚠️
...ogagentinternal/controller_reconcile_v2_helpers.go 41.66% 5 Missing and 2 partials ⚠️
...ernal/controller/datadogagentinternal/finalizer.go 40.00% 5 Missing and 1 partial ⚠️
internal/controller/datadogagentinternal/utils.go 0.00% 4 Missing ⚠️
...ler/datadogagentinternal/component_clusteragent.go 0.00% 2 Missing ⚠️
...rnal/controller/datadogagentinternal/controller.go 0.00% 2 Missing ⚠️
...adogagentinternal/component_clusterchecksrunner.go 0.00% 1 Missing ⚠️
... and 1 more
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2698      +/-   ##
==========================================
+ Coverage   38.69%   38.99%   +0.30%     
==========================================
  Files         307      307              
  Lines       26563    26699     +136     
==========================================
+ Hits        10278    10411     +133     
+ Misses      15511    15506       -5     
- Partials      774      782       +8     
Flag Coverage Δ
unittests 38.99% <12.50%> (+0.30%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...adogagentinternal/component_clusterchecksrunner.go 0.00% <0.00%> (ø)
...datadogagentinternal/component_otelagentgateway.go 0.00% <0.00%> (ø)
...ler/datadogagentinternal/component_clusteragent.go 0.00% <0.00%> (ø)
...rnal/controller/datadogagentinternal/controller.go 0.00% <0.00%> (ø)
internal/controller/datadogagentinternal/utils.go 0.00% <0.00%> (ø)
...ernal/controller/datadogagentinternal/finalizer.go 47.88% <40.00%> (+0.06%) ⬆️
...ogagentinternal/controller_reconcile_v2_helpers.go 38.51% <41.66%> (-0.90%) ⬇️
...oller/datadogagentinternal/component_reconciler.go 0.00% <0.00%> (ø)
...datadogagentinternal/controller_reconcile_agent.go 4.38% <0.00%> (-0.04%) ⬇️
...dogagentinternal/controller_reconcile_v2_common.go 5.34% <11.76%> (+0.30%) ⬆️
... and 1 more

... and 4 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 355ade2...44ec6fd. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@gabedos gabedos left a comment

Choose a reason for hiding this comment

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

Continuing migration to use context based logger looks good to me!

@khewonc khewonc merged commit 08e6a48 into main Mar 3, 2026
42 checks passed
@khewonc khewonc deleted the khewonc/ctx-logger-ddai branch March 3, 2026 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants