Skip to content

otel drop in support for baggage#5019

Merged
ida613 merged 4 commits into
masterfrom
ida613/otel-baggage-updated
Jan 14, 2025
Merged

otel drop in support for baggage#5019
ida613 merged 4 commits into
masterfrom
ida613/otel-baggage-updated

Conversation

@ida613

@ida613 ida613 commented Dec 16, 2024

Copy link
Copy Markdown
Contributor

What does this PR do?

Motivation

Plugin Checklist

Additional Notes

@github-actions

github-actions Bot commented Dec 16, 2024

Copy link
Copy Markdown
Contributor

Overall package size

Self size: 8.42 MB
Deduped: 94.77 MB
No deduping: 95.29 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.3.0 | 29.43 MB | 29.43 MB | | @datadog/native-appsec | 8.4.0 | 19.25 MB | 19.26 MB | | @datadog/native-iast-taint-tracking | 3.2.0 | 13.9 MB | 13.91 MB | | @datadog/pprof | 5.4.1 | 9.76 MB | 10.13 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.6.1 | 2.59 MB | 2.73 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 3.1.0 | 1.06 MB | 1.46 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 826.22 kB | | source-map | 0.7.4 | 226 kB | 226 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | lru-cache | 7.18.3 | 133.92 kB | 133.92 kB | | pprof-format | 2.1.0 | 111.69 kB | 111.69 kB | | @datadog/sketches-js | 2.1.0 | 109.9 kB | 109.9 kB | | semver | 7.6.3 | 95.82 kB | 95.82 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 5.3.1 | 51.46 kB | 51.46 kB | | shell-quote | 1.8.1 | 44.96 kB | 44.96 kB | | istanbul-lib-coverage | 3.2.0 | 29.34 kB | 29.34 kB | | rfdc | 1.3.1 | 25.21 kB | 25.21 kB | | @isaacs/ttlcache | 1.4.1 | 25.2 kB | 25.2 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | dc-polyfill | 0.1.4 | 23.1 kB | 23.1 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | koalas | 1.0.2 | 6.47 kB | 6.47 kB | | module-details-from-path | 1.0.3 | 4.47 kB | 4.47 kB |

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@pr-commenter

pr-commenter Bot commented Dec 16, 2024

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-01-07 19:34:29

Comparing candidate commit e191372 in PR branch ida613/otel-baggage-updated with baseline commit af176d1 in branch master.

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

@ida613
ida613 marked this pull request as ready for review January 6, 2025 01:40
@ida613
ida613 requested a review from a team as a code owner January 6, 2025 01:40
@ida613 ida613 changed the title WIP: otel drop in support for baggage otel drop in support for baggage Jan 6, 2025
Comment thread packages/dd-trace/test/opentelemetry/context_manager.spec.js Outdated
Comment thread packages/dd-trace/test/opentelemetry/context_manager.spec.js Outdated
baggages = baggages.setEntry('key2', { value: 'otel2' })
contextWithUpdatedBaggages = propagation.setBaggage(api.context.active(), baggages)
})
expect(JSON.parse(ddSpan.getAllBaggageItems())).to.deep.equal({ key1: 'dd1' })

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It might be worth adding a comment here to clarify that the Datadog baggage is not updated until the api.context.with(context, fn, thisArg, ...args) is called

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

will do

expect(JSON.parse(ddSpan.getAllBaggageItems())).to.deep.equal(
{ key1: 'otel1', key2: 'otel2' }
)
ddSpan.setBaggageItem('key2', 'dd2')

@zacharycmontoya zacharycmontoya Jan 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

And I am guessing that the changes to this span's baggage update the baggage in the OTEL active context because ddSpan == tracer.scope().active() ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yup!

@zacharycmontoya zacharycmontoya left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM from the logic and test cases, though I'd welcome a review from another dd-trace-js contributor on the actual Javascript implementations

@ida613
ida613 merged commit 149742b into master Jan 14, 2025
@ida613
ida613 deleted the ida613/otel-baggage-updated branch January 14, 2025 16:19
watson pushed a commit that referenced this pull request Jan 22, 2025
@watson watson mentioned this pull request Jan 22, 2025
watson pushed a commit that referenced this pull request Jan 22, 2025
@watson watson mentioned this pull request Jan 22, 2025
watson pushed a commit that referenced this pull request Jan 23, 2025
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