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

Trace Tags Propagation in Distributed Traces #2260

Merged
merged 39 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b61c268
Sampling Propagation:Tag serializer
marcotc Aug 10, 2022
091a0bc
Fix Lint
marcotc Aug 11, 2022
fbcefd3
Sampling-Propagation:Extract/Inject distributed headers
marcotc Aug 4, 2022
0e5048a
Add comment regarding global state
marcotc Sep 12, 2022
ad875b8
Move tag to shared ext
marcotc Sep 12, 2022
dd77eba
Fix constant reference
marcotc Sep 12, 2022
48aeaf4
Fix constant for real
marcotc Sep 13, 2022
12be565
Sampling-Propagation:Consume distributed tags in TraceOperation
marcotc Sep 9, 2022
e4af3db
Add comment on ideal cases for inject
marcotc Sep 19, 2022
9c4c2fa
Sampling-Propagation:Consume distributed tags in TraceOperation
marcotc Sep 9, 2022
e77772d
Sampling-Propagation:Export sampling mechanism in distributed trace tags
marcotc Sep 27, 2022
d95e180
Sampling-Propagation:Exclude problematic existing tag
marcotc Sep 28, 2022
4729865
Merge pull request #2264 from DataDog/horizontal-1
marcotc Oct 7, 2022
1fc202f
Make distributed_tags private
marcotc Oct 7, 2022
47c48e5
Fix private access on tests
marcotc Oct 7, 2022
8937ec9
Merge pull request #2266 from DataDog/feat-parse-tags
marcotc Oct 7, 2022
627c116
Merge branch 'feat-Sampling-Propagation' into sampling-decision
marcotc Oct 7, 2022
1b02e5d
Change decision to an opaque value
marcotc Oct 25, 2022
e37494f
Merge Gemfile from master
marcotc Oct 27, 2022
f657882
Remove unused sampling decisions and mechanisms
marcotc Oct 28, 2022
b48874e
Fix appsec
marcotc Oct 28, 2022
75b8aa4
Move decision marker tagging to formatter
marcotc Oct 31, 2022
4463e34
Merge branch 'sampling-decision' into sampling-dm-propagation
marcotc Nov 7, 2022
b5f39a2
Simplify logic now that decision is a simple tag
marcotc Nov 7, 2022
c9eae1a
Merge branch 'sampling-dm-propagation' into deprecated-tags
marcotc Nov 7, 2022
d7ac8c2
Lint fix
marcotc Nov 7, 2022
f58ccad
Merge branch 'master' into feat-Sampling-Propagation
marcotc Nov 7, 2022
a51ee58
Merge branch 'feat-Sampling-Propagation' into sampling-decision
marcotc Nov 7, 2022
d79b2bf
Fix lint
marcotc Nov 7, 2022
56e506b
Merge branch 'sampling-decision' into sampling-dm-propagation
marcotc Nov 7, 2022
14e3423
Merge branch 'sampling-dm-propagation' into deprecated-tags
marcotc Nov 7, 2022
e8efeb6
Fix gemfile merge conflict
marcotc Nov 7, 2022
a0670e4
Merge branch 'sampling-decision' into sampling-dm-propagation
marcotc Nov 7, 2022
e4fdc63
Merge branch 'sampling-dm-propagation' into deprecated-tags
marcotc Nov 7, 2022
cf147d8
Rephrase docs
marcotc Nov 7, 2022
aa2336a
Merge pull request #2282 from DataDog/sampling-decision
marcotc Nov 7, 2022
86b624e
Merge pull request #2298 from DataDog/sampling-dm-propagation
marcotc Nov 7, 2022
e8acaf7
Merge pull request #2299 from DataDog/deprecated-tags
marcotc Nov 7, 2022
6826e6d
Nit:appsec variable rename
marcotc Nov 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix private access on tests
  • Loading branch information
marcotc committed Oct 7, 2022
commit 47c48e596c1507f7bef8bd46128daef64da52863
2 changes: 1 addition & 1 deletion spec/datadog/tracing/tracer_integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def rack_header(header)
expect(trace.parent_span_id).to eq(parent_id)
expect(trace.origin).to eq(origin)
expect(trace.sampling_priority).to eq(sampling_priority)
expect(trace.distributed_tags).to eq('_dd.p.test' => 'value')
expect(trace.send(:distributed_tags)).to eq('_dd.p.test' => 'value')
end

it 'populates injected request headers' do
Expand Down
3 changes: 2 additions & 1 deletion spec/datadog/tracing/tracer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -812,11 +812,12 @@
it 'causes next #trace to continue the trace' do
tracer.trace('operation') do |span, trace|
expect(trace).to have_attributes(
distributed_tags: { '_dd.p.test' => 'value' },
origin: digest.trace_origin,
sampling_priority: digest.trace_sampling_priority,
)

expect(trace.send(:distributed_tags)).to eq('_dd.p.test' => 'value')

expect(span).to have_attributes(
parent_id: digest.span_id,
trace_id: digest.trace_id
Expand Down