Skip to content

fix(ws): wrap event remove handler for message event removal#7052

Merged
simon-id merged 4 commits intomasterfrom
BridgeAR/2025-12-08-fix-ws-event-wrapping
Dec 10, 2025
Merged

fix(ws): wrap event remove handler for message event removal#7052
simon-id merged 4 commits intomasterfrom
BridgeAR/2025-12-08-fix-ws-event-wrapping

Conversation

@BridgeAR
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR commented Dec 8, 2025

The remove handler has to understand what method was originally wrapped and remove the wrapped method. Otherwise it would still exist and be triggered.

Fixes: #7025

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 8, 2025

Overall package size

Self size: 13.62 MB
Deduped: 113.82 MB
No deduping: 128.84 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.7.0 | 35.02 MB | 35.02 MB | | @datadog/native-appsec | 10.3.0 | 20.73 MB | 20.74 MB | | @datadog/pprof | 5.12.0 | 11.19 MB | 11.57 MB | | @datadog/native-iast-taint-tracking | 4.1.0 | 9.01 MB | 9.02 MB | | @opentelemetry/resources | 1.30.1 | 557.67 kB | 7.71 MB | | @opentelemetry/core | 1.30.1 | 908.66 kB | 7.16 MB | | protobufjs | 7.5.4 | 2.95 MB | 5.83 MB | | @datadog/wasm-js-rewriter | 5.0.1 | 2.82 MB | 3.53 MB | | @datadog/native-metrics | 3.1.1 | 1.02 MB | 1.43 MB | | @opentelemetry/api-logs | 0.208.0 | 199.48 kB | 1.42 MB | | @opentelemetry/api | 1.9.0 | 1.22 MB | 1.22 MB | | jsonpath-plus | 10.3.0 | 617.18 kB | 1.08 MB | | import-in-the-middle | 1.15.0 | 127.66 kB | 856.24 kB | | lru-cache | 10.4.3 | 804.3 kB | 804.3 kB | | @datadog/openfeature-node-server | 0.2.0 | 118.51 kB | 437.19 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | source-map | 0.7.6 | 185.63 kB | 185.63 kB | | pprof-format | 2.2.1 | 163.06 kB | 163.06 kB | | @datadog/sketches-js | 2.1.1 | 109.9 kB | 109.9 kB | | @isaacs/ttlcache | 2.1.3 | 90.79 kB | 90.79 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 7.0.5 | 63.38 kB | 63.38 kB | | istanbul-lib-coverage | 3.2.2 | 34.37 kB | 34.37 kB | | rfdc | 1.4.1 | 27.15 kB | 27.15 kB | | dc-polyfill | 0.1.10 | 26.73 kB | 26.73 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | shell-quote | 1.8.3 | 23.74 kB | 23.74 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | semifies | 1.0.0 | 15.84 kB | 15.84 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | ttl-set | 1.0.0 | 4.61 kB | 9.69 kB | | mutexify | 1.4.0 | 5.71 kB | 8.74 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | module-details-from-path | 1.0.4 | 3.96 kB | 3.96 kB | | escape-string-regexp | 5.0.0 | 3.66 kB | 3.66 kB |

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

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 8, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 84.76%. Comparing base (590ba8e) to head (494c262).
⚠️ Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7052      +/-   ##
==========================================
- Coverage   84.80%   84.76%   -0.05%     
==========================================
  Files         514      513       -1     
  Lines       21987    21874     -113     
==========================================
- Hits        18646    18541     -105     
+ Misses       3341     3333       -8     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@datadog-datadog-prod-us1
Copy link
Copy Markdown

datadog-datadog-prod-us1 Bot commented Dec 8, 2025

⚠️ Tests

⚠️ Warnings

❄️ 3 New flaky tests detected

