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

Fix child process not maintaining previous parent span after execution #4752

Merged
merged 2 commits into from
Oct 4, 2024

Conversation

uurien
Copy link
Collaborator

@uurien uurien commented Oct 2, 2024

What does this PR do?

Fix child process not maintaining previous parent span after execution

Motivation

In some cases it was replacing the parent span by the new one, and set the next spans as children instead of a siblings.

Plugin Checklist

  • Unit tests.

Copy link

github-actions bot commented Oct 2, 2024

Overall package size

Self size: 7.22 MB
Deduped: 62.62 MB
No deduping: 62.9 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | @datadog/native-appsec | 8.1.1 | 18.67 MB | 18.68 MB | | @datadog/native-iast-taint-tracking | 3.1.0 | 12.27 MB | 12.28 MB | | @datadog/pprof | 5.3.0 | 9.85 MB | 10.22 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.4.1 | 2.14 MB | 2.23 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 2.0.0 | 898.77 kB | 1.3 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | jsonpath-plus | 9.0.0 | 580.4 kB | 1.03 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 826.22 kB | | msgpack-lite | 0.1.26 | 201.16 kB | 281.59 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 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 | | lru-cache | 7.14.0 | 74.95 kB | 74.95 kB | | ignore | 5.3.1 | 51.46 kB | 51.46 kB | | int64-buffer | 0.1.10 | 49.18 kB | 49.18 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 | | 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 | | koalas | 1.0.2 | 6.47 kB | 6.47 kB | | path-to-regexp | 0.1.10 | 6.38 kB | 6.38 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
Copy link

pr-commenter bot commented Oct 2, 2024

Benchmarks

Benchmark execution time: 2024-10-03 15:48:39

Comparing candidate commit 2c308d7 in PR branch ugaitz/fix-child_process with baseline commit 748ef61 in branch master.

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

Copy link

codecov bot commented Oct 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.13%. Comparing base (bb0bbcc) to head (53256ec).
Report is 17 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4752      +/-   ##
==========================================
+ Coverage   91.42%   92.13%   +0.71%     
==========================================
  Files         112      105       -7     
  Lines        3475     3384      -91     
  Branches       33       33              
==========================================
- Hits         3177     3118      -59     
+ Misses        298      266      -32     
Flag Coverage Δ
?

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.

@uurien uurien marked this pull request as ready for review October 3, 2024 06:24
@uurien uurien requested review from a team as code owners October 3, 2024 06:24
hoolioh
hoolioh previously approved these changes Oct 3, 2024
@tlhunter
Copy link
Member

tlhunter commented Oct 3, 2024

Added additional tests from #4540

@tlhunter tlhunter self-assigned this Oct 3, 2024
@uurien uurien merged commit eef6711 into master Oct 4, 2024
194 checks passed
@uurien uurien deleted the ugaitz/fix-child_process branch October 4, 2024 07:10
tlhunter added a commit that referenced this pull request Oct 7, 2024
#4752)

* Fix child process not maintaining previous parent span after execution

* adding some tests @bengl had written

#4540

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
bengl pushed a commit that referenced this pull request Oct 16, 2024
#4752)

* Fix child process not maintaining previous parent span after execution

* adding some tests @bengl had written

#4540

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
bengl pushed a commit that referenced this pull request Oct 16, 2024
#4752)

* Fix child process not maintaining previous parent span after execution

* adding some tests @bengl had written

#4540

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
This was referenced Oct 16, 2024
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