Merge branch 'main' into feat/always-send-sampled-flag

Author: buenaflor

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Add http.request.method attribute to http spans data ([#1633](https://github.com/getsentry/sentry-dart/pull/1633))
 - Add db.system and db.name attributes to db spans data ([#1629](https://github.com/getsentry/sentry-dart/pull/1629))
+- Log SDK errors to the console if the log level is `fatal` even if `debug` is disabled ([#1635](https://github.com/getsentry/sentry-dart/pull/1635))
 
 ### Features
 

dart/lib/src/diagnostic_logger.dart

@@ -26,6 +26,8 @@ class DiagnosticLogger {
   }
 
   bool _isEnabled(SentryLevel level) {
-    return _options.debug && level.ordinal >= _options.diagnosticLevel.ordinal;
+    return _options.debug &&
+            level.ordinal >= _options.diagnosticLevel.ordinal ||
+        level == SentryLevel.fatal;
   }
 }

dart/test/diagnostic_logger_test.dart

@@ -0,0 +1,64 @@
+import 'package:sentry/sentry.dart';
+import 'package:sentry/src/diagnostic_logger.dart';
+import 'package:test/test.dart';
+
+void main() {
+  late Fixture fixture;
+
+  setUp(() {
+    fixture = Fixture();
+  });
+
+  test('$DiagnosticLogger do not log if debug is disabled', () {
+    fixture.options.debug = false;
+
+    fixture.getSut().log(SentryLevel.error, 'foobar');
+
+    expect(fixture.loggedMessage, isNull);
+  });
+
+  test('$DiagnosticLogger log if debug is enabled', () {
+    fixture.options.debug = true;
+
+    fixture.getSut().log(SentryLevel.error, 'foobar');
+
+    expect(fixture.loggedMessage, 'foobar');
+  });
+
+  test('$DiagnosticLogger do not log if level is too low', () {
+    fixture.options.debug = true;
+    fixture.options.diagnosticLevel = SentryLevel.error;
+
+    fixture.getSut().log(SentryLevel.warning, 'foobar');
+
+    expect(fixture.loggedMessage, isNull);
+  });
+
+  test('$DiagnosticLogger always log fatal', () {
+    fixture.options.debug = false;
+
+    fixture.getSut().log(SentryLevel.fatal, 'foobar');
+
+    expect(fixture.loggedMessage, 'foobar');
+  });
+}
+
+class Fixture {
+  var options = SentryOptions();
+
+  Object? loggedMessage;
+
+  DiagnosticLogger getSut() {
+    return DiagnosticLogger(mockLogger, options);
+  }
+
+  void mockLogger(
+    SentryLevel level,
+    String message, {
+    String? logger,
+    Object? exception,
+    StackTrace? stackTrace,
+  }) {
+    loggedMessage = message;
+  }
+}

flutter/analysis_options.yaml

@@ -1,6 +1,8 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
+  exclude:
+    - test/*.mocks.dart
   language:
     strict-casts: true
     strict-inference: true

flutter/ffi-cocoa.yaml

@@ -1,7 +1,7 @@
 name: SentryCocoa
 description: Sentry Cocoa SDK FFI binding.
 language: objc
-output: lib/src/sentry_cocoa.dart
+output: lib/src/native/cocoa/binding.dart
 headers:
   entry-points:
     - ./cocoa_bindings_temp/Sentry.framework/Versions/A/PrivateHeaders/PrivateSentrySDKOnly.h

flutter/lib/src/event_processor/native_app_start_event_processor.dart

@@ -2,8 +2,7 @@ import 'dart:async';
 
 import 'package:sentry/sentry.dart';
 
-import '../sentry_native.dart';
-import '../sentry_native_channel.dart';
+import '../native/sentry_native.dart';
 
 /// EventProcessor that enriches [SentryTransaction] objects with app start
 /// measurement.

flutter/lib/src/integrations/native_app_start_integration.dart

@@ -2,7 +2,7 @@ import 'package:flutter/scheduler.dart';
 import 'package:sentry/sentry.dart';
 
 import '../sentry_flutter_options.dart';
-import '../sentry_native.dart';
+import '../native/sentry_native.dart';
 import '../event_processor/native_app_start_event_processor.dart';
 
 /// Integration which handles communication with native frameworks in order to