Skip to content

Commit 48a9615

Browse files
authored
v9: Remove other from SentryRequest (#2879)
* Deprecate other * UpdatE * Fix test * Update CHANGELOG * Fix test * Update
1 parent ce96bb0 commit 48a9615

6 files changed

Lines changed: 21 additions & 46 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ await SentryFlutter.init(
4545
### API Changes
4646

4747
- Update naming of `LoadImagesListIntegration` to `LoadNativeDebugImagesIntegration` ([#2833](https://github.com/getsentry/sentry-dart/pull/2833))
48+
- Remove `other` from `SentryRequest` ([#2879](https://github.com/getsentry/sentry-dart/pull/2879))
4849

4950
### Dependencies
5051

dart/lib/src/http_client/failed_request_client.dart

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import 'package:http/http.dart';
2+
23
import '../hint.dart';
3-
import '../type_check_hint.dart';
4-
import '../utils/tracing_utils.dart';
5-
import 'sentry_http_client_error.dart';
6-
import '../protocol.dart';
74
import '../hub.dart';
85
import '../hub_adapter.dart';
6+
import '../protocol.dart';
97
import '../throwable_mechanism.dart';
8+
import '../type_check_hint.dart';
9+
import '../utils/tracing_utils.dart';
1010
import 'sentry_http_client.dart';
11+
import 'sentry_http_client_error.dart';
1112

1213
/// A [http](https://pub.dev/packages/http)-package compatible HTTP client
1314
/// which records events for failed requests.
@@ -177,11 +178,6 @@ class FailedRequestClient extends BaseClient {
177178
headers: _hub.options.sendDefaultPii ? request.headers : null,
178179
uri: request.url,
179180
data: _hub.options.sendDefaultPii ? _getDataFromRequest(request) : null,
180-
// ignore: deprecated_member_use_from_same_package
181-
other: {
182-
'content_length': request.contentLength.toString(),
183-
'duration': requestDuration.toString(),
184-
},
185181
);
186182

187183
final mechanism = Mechanism(

dart/lib/src/protocol/sentry_request.dart

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:meta/meta.dart';
2-
import 'access_aware_map.dart';
32

4-
import '../utils/iterable_utils.dart';
53
import '../utils/http_sanitizer.dart';
4+
import '../utils/iterable_utils.dart';
5+
import 'access_aware_map.dart';
66

77
/// The Request interface contains information on a HTTP request related to the event.
88
/// In client SDKs, this can be an outgoing request, or the request that rendered the current web page.
@@ -58,11 +58,6 @@ class SentryRequest {
5858
/// This is where information such as CGI/WSGI/Rack keys go that are not HTTP headers.
5959
Map<String, String> get env => Map.unmodifiable(_env ?? const {});
6060

61-
Map<String, String>? _other;
62-
63-
@Deprecated('Will be removed in v8. Use [data] instead')
64-
Map<String, String> get other => Map.unmodifiable(_other ?? const {});
65-
6661
/// The fragment of the request URL.
6762
String? fragment;
6863

@@ -86,8 +81,6 @@ class SentryRequest {
8681
dynamic data,
8782
Map<String, String>? headers,
8883
Map<String, String>? env,
89-
@Deprecated('Will be removed in v8. Use [data] instead')
90-
Map<String, String>? other,
9184
this.unknown,
9285
}) : _data = data,
9386
_headers = headers != null ? Map.from(headers) : null,
@@ -97,8 +90,7 @@ class SentryRequest {
9790
headers?.entries,
9891
(MapEntry<String, String> e) => e.key.toLowerCase() == 'cookie',
9992
)?.value,
100-
_env = env != null ? Map.from(env) : null,
101-
_other = other != null ? Map.from(other) : null;
93+
_env = env != null ? Map.from(env) : null;
10294

10395
factory SentryRequest.fromUri({
10496
required Uri uri,
@@ -108,8 +100,6 @@ class SentryRequest {
108100
Map<String, String>? headers,
109101
Map<String, String>? env,
110102
String? apiTarget,
111-
@Deprecated('Will be removed in v8. Use [data] instead')
112-
Map<String, String>? other,
113103
}) {
114104
final request = SentryRequest(
115105
url: uri.toString(),
@@ -121,7 +111,6 @@ class SentryRequest {
121111
queryString: uri.query,
122112
fragment: uri.fragment,
123113
// ignore: deprecated_member_use_from_same_package
124-
other: other,
125114
apiTarget: apiTarget,
126115
);
127116
request.sanitize();
@@ -139,8 +128,6 @@ class SentryRequest {
139128
data: json['data'],
140129
headers: json.containsKey('headers') ? Map.from(json['headers']) : null,
141130
env: json.containsKey('env') ? Map.from(json['env']) : null,
142-
// ignore: deprecated_member_use_from_same_package
143-
other: json.containsKey('other') ? Map.from(json['other']) : null,
144131
fragment: json['fragment'],
145132
apiTarget: json['api_target'],
146133
unknown: json.notAccessed(),
@@ -158,8 +145,6 @@ class SentryRequest {
158145
if (cookies != null) 'cookies': cookies,
159146
if (headers.isNotEmpty) 'headers': headers,
160147
if (env.isNotEmpty) 'env': env,
161-
// ignore: deprecated_member_use_from_same_package
162-
if (other.isNotEmpty) 'other': other,
163148
if (fragment != null) 'fragment': fragment,
164149
if (apiTarget != null) 'api_target': apiTarget,
165150
};
@@ -177,8 +162,6 @@ class SentryRequest {
177162
Map<String, String>? env,
178163
bool removeCookies = false,
179164
String? apiTarget,
180-
@Deprecated('Will be removed in v8. Use [data] instead')
181-
Map<String, String>? other,
182165
}) =>
183166
SentryRequest(
184167
url: url ?? this.url,
@@ -190,8 +173,6 @@ class SentryRequest {
190173
env: env ?? _env,
191174
fragment: fragment ?? this.fragment,
192175
apiTarget: apiTarget ?? this.apiTarget,
193-
// ignore: deprecated_member_use_from_same_package
194-
other: other ?? _other,
195176
unknown: unknown,
196177
);
197178
}

dart/test/http_client/failed_request_client_test.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ void main() {
6262
expect(request?.fragment, 'myFragment');
6363
expect(request?.cookies, isNull);
6464
expect(request?.headers, {});
65-
// ignore: deprecated_member_use_from_same_package
66-
expect(request?.other.keys.contains('duration'), true);
67-
// ignore: deprecated_member_use_from_same_package
68-
expect(request?.other.keys.contains('content_length'), true);
6965

7066
// Response is not captured in case of exception
7167
expect(eventCall.contexts.response, isNull);
@@ -174,10 +170,6 @@ void main() {
174170
expect(request?.fragment, 'myFragment');
175171
expect(request?.cookies, isNull);
176172
expect(request?.headers, {});
177-
// ignore: deprecated_member_use_from_same_package
178-
expect(request?.other.keys.contains('duration'), true);
179-
// ignore: deprecated_member_use_from_same_package
180-
expect(request?.other.keys.contains('content_length'), true);
181173

182174
final response = eventCall.contexts.response!;
183175
expect(response.bodySize, 3);

dart/test/protocol/sentry_request_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ void main() {
1414
headers: {'header_key': 'header_value'},
1515
env: {'env_key': 'env_value'},
1616
apiTarget: 'GraphQL',
17-
// ignore: deprecated_member_use_from_same_package
18-
other: {'other_key': 'other_value'},
1917
unknown: testUnknown,
2018
);
2119

@@ -28,7 +26,6 @@ void main() {
2826
'headers': {'header_key': 'header_value'},
2927
'env': {'env_key': 'env_value'},
3028
'api_target': 'GraphQL',
31-
'other': {'other_key': 'other_value'},
3229
};
3330
sentryRequestJson.addAll(testUnknown);
3431

flutter/lib/src/screenshot/screenshot.dart

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:async';
22
import 'dart:developer';
33
import 'dart:ui';
4-
// ignore: unnecessary_import // backcompatibility for Flutter < 3.3
5-
import 'dart:typed_data';
64

75
import 'package:flutter/foundation.dart';
86
import 'package:meta/meta.dart';
@@ -18,7 +16,12 @@ class Screenshot {
1816

1917
Screenshot(this._image, this.timestamp, this.flow);
2018
Screenshot._cloned(
21-
this._image, this.timestamp, this.flow, this._rawRgbaData, this._pngData);
19+
this._image,
20+
this.timestamp,
21+
this.flow,
22+
this._rawRgbaData,
23+
this._pngData,
24+
);
2225

2326
int get width => _image.width;
2427
int get height => _image.height;
@@ -52,7 +55,12 @@ class Screenshot {
5255
Screenshot clone() {
5356
assert(!_disposed, 'Cannot clone a disposed screenshot');
5457
return Screenshot._cloned(
55-
_image.clone(), timestamp, flow, _rawRgbaData, _pngData);
58+
_image.clone(),
59+
timestamp,
60+
flow,
61+
_rawRgbaData,
62+
_pngData,
63+
);
5664
}
5765

5866
void dispose() {

0 commit comments

Comments
 (0)