Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
denrase committed Jun 26, 2023
1 parent 9b84879 commit 0addffe
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 89 deletions.
3 changes: 1 addition & 2 deletions dart/lib/src/hub.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:collection';

import 'package:meta/meta.dart';
import 'sentry_trace_origins.dart';
import 'transport/data_category.dart';

import '../sentry.dart';
Expand Down Expand Up @@ -447,7 +446,7 @@ class Hub {

if (transactionContext.origin == null) {
transactionContext = transactionContext.copyWith(
origin: origin ?? SentryTraceOrigins.manual,
origin: origin ?? SentryTraceOrigins.manual,
);
}

Expand Down
4 changes: 1 addition & 3 deletions dart/lib/src/protocol/sentry_trace_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ class SentryTraceContext {
? null
: SpanStatus.fromString(json['status'] as String),
sampled: true,
origin: json['origin'] == null
? null
: json['origin'] as String?
origin: json['origin'] == null ? null : json['origin'] as String?,
);
}

Expand Down
14 changes: 10 additions & 4 deletions dart/lib/src/sentry_trace_origins.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@ import 'package:meta/meta.dart';
class SentryTraceOrigins {
static const manual = 'manual';

static const autoNavigationSentryNavigatorObserver = 'auto.navigation.sentry_navigator_observer';
static const autoNavigationSentryNavigatorObserver =
'auto.navigation.sentry_navigator_observer';
static const autoHttpHttpTracingClient = 'auto.http.http.tracing_client';
static const autoHttpDioTracingClientAdapter = 'auto.http.dio.tracing_client_adapter';
static const autoHttpDioSentryTransformer = 'auto.http.dio.sentry_transformer';
static const autoHttpDioTracingClientAdapter =
'auto.http.dio.tracing_client_adapter';
static const autoHttpDioSentryTransformer =
'auto.http.dio.sentry_transformer';
static const autoFile = 'auto.file';
static const autoFileAssetBundle = 'auto.file.asset_bundle';
static const autoFileSqflite = 'auto.file.sqflite';
static const autoFileSqfliteSentryBatch = 'auto.file.sqflite.sentry_batch';
static const autoFileSqfliteSentryDatabaseExecutor = 'auto.file.sqflite.sentry_database_executor';
static const autoFileSqfliteSentryDatabaseExecutor =
'auto.file.sqflite.sentry_database_executor';
static const autoFileSqfliteSentrySqfliteDatabaseFactory =
'auto.file.sqflite.sentry_sqflite_database_factory';
}
6 changes: 2 additions & 4 deletions dart/test/hub_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:collection/collection.dart';
import 'package:sentry/sentry.dart';
import 'package:sentry/src/client_reports/discard_reason.dart';
import 'package:sentry/src/sentry_trace_origins.dart';
import 'package:sentry/src/sentry_tracer.dart';
import 'package:sentry/src/transport/data_category.dart';
import 'package:test/test.dart';
Expand Down Expand Up @@ -278,9 +277,8 @@ void main() {
test('start transaction with context sets injected trace origin', () async {
final hub = fixture.getSut();
final tr = hub.startTransactionWithContext(
SentryTransactionContext('name', 'op'),
origin: 'auto.navigation.test'
);
SentryTransactionContext('name', 'op'),
origin: 'auto.navigation.test');
expect(tr.origin, 'auto.navigation.test');
});

Expand Down
9 changes: 4 additions & 5 deletions dart/test/sentry_span_context_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ void main() {
class Fixture {
SentrySpanContext getSut() {
return SentrySpanContext(
operation: 'op',
parentSpanId: SpanId.newId(),
description: 'desc',
origin: 'manual'
);
operation: 'op',
parentSpanId: SpanId.newId(),
description: 'desc',
origin: 'manual');
}
}
6 changes: 1 addition & 5 deletions dart/test/sentry_span_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,7 @@ void main() {
}

class Fixture {
final context = SentryTransactionContext(
'name',
'op',
origin: 'manual'
);
final context = SentryTransactionContext('name', 'op', origin: 'manual');
late SentryTracer tracer;
final hub = MockHub();

Expand Down
13 changes: 6 additions & 7 deletions dart/test/sentry_trace_context_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ void main() {
class Fixture {
SentryTraceContext getSut() {
return SentryTraceContext(
operation: 'op',
parentSpanId: SpanId.newId(),
description: 'desc',
sampled: true,
status: SpanStatus.aborted(),
origin: 'auto.ui'
);
operation: 'op',
parentSpanId: SpanId.newId(),
description: 'desc',
sampled: true,
status: SpanStatus.aborted(),
origin: 'auto.ui');
}
}
2 changes: 1 addition & 1 deletion dart/test/sentry_tracer_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ class Fixture {
'name',
'op',
samplingDecision: SentryTracesSamplingDecision(sampled!),
origin: 'manual'
origin: 'manual',
);
return SentryTracer(
context,
Expand Down
4 changes: 4 additions & 0 deletions sqflite/lib/src/sentry_sqflite_database_factory.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ class SentrySqfliteDatabaseFactory with SqfliteDatabaseFactoryMixin {
description: 'Open DB: $path',
);

span?.origin =
// ignore: invalid_use_of_internal_member
SentryTraceOrigins.autoFileSqfliteSentrySqfliteDatabaseFactory;

try {
final database =
await databaseFactory.openDatabase(path, options: options);
Expand Down
Loading

0 comments on commit 0addffe

Please sign in to comment.