cypress@10.2.0 commonJS test management attempt to fix can mark tests as disabled and tests are not skipped from integration-tests/cypress/cypress.spec.js (Datadog)
Cannot read properties of undefined (reading 'content')
cypress@10.2.0 esm intelligent test runner can skip tests received by the intelligent test runner API and still reports code coverage from integration-tests/cypress/cypress.spec.js (Datadog)
Timeout
tests.debugger.test_debugger_expression_language.Test_Debugger_Expression_Language.test_expression_language_access_variables[express4] from system_tests_suite (Datadog)
AssertionError: The following probes were not found:
  log9edaf-f39d-436e-8154-b0da5941a6f4
  logc7807-addc-4efa-bc7e-6c6dd0423738
  log5bf29-d85d-4bc3-bcb7-f38512a14c8d
  log9e0c6-5770-4508-ae30-189f6e066a8f
  loga29e1-4bd2-4f1a-8894-f6b868de2d0f
  logd15fc-c0ab-4bb7-9350-8733450a34a8
  loga8883-5f4e-481a-ae07-f4da68b9dfd9
  log09baa-9dbc-4f6d-a257-cc595322f636
assert not {'log09baa-9dbc-4f6d-a257-cc595322f636', 'log5bf29-d85d-4bc3-bcb7-f38512a14c8d', 'log9e0c6-5770-4508-ae30-189f6e066a8f...edaf-f39d-436e-8154-b0da5941a6f4', 'loga29e1-4bd2-4f1a-8894-f6b868de2d0f', 'loga8883-5f4e-481a-ae07-f4da68b9dfd9', ...}
...

ℹ️ Info

🧪 All tests passed

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 494c262 | Docs | Datadog PR Page | Was this helpful? Give us feedback!

@pr-commenter
Copy link
Copy Markdown

pr-commenter Bot commented Dec 8, 2025

Benchmarks

Benchmark execution time: 2025-12-10 08:37:54

Comparing candidate commit 494c262 in PR branch BridgeAR/2025-12-08-fix-ws-event-wrapping with baseline commit 590ba8e in branch master.

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

The remove handler has to understand what method was originally
wrapped and remove the wrapped method. Otherwise it would still
exist and be triggered.

Fixes: #7025
@BridgeAR BridgeAR force-pushed the BridgeAR/2025-12-08-fix-ws-event-wrapping branch from b83b5c7 to 1111da7 Compare December 8, 2025 16:05
@BridgeAR BridgeAR marked this pull request as ready for review December 8, 2025 16:05
@BridgeAR BridgeAR requested review from a team as code owners December 8, 2025 16:05
@BridgeAR BridgeAR requested a review from crysmags December 8, 2025 16:05
Comment thread packages/datadog-instrumentations/src/ws.js Outdated
simon-id
simon-id previously approved these changes Dec 8, 2025
The instrumentation should be improved further for error handling
and preventing multiple message listeners creating individual spans.
@simon-id
Copy link
Copy Markdown
Member

I assume the CI failures are because of what happened yesterday so I'll update the branch and enable automerge

@simon-id simon-id enabled auto-merge (squash) December 10, 2025 08:23
@simon-id simon-id merged commit 31a2890 into master Dec 10, 2025
1157 of 1160 checks passed
@simon-id simon-id deleted the BridgeAR/2025-12-08-fix-ws-event-wrapping branch December 10, 2025 10:04
dd-octo-sts Bot pushed a commit that referenced this pull request Dec 11, 2025
* fix(ws): wrap event remove handler for message event removal

The remove handler has to understand what method was originally
wrapped and remove the wrapped method. Otherwise it would still
exist and be triggered.

Fixes: #7025

* fixup!

* chore: simplify code and add TODO comments

The instrumentation should be improved further for error handling
and preventing multiple message listeners creating individual spans.
@dd-octo-sts dd-octo-sts Bot mentioned this pull request Dec 11, 2025
BridgeAR added a commit that referenced this pull request Dec 17, 2025
* fix(ws): wrap event remove handler for message event removal

The remove handler has to understand what method was originally
wrapped and remove the wrapped method. Otherwise it would still
exist and be triggered.

Fixes: #7025

* fixup!

* chore: simplify code and add TODO comments

The instrumentation should be improved further for error handling
and preventing multiple message listeners creating individual spans.
nina9753 pushed a commit that referenced this pull request Dec 20, 2025
* fix(ws): wrap event remove handler for message event removal

The remove handler has to understand what method was originally
wrapped and remove the wrapped method. Otherwise it would still
exist and be triggered.

Fixes: #7025

* fixup!

* chore: simplify code and add TODO comments

The instrumentation should be improved further for error handling
and preventing multiple message listeners creating individual spans.
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.

[BUG]: ws instrumentation breaks removeListener

2 participants