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.

Sign up for GitHub

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

Jump to bottom

fix: Keep PropagationContext when cloning scope #4518

Merged
merged 2 commits into from
Nov 8, 2024
Merged

fix: Keep PropagationContext when cloning scope #4518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188fbed
fix: Keep PropagationContext when cloning scope
philipphofmann Nov 7, 2024
ade1087
make readonly
philipphofmann Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Keep PropagationContext when cloning scope (#4518)

## 8.40.1

### Fixes
Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/SentryScope.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ - (instancetype)initWithScope:(SentryScope *)scope
[_fingerprintArray addObjectsFromArray:[scope fingerprints]];
[_attachmentArray addObjectsFromArray:[scope attachments]];

self.propagationContext = [[SentryPropagationContext alloc] init];
self.propagationContext = scope.propagationContext;
philipphofmann marked this conversation as resolved.
Show resolved Hide resolved
self.maxBreadcrumbs = scope.maxBreadcrumbs;
self.userObject = scope.userObject.copy;
self.distString = scope.distString;
Expand Down
2 changes: 2 additions & 0 deletions Tests/SentryTests/SentryScopeSwiftTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ class SentryScopeSwiftTests: XCTestCase {

let cloned = Scope(scope: scope)
XCTAssertEqual(try XCTUnwrap(cloned.serialize() as? [String: AnyHashable]), snapshot)
XCTAssertEqual(scope.propagationContext.spanId, cloned.propagationContext.spanId)
XCTAssertEqual(scope.propagationContext.traceId, cloned.propagationContext.traceId)

let (event1, event2) = (Event(), Event())
(event1.timestamp, event2.timestamp) = (fixture.date, fixture.date)
Expand Down
Loading