Skip to content

Send DSN with SentryEnvelopeHeader #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vishnukvmd wants to merge 6 commits into from
Closed

Send DSN with SentryEnvelopeHeader #873

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 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
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 broken tests
  • Loading branch information
@ua741
ua741 committed Sep 27, 2022
commit 3502ee4d534b9fcf47be2d89c0ae45a28044ef5e
2 changes: 1 addition & 1 deletion dart/test/mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ typedef EventProcessorFunction = FutureOr<SentryEvent?>
var fakeEnvelope = SentryEnvelope.fromEvent(
fakeEvent,
SdkVersion(name: 'sdk1', version: '1.0.0'),
fakeDsn,
dsn: fakeDsn,
);

class MockRateLimiter implements RateLimiter {
Expand Down
2 changes: 1 addition & 1 deletion dart/test/sentry_envelope_header_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:test/test.dart';
void main() {
group('SentryEnvelopeHeader', () {
test('toJson empty', () {
final sut = SentryEnvelopeHeader(null, null, null);
final sut = SentryEnvelopeHeader(null, null);
final expected = <String, dynamic>{};
expect(sut.toJson(), expected);
});
Expand Down
6 changes: 3 additions & 3 deletions dart/test/sentry_envelope_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ void main() {
final sut = SentryEnvelope.fromEvent(
sentryEvent,
sdkVersion,
fakeDsn,
dsn: fakeDsn,
attachments: [attachment],
);

final expectedEnvelopeItem = SentryEnvelope.fromEvent(
sentryEvent,
sdkVersion,
fakeDsn,
dsn: fakeDsn,
);

final sutEnvelopeData = <int>[];
Expand All @@ -177,7 +177,7 @@ void main() {
name: 'test',
version: '1',
),
fakeDsn,
dsn: fakeDsn,
);

final _ = sut.envelopeStream(SentryOptions()).map((e) => e);
Expand Down
5 changes: 1 addition & 4 deletions dart/test/sentry_envelope_vm_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void main() {

final eventId = SentryId.fromId('3b382f22ee67491f80f7dee18016a7b1');
final sdkVersion = SdkVersion(name: 'test', version: 'version');
final header = SentryEnvelopeHeader(eventId, sdkVersion, null);
final header = SentryEnvelopeHeader(eventId, sdkVersion);
final envelope = SentryEnvelope(header, [attachmentItem]);

final envelopeData = <int>[];
Expand All @@ -50,12 +50,9 @@ void main() {
final sdkVersion = SdkVersion(name: '', version: '');
final attachment =
IoSentryAttachment.fromPath('this_path_does_not_exist.txt');
final fakeDsn = 'https://[email protected]/1234567';

final envelope = SentryEnvelope.fromEvent(
event,
sdkVersion,
fakeDsn,
attachments: [attachment],
);

Expand Down
29 changes: 16 additions & 13 deletions dart/test/transport/http_transport_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@ import 'dart:convert';

import 'package:http/http.dart' as http;
import 'package:http/testing.dart';
import 'package:sentry/sentry.dart';
import 'package:sentry/src/client_reports/discard_reason.dart';
import 'package:sentry/src/sentry_envelope_header.dart';
import 'package:sentry/src/sentry_envelope_item_header.dart';
import 'package:sentry/src/sentry_item_type.dart';
import 'package:sentry/src/sentry_tracer.dart';
import 'package:sentry/src/transport/data_category.dart';
import 'package:sentry/src/transport/http_transport.dart';
import 'package:sentry/src/transport/rate_limiter.dart';
import 'package:test/test.dart';
import 'package:sentry/src/sentry_tracer.dart';

import 'package:sentry/sentry.dart';
import 'package:sentry/src/transport/http_transport.dart';

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

void main() {
SentryEnvelope givenEnvelope() {
final filteredEnvelopeHeader = SentryEnvelopeHeader(SentryId.empty(), null, null);
final filteredEnvelopeHeader = SentryEnvelopeHeader(SentryId.empty(), null);
final filteredItemHeader =
SentryEnvelopeItemHeader(SentryItemType.event, () async {
return 2;
Expand Down Expand Up @@ -71,8 +70,9 @@ void main() {

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

final envelopeData = <int>[];
Expand All @@ -96,8 +96,9 @@ void main() {

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

expect(eventId, SentryId.empty());
Expand All @@ -121,8 +122,9 @@ void main() {

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

expect(mockRateLimiter.envelopeToFilter?.header.eventId,
Expand All @@ -143,8 +145,9 @@ void main() {

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

expect(mockRateLimiter.errorCode, 200);
Expand Down
6 changes: 3 additions & 3 deletions flutter/test/file_system_transport_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void main() {
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
final fakeDsn = 'https://[email protected]/1234567';

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

expect(sentryId, sentryId);
Expand All @@ -51,7 +51,7 @@ void main() {
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
final fakeDsn = 'https://[email protected]/1234567';

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

expect(SentryId.empty(), sentryId);
Expand All @@ -70,7 +70,7 @@ void main() {
final sdkVersion =
SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
final fakeDsn = 'https://[email protected]/1234567';
final envelope = SentryEnvelope.fromEvent(event, sdkVersion, fakeDsn);
final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
await transport.send(envelope);

final envelopeList = arguments as List;
Expand Down