Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6a35dad
Move to local dependency
vishnukvmd May 28, 2022
1ba4085
Pass DSN within the SentryEnvelopeHeader
vishnukvmd May 28, 2022
a6fb6c0
Switch to remote dependency as an override is already declared
vishnukvmd Jun 14, 2022
152d32a
Merge branch 'main' into sentry_tunnel
ua741 Sep 27, 2022
3502ee4
Fix broken tests
ua741 Sep 27, 2022
bd69848
Fix test
ua741 Sep 28, 2022
93b03da
fix lint
marandaneto Oct 7, 2022
a6310cb
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
7534e82
fix
marandaneto Oct 7, 2022
647697c
fix tests
marandaneto Oct 7, 2022
0cb505d
pr id
marandaneto Oct 7, 2022
4f8a29c
pr id
marandaneto Oct 7, 2022
441d14f
add tests
marandaneto Oct 7, 2022
7dc6ab3
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
52265fe
fix
marandaneto Oct 7, 2022
78b8b57
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
65df091
Merge branch 'sentry_tunnel' of github.com:getsentry/sentry-dart into…
marandaneto Oct 7, 2022
06fc8cf
remove
marandaneto Oct 7, 2022
64c803f
fix
marandaneto Oct 7, 2022
fa35f2e
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
614334e
move bytes to file
marandaneto Oct 7, 2022
3b552e2
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
0742cde
Merge branch 'sentry_tunnel' of github.com:getsentry/sentry-dart into…
marandaneto Oct 7, 2022
9cd0ac9
test
marandaneto Oct 7, 2022
a33faf9
Merge branch 'main' into sentry_tunnel
marandaneto Oct 7, 2022
a0ef68c
lf fix
marandaneto Oct 7, 2022
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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
marandaneto committed Oct 7, 2022
commit 647697cab8575776e80f1993e0f86041adf1ca82
2 changes: 2 additions & 0 deletions dart/lib/src/sentry_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ class SentryClient {
final envelope = SentryEnvelope.fromTransaction(
preparedTransaction,
_options.sdk,
dsn: _options.dsn,
traceContext: traceContext,
attachments: attachments,
);
Expand All @@ -337,6 +338,7 @@ class SentryClient {
final envelope = SentryEnvelope.fromUserFeedback(
userFeedback,
_options.sdk,
dsn: _options.dsn,
);
return _attachClientReportsAndSend(envelope);
}
Expand Down
11 changes: 8 additions & 3 deletions dart/lib/src/sentry_envelope.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,16 @@ class SentryEnvelope {

factory SentryEnvelope.fromUserFeedback(
SentryUserFeedback feedback,
SdkVersion sdkVersion,
) {
SdkVersion sdkVersion, {
String? dsn,
}) {
return SentryEnvelope(
// no need for [traceContext]
SentryEnvelopeHeader(feedback.eventId, sdkVersion),
SentryEnvelopeHeader(
feedback.eventId,
sdkVersion,
dsn: dsn,
),
[SentryEnvelopeItem.fromUserFeedback(feedback)],
);
}
Expand Down
2 changes: 2 additions & 0 deletions dart/test/sentry_envelope_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:sentry/src/sentry_tracer.dart';
import 'package:sentry/src/utils.dart';
import 'package:test/test.dart';

import 'mocks.dart';
import 'mocks/mock_hub.dart';

void main() {
Expand Down Expand Up @@ -107,6 +108,7 @@ void main() {
final sut = SentryEnvelope.fromTransaction(
tr,
sdkVersion,
dsn: fakeDsn,
traceContext: traceContext,
);

Expand Down
52 changes: 52 additions & 0 deletions dart/test/sentry_envelope_vm_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import 'package:sentry/src/sentry_envelope_header.dart';
import 'package:sentry/src/sentry_envelope_item_header.dart';
import 'package:test/test.dart';

import 'mocks.dart';

void main() {
group('SentryEnvelopeItem', () {
test('item with binary payload', () async {
Expand Down Expand Up @@ -53,6 +55,7 @@ void main() {
final envelope = SentryEnvelope.fromEvent(
event,
sdkVersion,
dsn: fakeDsn,
attachments: [attachment],
);

Expand Down Expand Up @@ -142,6 +145,55 @@ final envelopeBinaryData = [
34,
34,
125,
44,
34,
100,
115,
110,
34,
58,
34,
104,
116,
116,
112,
115,
58,
47,
47,
97,
98,
99,
64,
100,
101,
102,
46,
105,
110,
103,
101,
115,
116,
46,
115,
101,
110,
116,
114,
121,
46,
105,
111,
47,
49,
50,
51,
52,
53,
54,
55,
34,
125,
10,
123,
Expand Down
1 change: 1 addition & 0 deletions dart/test/sentry_user_feedback_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ void main() {
final envelope = SentryEnvelope.fromUserFeedback(
feedback,
SdkVersion(name: 'a', version: 'b'),
dsn: fakeDsn,
);

expect(envelope.items.length, 1);
Expand Down
49 changes: 31 additions & 18 deletions dart/test/transport/http_transport_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ void main() {
final sut = fixture.getSut(httpMock, mockRateLimiter);

final sentryEvent = SentryEvent();
final fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(
sentryEvent, fixture.options.sdk,
dsn: fakeDsn);
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

final envelopeData = <int>[];
Expand All @@ -95,10 +96,11 @@ void main() {
final sut = fixture.getSut(httpMock, mockRateLimiter);

final sentryEvent = SentryEvent();
final fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(
sentryEvent, fixture.options.sdk,
dsn: fakeDsn);
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
final eventId = await sut.send(envelope);

expect(eventId, SentryId.empty());
Expand All @@ -121,10 +123,11 @@ void main() {
final sut = fixture.getSut(httpMock, mockRateLimiter);

final sentryEvent = SentryEvent();
final fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(
sentryEvent, fixture.options.sdk,
dsn: fakeDsn);
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

expect(mockRateLimiter.envelopeToFilter?.header.eventId,
Expand All @@ -144,10 +147,11 @@ void main() {
final sut = fixture.getSut(httpMock, mockRateLimiter);

final sentryEvent = SentryEvent();
final fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(
sentryEvent, fixture.options.sdk,
dsn: fakeDsn);
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

expect(mockRateLimiter.errorCode, 200);
Expand All @@ -171,8 +175,11 @@ void main() {
final sut = fixture.getSut(httpMock, MockRateLimiter());

final sentryEvent = SentryEvent();
final envelope =
SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk);
final envelope = SentryEnvelope.fromEvent(
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

expect(fixture.clientReportRecorder.reason, DiscardReason.networkError);
Expand All @@ -186,8 +193,11 @@ void main() {
final sut = fixture.getSut(httpMock, MockRateLimiter());

final sentryEvent = SentryEvent();
final envelope =
SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk);
final envelope = SentryEnvelope.fromEvent(
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

expect(fixture.clientReportRecorder.reason, null);
Expand All @@ -201,8 +211,11 @@ void main() {
final sut = fixture.getSut(httpMock, MockRateLimiter());

final sentryEvent = SentryEvent();
final envelope =
SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk);
final envelope = SentryEnvelope.fromEvent(
sentryEvent,
fixture.options.sdk,
dsn: fixture.options.dsn,
);
await sut.send(envelope);

expect(fixture.clientReportRecorder.reason, DiscardReason.networkError);
Expand Down
25 changes: 18 additions & 7 deletions flutter/test/file_system_transport_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:sentry/sentry.dart';
import 'package:sentry_flutter/src/file_system_transport.dart';

import 'integrations/native_app_start_integration_test.dart';

void main() {
const _channel = MethodChannel('sentry_flutter');

Expand All @@ -32,9 +34,12 @@ void main() {
final event = SentryEvent();
final sdkVersion =
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
const fakeDsn = 'https://[email protected]/1234567';

final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
final envelope = SentryEnvelope.fromEvent(
event,
sdkVersion,
dsn: fixture.options.dsn,
);
final sentryId = await transport.send(envelope);

expect(sentryId, sentryId);
Expand All @@ -49,9 +54,12 @@ void main() {
final event = SentryEvent();
final sdkVersion =
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
const fakeDsn = 'https://[email protected]/1234567';

final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
final envelope = SentryEnvelope.fromEvent(
event,
sdkVersion,
dsn: fixture.options.dsn,
);
final sentryId = await transport.send(envelope);

expect(SentryId.empty(), sentryId);
Expand All @@ -69,8 +77,11 @@ void main() {
SentryEvent(message: SentryMessage('hi I am a special char ◤'));
final sdkVersion =
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
const fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
final envelope = SentryEnvelope.fromEvent(
event,
sdkVersion,
dsn: fixture.options.dsn,
);
await transport.send(envelope);

final envelopeList = arguments as List;
Expand Down Expand Up @@ -103,7 +114,7 @@ void main() {
}

class Fixture {
final options = SentryOptions(dsn: '');
final options = SentryOptions(dsn: fakeDsn);

FileSystemTransport getSut(MethodChannel channel) {
return FileSystemTransport(channel, options);
Expand Down