ddtrace/tracer: adding sampling by resource and tags by dianashevchenko · Pull Request #2448 · DataDog/dd-trace-go

dianashevchenko · 2023-12-19T14:00:00Z

What does this PR do?

This PR changes the sampling rule matching logic. Tests are updated accordingly.
Additionally, updated the MarshalJSON method of the SamplingRule.

What to remember when reviewing

2 fields are added to the sampling rule - tags, resource
exactName and exactService are removed,, in favour of just Service and Name fields in the SamplingRule
changes in regexes in log_test.go relate to the removed exactName or exactService fields, thus regexes changed

Motivation

Reviewer's Checklist

Changed code has unit tests for its functionality at or near 100% coverage.
System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
There is a benchmark for any new code, or changes to existing code.
If this interacts with the agent in a new way, a system test has been added.
Add an appropriate team label so this PR gets put in the right place for the release notes.

For Datadog employees:

If this PR touches code that handles credentials of any kind, such as Datadog API keys, I've requested a review from @DataDog/security-design-and-guidance.
This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

…d target_span (#2403)

…ying sampling rules (#2407)

#2416)

pr-commenter · 2023-12-19T14:09:19Z

Benchmarks

Benchmark execution time: 2024-01-08 14:59:07

Comparing candidate commit 5305d5f in PR branch shevchenko/tag-resource-sampling with baseline commit d28a899 in branch main.

Found 1 performance improvements and 0 performance regressions! Performance is the same for 38 metrics, 2 unstable metrics.

scenario:BenchmarkTracerAddSpans-24

🟩 execution_time [-153.329ns; -92.671ns] or [-3.680%; -2.224%]

)

github-actions · 2024-01-03T15:11:28Z

+				_, _, _, stop := startTestTracer(t)
+				defer stop()
+
+				s, _ := StartSpanFromContext(context.Background(), "web.request",


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context

github-actions · 2024-01-03T15:11:28Z

+		tr, _, _, stop := startTestTracer(t)
+		defer stop()
+
+		originSpan, _ := StartSpanFromContext(context.Background(), "web.request",


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context

github-actions · 2024-01-03T15:11:28Z

+		w3cCtx, err := tr.Extract(headers)
+		assert.Nil(t, err)
+
+		w3cSpan, _ := StartSpanFromContext(context.Background(), "web.request", ChildOf(w3cCtx))


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context (typecheck)

github-actions · 2024-01-03T15:11:28Z

+				_, _, _, stop := startTestTracer(t)
+				defer stop()
+
+				s, _ := StartSpanFromContext(context.Background(), "web.request",


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context

github-actions · 2024-01-03T15:11:28Z

+		tr, _, _, stop := startTestTracer(t)
+		defer stop()
+
+		originSpan, _ := StartSpanFromContext(context.Background(), "web.request",


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context

github-actions · 2024-01-03T15:11:28Z

+		w3cCtx, err := tr.Extract(headers)
+		assert.Nil(t, err)
+
+		w3cSpan, _ := StartSpanFromContext(context.Background(), "web.request", ChildOf(w3cCtx))


🚫 [golangci] _{reported by reviewdog 🐶}
undefined: context) (typecheck)

…2483)

darccio

LGTM

…to new sampling rules implementation in v2 (#2492) Updates TestStartupLog/errors to handle the way that sampling rules work in #2448, as in v2 it causes to return an error when creating the tracer. The error is logged as before, but we don't need to run the tracer to create it.

dianashevchenko and others added 5 commits November 30, 2023 16:59

ddtrace/tracer: extending sampling rule struct with tags, resource an…

5ffad80

…d target_span (#2403)

ddtrace/tracer: added DD_TRACE_SAMPLING_RULES_FILE env var (#2404)

66400e5

ddtrace/tracer: account for resource, tags, and target_span when appl…

f45d036

…ying sampling rules (#2407)

ddtrace/tracer: removed exactService and exactName from sampling rules (

e13e8d7

#2416)

Merge branch 'main' into shevchenko/tag-resource-sampling

bb2601d

katiehockman reviewed Dec 26, 2023

View reviewed changes

Comment thread ddtrace/tracer/rules_sampler.go Outdated

dianashevchenko added 2 commits December 27, 2023 23:15

ddtrace/tracer: removed target_span + trying to sample at the end (#2464

5d50d35

)

ddtrace/tracer: remove target_span from sampling (#2449)

b7e0b88

github-actions Bot reviewed Jan 3, 2024

View reviewed changes

dianashevchenko and others added 4 commits January 3, 2024 16:47

ddtrace/tracer: simplified SpanTagsResourceRule (#2470)

c89ec56

lost import

83faea4

ddtrace/tracer: locking sampling decision after context propagation (#…

55761ee

…2483)

Merge branch 'main' into shevchenko/tag-resource-sampling

5305d5f

dianashevchenko marked this pull request as ready for review January 8, 2024 15:00

dianashevchenko requested a review from a team as a code owner January 8, 2024 15:00

darccio approved these changes Jan 8, 2024

View reviewed changes

dianashevchenko merged commit a784a5f into main Jan 8, 2024

dianashevchenko deleted the shevchenko/tag-resource-sampling branch January 8, 2024 15:37

darccio mentioned this pull request Jan 9, 2024

ddtracer/tracer: update TestStartupLog/errors & TestLogSamplingRules to new sampling rules implementation in v2 #2492

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

ddtrace/tracer: adding sampling by resource and tags#2448

ddtrace/tracer: adding sampling by resource and tags#2448
dianashevchenko merged 11 commits into
mainfrom
shevchenko/tag-resource-sampling

dianashevchenko commented Dec 19, 2023

Uh oh!

pr-commenter Bot commented Dec 19, 2023 •

edited

Loading

Uh oh!

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

github-actions Bot Jan 3, 2024

Uh oh!

darccio left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

dianashevchenko commented Dec 19, 2023

What does this PR do?

Motivation

Reviewer's Checklist

Uh oh!

pr-commenter Bot commented Dec 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Benchmarks

scenario:BenchmarkTracerAddSpans-24

Uh oh!

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

darccio left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pr-commenter Bot commented Dec 19, 2023 •

edited

Loading