Skip to content

Commit 7f8043c

Browse files
committed
Merge branch 'main' into v9
# Conflicts: # flutter/lib/src/renderer/html_renderer.dart # flutter/test/mocks.mocks.dart
2 parents 245c0d3 + 3b5a71f commit 7f8043c

12 files changed

+52
-7
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 🐞 Bug Report
22
description: Tell us about something that's not working the way we (probably) intend.
33
labels: ["Platform: Dart", "bug"]
4+
type: Bug
45
body:
56
- type: dropdown
67
id: environment
@@ -94,7 +95,7 @@ body:
9495
id: submit-a-pr
9596
attributes:
9697
label: Are you willing to submit a PR?
97-
description: We accept contributions!
98+
description: We accept contributions!
9899
options:
99100
- "Yes"
100101
- "No"

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 💡 Feature Request
22
description: Tell us about a problem our SDK could solve but doesn't.
33
labels: ["Platform: Dart", "enhancement"]
4+
type: Feature
45
body:
56
- type: textarea
67
id: problem
@@ -24,7 +25,7 @@ body:
2425
id: submit-a-pr
2526
attributes:
2627
label: Are you willing to submit a PR?
27-
description: We accept contributions!
28+
description: We accept contributions!
2829
options:
2930
- "Yes"
3031
- "No"

.github/workflows/analyze.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
if: ${{ inputs.sdk == 'flutter' }}
3939

4040
- run: ${{ inputs.sdk }} pub get
41+
- run: ${{ inputs.sdk }} pub get
42+
if: ${{ inputs.package == 'flutter' }}
43+
working-directory: flutter/microbenchmarks
4144
- run: dart format --set-exit-if-changed ./
4245

4346
- name: dart analyze

.github/workflows/flutter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,6 @@ jobs:
180180
steps:
181181
- uses: actions/checkout@v4
182182
# To recreate baseline run: detekt -i flutter/android,flutter/example/android -b flutter/config/detekt-bl.xml -cb
183-
- uses: natiginfo/action-detekt-all@6bf4342ea96f638ecced05cf7d7dc48acdecc854 # [email protected].7
183+
- uses: natiginfo/action-detekt-all@45229fbbe47eaff1160b6c956d7ffe14dc23c206 # [email protected].8
184184
with:
185185
args: -i flutter/android,flutter/example/android --baseline flutter/config/detekt-bl.xml --jvm-target 1.8 --build-upon-default-config --all-rules

.github/workflows/min_version_test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ jobs:
5555
with:
5656
flutter-version: "3.24.0"
5757

58+
- uses: ruby/setup-ruby@277ba2a127aba66d45bad0fa2dc56f80dbfedffa # [email protected]
59+
with:
60+
ruby-version: '3.1.2' # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125
61+
62+
- name: Update Pods
63+
run: sudo gem update
5864
- name: Build iOS
5965
run: |
6066
cd min_version_test

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
22+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/testflight.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # [email protected]
1818
- run: xcodes select 15.0.1
19-
- uses: ruby/setup-ruby@32110d4e311bd8996b2a82bf2a43b714ccc91777 # pin@v1.221.0
19+
- uses: ruby/setup-ruby@277ba2a127aba66d45bad0fa2dc56f80dbfedffa # pin@v1.222.0
2020
with:
2121
ruby-version: '2.7.5'
2222
bundler-cache: true

.github/workflows/web-example-ghpages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # [email protected]
18-
- uses: bluefireteam/flutter-gh-pages@57815b17b371455ec1a98f075b71b4c6ba0a938c # pin@v8
18+
- uses: bluefireteam/flutter-gh-pages@cf4a9312849577dbfd9df8f3d63d12ef6b09898e # pin@v9
1919
with:
2020
workingDir: flutter/example
2121
customArgs: --source-maps

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
- Bump Android SDK from v7.20.1 to v8.1.0 ([#2650](https://github.com/getsentry/sentry-dart/pull/2650))
4040
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#810)
4141
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.1.0)
42+
## Unreleased
43+
44+
### Fixes
45+
46+
- Pass missing `captureFailedRequests` param to `FailedRequestInterceptor` ([#2744](https://github.com/getsentry/sentry-dart/pull/2744))
4247

4348
## 8.14.0-beta.1
4449

@@ -97,13 +102,21 @@ final db = AppDatabase(executor);
97102

98103
## 8.13.2
99104

105+
> [!WARNING]
106+
> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 8.12.0 if you use this feature on Android.
107+
> See issue [#2769](https://github.com/getsentry/sentry-dart/issues/2769) for more details.
108+
100109
### Fixes
101110

102111
- `build_web_compiler` error ([#2736](https://github.com/getsentry/sentry-dart/pull/2736))
103112
- Use `if (dart.library.html)` instead of `if (dart.html)` for imports
104113

105114
## 8.13.1
106115

116+
> [!WARNING]
117+
> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 8.12.0 if you use this feature on Android.
118+
> See issue [#2769](https://github.com/getsentry/sentry-dart/issues/2769) for more details.
119+
107120
### Fixes
108121

109122
- Replay video interruption if a `navigation` breadcrumb is missing `to` route info ([#2720](https://github.com/getsentry/sentry-dart/pull/2720))
@@ -116,6 +129,10 @@ final db = AppDatabase(executor);
116129

117130
## 8.13.0
118131

132+
> [!WARNING]
133+
> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 8.12.0 if you use this feature on Android.
134+
> See issue [#2769](https://github.com/getsentry/sentry-dart/issues/2769) for more details.
135+
119136
### Breaking changes
120137

121138
- Remove Metrics API ([#2571](https://github.com/getsentry/sentry-dart/pull/2571))

dio/lib/src/sentry_dio_extension.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ extension SentryDioExtension on Dio {
8080
interceptors.insert(
8181
0,
8282
FailedRequestInterceptor(
83+
hub: hub,
8384
failedRequestStatusCodes: failedRequestStatusCodes,
8485
failedRequestTargets: failedRequestTargets,
86+
captureFailedRequests: captureFailedRequests,
8587
),
8688
);
8789
// ignore: invalid_use_of_internal_member

dio/test/sentry_dio_extension_test.dart

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import 'package:sentry_dio/src/sentry_transformer.dart';
1111
import 'package:sentry_dio/src/version.dart';
1212
import 'package:test/test.dart';
1313

14+
import 'failed_request_interceptor_test.dart';
1415
import 'mocks/mock_hub.dart';
1516

1617
void main() {
@@ -90,6 +91,18 @@ void main() {
9091
dio.interceptors.whereType<FailedRequestInterceptor>().length,
9192
1,
9293
);
94+
95+
final interceptor =
96+
dio.interceptors.whereType<FailedRequestInterceptor>().first;
97+
98+
final requestOptions = RequestOptions(path: 'https://example.com');
99+
final error = DioError(
100+
requestOptions: requestOptions,
101+
response: Response(statusCode: 500, requestOptions: requestOptions),
102+
);
103+
interceptor.onError(error, fixture.errorInterceptorHandler);
104+
105+
expect(fixture.hub.captureExceptionCalls.length, 1);
93106
});
94107

95108
test('addSentry does not add $FailedRequestInterceptor if override false',
@@ -184,6 +197,8 @@ void main() {
184197

185198
class Fixture {
186199
final MockHub hub = MockHub();
200+
final errorInterceptorHandler = MockedErrorInterceptorHandler();
201+
187202
Dio getSut() {
188203
return Dio();
189204
}

metrics/flutter.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = 3.27.4
1+
version = 3.29.1
22
repo = https://github.com/flutter/flutter

0 commit comments

Comments
 (0)