diff --git a/dart/lib/src/version.dart b/dart/lib/src/version.dart index 18f5bd2ae5..a65892cf75 100644 --- a/dart/lib/src/version.dart +++ b/dart/lib/src/version.dart @@ -17,7 +17,7 @@ String sdkName(bool isWeb) => isWeb ? _browserSdkName : _ioSdkName; const String _ioSdkName = 'sentry.dart'; /// The SDK name for web projects reported to Sentry.io in the submitted events. -const String _browserSdkName = 'sentry.dart.browser'; +const String _browserSdkName = '$_ioSdkName.browser'; /// The name of the SDK platform reported to Sentry.io in the submitted events. /// diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt index adf8469054..01e5b2f479 100644 --- a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt +++ b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt @@ -18,6 +18,7 @@ import io.sentry.Sentry import io.sentry.DateUtils import io.sentry.android.core.ActivityFramesTracker import io.sentry.android.core.AppStartState +import io.sentry.android.core.BuildConfig.VERSION_NAME import io.sentry.android.core.LoadClass import io.sentry.android.core.SentryAndroid import io.sentry.android.core.SentryAndroidOptions @@ -165,16 +166,18 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware { args.getIfNotNull("sendClientReports") { options.isSendClientReports = it } - args.getIfNotNull>("sdk") { sdk -> - val name = sdk["name"] as? String - val version = sdk["version"] as? String - if (name != null && version != null) { - val sdkVersion = SdkVersion(name, version) - options.setSentryClientName("$name/$version") - options.setSdkVersion(sdkVersion) - } + val name = "sentry.java.android.flutter" + + var sdkVersion = options.sdkVersion + if (sdkVersion == null) { + sdkVersion = SdkVersion(name, VERSION_NAME) + } else { + sdkVersion.name = name } + options.sdkVersion = sdkVersion + options.sentryClientName = "$name/$VERSION_NAME" + options.setBeforeSend { event, _ -> setEventOriginTag(event) addPackages(event, options.sdkVersion) @@ -476,10 +479,10 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware { private fun addPackages(event: SentryEvent, sdk: SdkVersion?) { event.sdk?.let { if (it.name == flutterSdk) { - sdk?.packages?.forEach { sentryPackage -> + sdk?.packageSet?.forEach { sentryPackage -> it.addPackage(sentryPackage.name, sentryPackage.version) } - sdk?.integrations?.forEach { integration -> + sdk?.integrationSet?.forEach { integration -> it.addIntegration(integration) } } diff --git a/flutter/example/macos/Runner.xcodeproj/project.pbxproj b/flutter/example/macos/Runner.xcodeproj/project.pbxproj index ed6c5d16ab..d74803f7c0 100644 --- a/flutter/example/macos/Runner.xcodeproj/project.pbxproj +++ b/flutter/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -209,7 +209,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -262,6 +262,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index d9ffbdd84c..152c342968 100644 --- a/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@