Skip to content

Commit 0fad3b0

Browse files
committed
Merge branch 'main' into feat/replay-tags
2 parents dd2d8f2 + dfcfde9 commit 0fad3b0

File tree

13 files changed

+59
-14
lines changed

13 files changed

+59
-14
lines changed

.github/workflows/flutter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112

113113
steps:
114114
- uses: actions/checkout@v4
115-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # pin@v2.16.0
115+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
116116
with:
117117
channel: main
118118
- run: flutter upgrade

.github/workflows/flutter_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
chrome-version: stable
179179
- run: chrome --version
180180

181-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # pin@v2.16.0
181+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
182182
with:
183183
channel: ${{ matrix.sdk }}
184184

.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@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
22+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
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@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
19+
- uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # pin@v1.213.0
2020
with:
2121
ruby-version: '2.7.5'
2222
bundler-cache: true

CHANGELOG.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,25 @@
77
- Add SentryReplayQuality setting (`options.experimental.replay.quality`) ([#2582](https://github.com/getsentry/sentry-dart/pull/2582))
88
- SPM Support ([#2280](https://github.com/getsentry/sentry-dart/pull/2280))
99

10+
### Enhancements
11+
12+
- Print a warning if the rate limit was reached ([#2595](https://github.com/getsentry/sentry-dart/pull/2595))
13+
14+
### Fixes
15+
16+
- WASM compat for Drift ([#2580](https://github.com/getsentry/sentry-dart/pull/2580))
17+
1018
### Dependencies
1119

12-
- Bump Native SDK from v0.7.17 to v0.7.18 ([#2578](https://github.com/getsentry/sentry-dart/pull/2578))
13-
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0718)
14-
- [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.18)
20+
- Bump Native SDK from v0.7.17 to v0.7.19 ([#2578](https://github.com/getsentry/sentry-dart/pull/2578), [#2588](https://github.com/getsentry/sentry-dart/pull/2588))
21+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719)
22+
- [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.19)
23+
- Bump Android SDK from v7.20.0 to v7.20.1 ([#2593](https://github.com/getsentry/sentry-dart/pull/2593))
24+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7201)
25+
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.0...7.20.1)
26+
- Bump Cocoa SDK from v8.43.0 to v8.44.0-beta.1 ([#2598](https://github.com/getsentry/sentry-dart/pull/2598))
27+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8440-beta1)
28+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.43.0...8.44.0-beta.1)
1529

1630
## 8.13.0-beta.1
1731

dart/lib/src/dart_exception_type_identifier.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import 'package:http/http.dart' show ClientException;
21
import 'dart:async' show TimeoutException, AsyncError, DeferredLoadException;
3-
import '../sentry.dart';
42

3+
import 'package:http/http.dart' show ClientException;
4+
5+
import '../sentry.dart';
56
import 'dart_exception_type_identifier_io.dart'
6-
if (dart.library.html) 'dart_exception_type_identifier_web.dart';
7+
if (dart.library.html) 'dart_exception_type_identifier_web.dart'
8+
if (dart.library.js_interop) 'dart_exception_type_identifier_web.dart';
79

810
class DartExceptionTypeIdentifier implements ExceptionTypeIdentifier {
911
@override

dart/lib/src/transport/http_transport.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ class HttpTransport implements Transport {
5050
if (response.statusCode == 200) {
5151
return _parseEventId(response);
5252
}
53+
if (response.statusCode == 429) {
54+
_options.logger(
55+
SentryLevel.warning, 'Rate limit reached, failed to send envelope');
56+
}
5357
return SentryId.empty();
5458
}
5559

dart/test/transport/http_transport_test.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ void main() {
8383
expect(mockRateLimiter.errorCode, 429);
8484
expect(mockRateLimiter.retryAfterHeader, '1');
8585
expect(mockRateLimiter.sentryRateLimitHeader, isNull);
86+
87+
expect(fixture.loggedLevel, SentryLevel.warning);
88+
expect(
89+
fixture.loggedMessage, 'Rate limit reached, failed to send envelope');
8690
});
8791

8892
test('sentryRateLimitHeader', () async {
@@ -207,6 +211,10 @@ void main() {
207211
await sut.send(envelope);
208212

209213
expect(fixture.clientReportRecorder.discardedEvents.isEmpty, isTrue);
214+
215+
expect(fixture.loggedLevel, SentryLevel.warning);
216+
expect(
217+
fixture.loggedMessage, 'Rate limit reached, failed to send envelope');
210218
});
211219

212220
test('does record lost event for error >= 500', () async {
@@ -237,6 +245,8 @@ class Fixture {
237245
late var clientReportRecorder = MockClientReportRecorder();
238246

239247
HttpTransport getSut(http.Client client, RateLimiter rateLimiter) {
248+
options.debug = true;
249+
options.logger = mockLogger;
240250
options.httpClient = client;
241251
options.recorder = clientReportRecorder;
242252
options.clock = () {
@@ -254,4 +264,18 @@ class Fixture {
254264
final tracer = SentryTracer(context, MockHub());
255265
return SentryTransaction(tracer);
256266
}
267+
268+
SentryLevel? loggedLevel;
269+
String? loggedMessage;
270+
271+
void mockLogger(
272+
SentryLevel level,
273+
String message, {
274+
String? logger,
275+
Object? exception,
276+
StackTrace? stackTrace,
277+
}) {
278+
loggedLevel = level;
279+
loggedMessage = message;
280+
}
257281
}

flutter/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ android {
6060
}
6161

6262
dependencies {
63-
api 'io.sentry:sentry-android:7.20.0'
63+
api 'io.sentry:sentry-android:7.20.1'
6464
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
6565

6666
// Required -- JUnit 4 framework

flutter/ios/sentry_flutter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Sentry SDK for Flutter with support to native through sentry-cocoa.
1616
:tag => s.version.to_s }
1717
s.source_files = 'sentry_flutter/Sources/**/*'
1818
s.public_header_files = 'sentry_flutter/Sources/**/*.h'
19-
s.dependency 'Sentry/HybridSDK', '8.43.0'
19+
s.dependency 'Sentry/HybridSDK', '8.44.0-beta.1'
2020
s.ios.dependency 'Flutter'
2121
s.osx.dependency 'FlutterMacOS'
2222
s.ios.deployment_target = '12.0'

flutter/ios/sentry_flutter/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
.library(name: "sentry-flutter", targets: ["sentry_flutter", "sentry_flutter_objc"])
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.43.0")
16+
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.44.0-beta.1")
1717
],
1818
targets: [
1919
.target(

flutter/scripts/update-cocoa.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ get-repo)
5151
set-version)
5252
set_podspec_version "$2"
5353
set_spm_version "$2"
54+
../scripts/generate-cocoa-bindings.sh "$2"
5455
;;
5556
*)
5657
echo "Unknown argument $1"

flutter/sentry-native/CMakeCache.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Basically, this is a properties file we use both in CMake and update-deps.yml to update dependencies.
33

44
repo=https://github.com/getsentry/sentry-native
5-
version=0.7.18
5+
version=0.7.19

0 commit comments

Comments
 (0)