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

chore: Merge staged otel work #2873

Merged
merged 13 commits into from
Jan 14, 2025
Merged

chore: Merge staged otel work #2873

merged 13 commits into from
Jan 14, 2025

Conversation

bizob2828
Copy link
Member

Description

Please provide a brief description of the changes introduced in this pull request.
What problem does it solve? What is the context of this change?

This PR merges the work that has been in flight to support the opentelemetry bridge. The big changes are the context manager now stores the segment separate from the transaction. Also segments no longer store their children. Lastly there's code to synthesize segments from Otel spans but none of that code is hooked into the agent yet.

How to Test

Please describe how you have tested these changes. Have you run the code against an example application?
What steps did you take to ensure that the changes are working correctly?

For changelog:

Copy link

codecov bot commented Jan 13, 2025

Codecov Report

Attention: Patch coverage is 99.63293% with 7 lines in your changes missing coverage. Please review.

Project coverage is 97.35%. Comparing base (a93fe6e) to head (b960a00).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
lib/otel/rules.js 99.17% 2 Missing ⚠️
lib/otel/segment-synthesis.js 97.05% 2 Missing ⚠️
lib/shim/shim.js 98.94% 2 Missing ⚠️
lib/instrumentation/when/index.js 96.77% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2873      +/-   ##
==========================================
+ Coverage   97.27%   97.35%   +0.08%     
==========================================
  Files         296      308      +12     
  Lines       46560    47369     +809     
==========================================
+ Hits        45289    46116     +827     
+ Misses       1271     1253      -18     
Flag Coverage Δ
integration-tests-cjs-18.x 73.20% <75.98%> (+0.03%) ⬆️
integration-tests-cjs-20.x 73.20% <75.98%> (+0.03%) ⬆️
integration-tests-cjs-22.x 73.23% <75.98%> (+0.04%) ⬆️
integration-tests-esm-18.x 49.84% <29.82%> (-0.05%) ⬇️
integration-tests-esm-20.x 49.84% <29.82%> (-0.05%) ⬇️
integration-tests-esm-22.x 49.89% <29.82%> (-0.05%) ⬇️
unit-tests-18.x 89.12% <89.46%> (+0.23%) ⬆️
unit-tests-20.x 89.12% <89.46%> (+0.23%) ⬆️
unit-tests-22.x 89.13% <89.46%> (+0.23%) ⬆️
versioned-tests-18.x 79.23% <89.74%> (-0.03%) ⬇️
versioned-tests-20.x 79.21% <89.74%> (-0.06%) ⬇️
versioned-tests-22.x 79.22% <89.74%> (-0.06%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@jsumners-nr jsumners-nr left a comment

Choose a reason for hiding this comment

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

No merge conflicts, and tests are passing = 👍

@bizob2828 bizob2828 merged commit 82fe9d5 into main Jan 14, 2025
53 of 54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done: Issues recently completed
Development

Successfully merging this pull request may close these issues.

2 participants