Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- Stop re-triggering hitTest in SentryUserInteractionWidget on pointerUp ([#3540](https://github.com/getsentry/sentry-dart/pull/3540))
- Use seconds since the Unix epoch for `log.timestamp` ([#3558](https://github.com/getsentry/sentry-dart/pull/3558))
- Implement `SqfliteDatabaseExecutor` to prevent `TypeError` on `getVersion/setVersion` ([3539](https://github.com/getsentry/sentry-dart/pull/3539))

### Dependencies
Expand Down
3 changes: 2 additions & 1 deletion packages/dart/lib/src/telemetry/log/log.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import '../../protocol/sentry_attribute.dart';
import '../../protocol/sentry_id.dart';
import '../../protocol/span_id.dart';
import '../../utils/date_time_extension.dart';
import 'log_level.dart';

class SentryLog {
Expand All @@ -27,7 +28,7 @@ class SentryLog {

Map<String, dynamic> toJson() {
return {
'timestamp': timestamp.toIso8601String(),
'timestamp': timestamp.secondsSinceEpoch,
'trace_id': traceId.toString(),
if (spanId != null) 'span_id': spanId.toString(),
'level': level.value,
Expand Down
3 changes: 2 additions & 1 deletion packages/dart/lib/src/telemetry/metric/metric.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:meta/meta.dart';

import '../../../sentry.dart';
import '../../utils/date_time_extension.dart';

/// Base class for metric data points sent to Sentry.
///
Expand Down Expand Up @@ -47,7 +48,7 @@ abstract class SentryMetric {
@internal
Map<String, dynamic> toJson() {
return {
'timestamp': timestamp.millisecondsSinceEpoch / 1000.0,
'timestamp': timestamp.secondsSinceEpoch,
'type': type,
'name': name,
'value': value,
Expand Down
3 changes: 3 additions & 0 deletions packages/dart/lib/src/utils/date_time_extension.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
extension DateTimeExtension on DateTime {
double get secondsSinceEpoch => microsecondsSinceEpoch / 1000000.0;
}
4 changes: 2 additions & 2 deletions packages/dart/test/telemetry/log/log_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:sentry/sentry.dart';

void main() {
test('$SentryLog to json', () {
final timestamp = DateTime.now();
final timestamp = DateTime.utc(2024, 1, 15, 10, 30, 0, 123, 456);
final traceId = SentryId.newId();
final spanId = SpanId.newId();

Expand All @@ -25,7 +25,7 @@ void main() {
final json = logItem.toJson();

expect(json, {
'timestamp': timestamp.toIso8601String(),
'timestamp': 1705314600.123456,
'trace_id': traceId.toString(),
'span_id': spanId.toString(),
'level': 'info',
Expand Down
4 changes: 2 additions & 2 deletions packages/dart/test/telemetry/metric/metric_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ void main() {
test('serializes all fields correctly', () {
final traceId = SentryId.newId();
final spanId = SpanId.newId();
final timestamp = DateTime.utc(2024, 1, 15, 10, 30, 0);
final timestamp = DateTime.utc(2024, 1, 15, 10, 30, 0, 123, 456);

final metric = SentryCounterMetric(
timestamp: timestamp,
Expand All @@ -20,7 +20,7 @@ void main() {

final json = metric.toJson();

expect(json['timestamp'], 1705314600.0);
expect(json['timestamp'], 1705314600.123456);
expect(json['type'], 'counter');
expect(json['name'], 'button_clicks');
expect(json['value'], 5);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ import 'package:sentry/src/sentry_tracer.dart';
import '../mocks.dart';
import '../mocks.mocks.dart';

// The Scaffold widget tree uses AnimatedBuilder on stable but Builder on beta.
// Use anyOf to accept either name since this is a framework-internal detail.
final _animatedBuilderElement = {
'element': anyOf('AnimatedBuilder', 'Builder')
};

void main() {
late Fixture fixture;
setUp(() async {
Expand Down Expand Up @@ -121,7 +127,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'view.id': 'btn_1',
Expand All @@ -148,7 +154,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'label': 'Button 1',
Expand Down Expand Up @@ -176,7 +182,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'label': 'My Icon',
Expand Down Expand Up @@ -204,7 +210,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'label': 'Button 2',
Expand Down Expand Up @@ -276,7 +282,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'view.id': 'popup_menu_button',
Expand Down Expand Up @@ -394,7 +400,7 @@ void main() {
{'name': '_ScaffoldSlot.body', 'element': 'LayoutId'},
{'element': 'CustomMultiChildLayout'},
{'element': 'Actions'},
{'element': 'AnimatedBuilder'},
_animatedBuilderElement,
{'element': 'DefaultTextStyle'}
],
'label': 'Button 5',
Expand Down
Loading