Skip to content

Upgrade symbolic fork with merged upstream/master (12.17.0)#6

Merged
buranmert merged 124 commits intoDataDog:dd_masterfrom
jhssilva:dd_master
Dec 9, 2025
Merged

Upgrade symbolic fork with merged upstream/master (12.17.0)#6
buranmert merged 124 commits intoDataDog:dd_masterfrom
jhssilva:dd_master

Conversation

@jhssilva
Copy link
Copy Markdown
Collaborator

@jhssilva jhssilva commented Nov 25, 2025

What?

This PR updates the Datadog symbolic fork by merging the latest changes from
getsentry/symbolic master into our dd_master branch.

How?

Key updates:

  • Upstream version bumped to 12.17.0 and synced to dd_master as 12.17.0-dd
  • All Cargo.toml conflicts resolved (kept Datadog-specific patches & features)
  • Regenerated Cargo.lock through cargo update
  • Updated symbolic workspace to track the merged upstream changes

Notes

Sentry js-source-scopes it's incompatible with cws_core 8.1.1 (due to using a old version of cws)

  • Currently the sentry js-source-scopes it's incompatible with cws_core Sentry PR#30
image

Options discussed

  • Remove the js-source-scopes ; symbolic-sourcemapcache from symbolic-cabi from the project as we aren't levering.
  • Point the js-source-scopes to master branch with the fix, while there isn't a new release.

Test [fails](container::tests::test_parse_invalid_input)

image

Python tests

  • Python test weren't executed.

Next steps:

  • After merging this PR, dd-source can be updated to point to this new dd_master
    branch for the symbolic dependency.

Jira

getsentry-bot and others added 30 commits June 7, 2024 11:54
The `zip` crate was released by now with a fix for large >64k file archives.
This unpins that crate, and does a `cargo update` for good measure.
* feat(sourcebundle): Add callback to handle skipped files

Add a callback to SourceBundleWriter that is called every time we skip adding a file to the bundle due to a ReadFailed error.

Closes getsentry#863

* fix(sourcebundle): Skip all invalid sources

getsentry#861 missed another spot where the ReadFailed error can cause the write function to fail; this commit fixes that.

Fixes getsentry#860

* meta: Update changelog

* apply suggestions from code review

Co-authored-by: Jan Michael Auer <jan.auer@sentry.io>

---------

Co-authored-by: Jan Michael Auer <jan.auer@sentry.io>
Sorting algorithms in std should be fast enough now.
While we're at it, we're also replacing some unstable sorts
with stable ones.
We have seen FDEs with an initial address of u64::MAX in user-provided DWARF files. Such FDEs will invariably fail to process because of either an address overflow error in gimli or an underflow in the length calculation in line 756. Therefore, we skip them immediately so we don't abort the processing of the entire file.
…#849)" (getsentry#870)

This reverts the "feature part" of commit 7dc28dd (getsentry#849). The dep updates can stay.

Unfortunately opening a debug session to check for the presence of sources is prohibitively expensive in terms of memory (going from ~450MB to ~3.7GB in a Python process that calls Object.features on an example 1.3GB file). In order to support this we'll have to find a more parsimonious way to check if a file contains sources.
This adjusts discover_sourcemap_embedded_debug_id so that it finds debug IDs at both "debug_id" and "debugId".
…#877)

Using an alias causes deserialization to fail when
both keys are set. Therefore we now read both fields
and implement the logic explicitly.
@jhssilva
Copy link
Copy Markdown
Collaborator Author

jhssilva commented Dec 4, 2025

/merge

@dd-devflow-routing-codex
Copy link
Copy Markdown

dd-devflow-routing-codex bot commented Dec 4, 2025

View all feedbacks in Devflow UI.

2025-12-04 18:01:55 UTC ℹ️ Start processing command /merge


2025-12-04 18:01:59 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in dd_master is approximately 0s (p90).


2025-12-04 20:02:14 UTCMergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build 0 took longer than expected. The current limit for the base branch 'dd_master' is 120 minutes.

@jhssilva
Copy link
Copy Markdown
Collaborator Author

jhssilva commented Dec 8, 2025

/merge

@dd-devflow-routing-codex
Copy link
Copy Markdown

dd-devflow-routing-codex bot commented Dec 8, 2025

View all feedbacks in Devflow UI.

2025-12-08 08:54:36 UTC ℹ️ Start processing command /merge


2025-12-08 08:54:40 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in dd_master is approximately 0s (p90).


2025-12-08 10:54:54 UTCMergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build 0 took longer than expected. The current limit for the base branch 'dd_master' is 120 minutes.

@jhssilva
Copy link
Copy Markdown
Collaborator Author

jhssilva commented Dec 9, 2025

/merge

@dd-devflow-routing-codex
Copy link
Copy Markdown

dd-devflow-routing-codex bot commented Dec 9, 2025

View all feedbacks in Devflow UI.

2025-12-09 07:36:27 UTC ℹ️ Start processing command /merge


2025-12-09 07:36:31 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in dd_master is approximately 0s (p90).


2025-12-09 09:36:46 UTCMergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build 0 took longer than expected. The current limit for the base branch 'dd_master' is 120 minutes.

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.