From 72a5b9734f99608c3a65ca65cf8daeb06a574fc5 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Tue, 16 Aug 2022 17:05:25 +0200 Subject: [PATCH 1/4] beforeBreadcrumb was not adding the mutated breadcrumb --- CHANGELOG.md | 4 ++++ dart/lib/src/scope.dart | 2 +- dart/test/scope_test.dart | 18 ++++++++++++++++++ .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d788677e..1cd2cd100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixes + +* beforeBreadcrumb was not adding the mutated breadcrumb ([#966](https://github.com/getsentry/sentry-dart/pull/966)) + ### Features - Bump Cocoa SDK to v7.23.0 ([#968](https://github.com/getsentry/sentry-dart/pull/968)) diff --git a/dart/lib/src/scope.dart b/dart/lib/src/scope.dart index b62632f52..085282ef4 100644 --- a/dart/lib/src/scope.dart +++ b/dart/lib/src/scope.dart @@ -194,7 +194,7 @@ class Scope { _breadcrumbs.removeFirst(); } - _breadcrumbs.add(breadcrumb); + _breadcrumbs.add(processedBreadcrumb); return true; } diff --git a/dart/test/scope_test.dart b/dart/test/scope_test.dart index af23745f0..646abec4e 100644 --- a/dart/test/scope_test.dart +++ b/dart/test/scope_test.dart @@ -97,6 +97,20 @@ void main() { expect(sut.breadcrumbs.length, 0); }); + test('Executes and mutates $Breadcrumb', () { + final sut = fixture.getSut( + beforeBreadcrumbCallback: fixture.beforeBreadcrumbMutateCallback, + ); + + final breadcrumb = Breadcrumb( + message: 'message', + timestamp: DateTime.utc(2019), + ); + sut.addBreadcrumb(breadcrumb); + + expect(sut.breadcrumbs.first.message, 'new message'); + }); + test('adds $EventProcessor', () { final sut = fixture.getSut(); @@ -642,6 +656,10 @@ class Fixture { Breadcrumb? beforeBreadcrumbCallback(Breadcrumb? breadcrumb, {dynamic hint}) => null; + + Breadcrumb? beforeBreadcrumbMutateCallback(Breadcrumb? breadcrumb, + {dynamic hint}) => + breadcrumb?.copyWith(message: 'new message'); } class AddTagsEventProcessor extends EventProcessor { diff --git a/flutter/example/ios/Runner.xcodeproj/project.pbxproj b/flutter/example/ios/Runner.xcodeproj/project.pbxproj index 2b3fd59d3..de04697c4 100644 --- a/flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -160,7 +160,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1330; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 2852ce3ab..c87d15a33 100644 --- a/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 16 Aug 2022 17:05:48 +0200 Subject: [PATCH 2/4] fix id --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cd2cd100..24f9970c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Fixes -* beforeBreadcrumb was not adding the mutated breadcrumb ([#966](https://github.com/getsentry/sentry-dart/pull/966)) +* beforeBreadcrumb was not adding the mutated breadcrumb ([#982](https://github.com/getsentry/sentry-dart/pull/982)) ### Features From 68fb0ce2e33152965df38cf2c1ccd206ff3ad5a0 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Wed, 17 Aug 2022 09:37:33 +0200 Subject: [PATCH 3/4] fix test --- dart/test/http_client/tracing_client_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dart/test/http_client/tracing_client_test.dart b/dart/test/http_client/tracing_client_test.dart index 8e724d3e9..163629dbd 100644 --- a/dart/test/http_client/tracing_client_test.dart +++ b/dart/test/http_client/tracing_client_test.dart @@ -154,7 +154,7 @@ class Fixture { MockClient getClient({int statusCode = 200, String? reason}) { return MockClient((request) async { expect(request.url, requestUri); - return Response('', statusCode, reasonPhrase: reason); + return Response('', statusCode, reasonPhrase: reason, request: request); }); } } From 8fbeb717a9523ab5fd215e4c09ccfdc79ccd1cf6 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Wed, 17 Aug 2022 10:33:45 +0200 Subject: [PATCH 4/4] add missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24f9970c7..e3017627d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixes +* Scope.clone incorrectly accesses tags ([#978](https://github.com/getsentry/sentry-dart/pull/978)) * beforeBreadcrumb was not adding the mutated breadcrumb ([#982](https://github.com/getsentry/sentry-dart/pull/982)) ### Features