From 8ebcb8d1e16a062d2ccdd0c8f953073e28cc7787 Mon Sep 17 00:00:00 2001
From: Ivan Dlugos <6349682+vaind@users.noreply.github.com>
Date: Tue, 31 May 2022 16:48:31 +0200
Subject: [PATCH] Feat: Custom SDK names (#725)
* chore: bump sentry-cocoa to v7.16.0
* feat: override desktop SDK name
* feat: override iOS SDK name
* feat: override Android SDK name
* feat: override macOS SDK name
* feat: override Android native SDK name
* chore: bump sentry-java to v6.0.0-rc.1
---
CHANGELOG.md | 6 ++++++
Directory.Build.targets | 6 +++---
modules/sentry-cocoa | 2 +-
modules/sentry-java | 2 +-
package-dev/Plugins/macOS/SentryNativeBridge.m | 4 +++-
src/Sentry.Unity.Editor.iOS/NativeOptions.cs | 1 +
.../Android/AndroidManifestConfiguration.cs | 4 +++-
test/Scripts.Tests/package-release.zip.snapshot | 4 ++--
8 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index edd6ac718..0f1943b62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
- Automatic user IDs on native crashes & .NET events ([#728](https://github.com/getsentry/sentry-unity/pull/728))
- Use single-threaded HTTP transport on unknown platforms ([#756](https://github.com/getsentry/sentry-unity/pull/756))
- Disable offline caching on unknown platforms ([#770](https://github.com/getsentry/sentry-unity/pull/770))
+- Bump Sentry Cocoa SDK to v7.16.0 ([#725](https://github.com/getsentry/sentry-unity/pull/725))
+ - [changelog](https://github.com/getsentry/sentry-cocoa/blob/7.16.0/CHANGELOG.md?plain=1#L3..L38)
+ - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.13.0...7.16.0)
+- Bump Sentry Java SDK to v6.0.0-rc.1 ([#725](https://github.com/getsentry/sentry-unity/pull/725))
+ - [changelog](https://github.com/getsentry/sentry-java/blob/6.0.0-rc.1/CHANGELOG.md?plain=1#L3..L79)
+ - [diff](https://github.com/getsentry/sentry-java/compare/6.0.0-alpha.4...6.0.0-rc.1)
## 0.16.0
diff --git a/Directory.Build.targets b/Directory.Build.targets
index a5fd5bc4a..d49f6eb23 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -180,7 +180,7 @@ Expected to exist:
-
+
@@ -203,7 +203,7 @@ Expected to exist:
-
+
@@ -224,7 +224,7 @@ Expected to exist:
-
+
diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa
index 2f02b39a9..b34ce9048 160000
--- a/modules/sentry-cocoa
+++ b/modules/sentry-cocoa
@@ -1 +1 @@
-Subproject commit 2f02b39a9a47581830d6c0c92d07f5d0959bc221
+Subproject commit b34ce9048e6b8b082ea6b15e6b50583d46c936ea
diff --git a/modules/sentry-java b/modules/sentry-java
index ca5fca91a..716ad3a13 160000
--- a/modules/sentry-java
+++ b/modules/sentry-java
@@ -1 +1 @@
-Subproject commit ca5fca91aaee298e4fb2b6e966d7178f097804c2
+Subproject commit 716ad3a13730ad22f81b10ee4c014b9d6f9ea0c5
diff --git a/package-dev/Plugins/macOS/SentryNativeBridge.m b/package-dev/Plugins/macOS/SentryNativeBridge.m
index 35e76470e..8aa33a404 100644
--- a/package-dev/Plugins/macOS/SentryNativeBridge.m
+++ b/package-dev/Plugins/macOS/SentryNativeBridge.m
@@ -44,7 +44,9 @@ int SentryNativeBridgeLoadLibrary()
const void *SentryNativeBridgeOptionsNew()
{
- return CFBridgingRetain([[NSMutableDictionary alloc] init]);
+ NSMutableDictionary *dictOptions = [[NSMutableDictionary alloc] init];
+ dictOptions[@"sdk"] = @ { @"name" : @"sentry.cocoa.unity" };
+ return CFBridgingRetain(dictOptions);
}
void SentryNativeBridgeOptionsSetString(const void *options, const char *name, const char *value)
diff --git a/src/Sentry.Unity.Editor.iOS/NativeOptions.cs b/src/Sentry.Unity.Editor.iOS/NativeOptions.cs
index 5e90b48cf..6858044f6 100644
--- a/src/Sentry.Unity.Editor.iOS/NativeOptions.cs
+++ b/src/Sentry.Unity.Editor.iOS/NativeOptions.cs
@@ -23,6 +23,7 @@ internal string Generate(SentryOptions options)
static NSDictionary* getSentryOptions()
{{
NSDictionary* options = @{{
+ @""sdk"" : @{{ @""name"": @""sentry.cocoa.unity"" }},
@""dsn"" : @""{options.Dsn}"",
@""debug"" : @{ToObjCString(options.Debug)},
@""diagnosticLevel"" : @""{ToNativeDiagnosticLevel(options.DiagnosticLevel)}"",
diff --git a/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs b/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs
index 23f1c9a68..a9dfcc60d 100644
--- a/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs
+++ b/src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs
@@ -99,7 +99,7 @@ internal void ModifyManifest(string basePath)
}
logger.LogDebug("Configuring Sentry options on AndroidManifest: {0}", basePath);
-
+ androidManifest.SetSDK("sentry.java.android.unity");
logger.LogDebug("Setting DSN: {0}", _options!.Dsn);
androidManifest.SetDsn(_options.Dsn!);
if (_options.Debug)
@@ -306,6 +306,8 @@ internal void SetSampleRate(float sampleRate) =>
internal void SetRelease(string release) => SetMetaData($"{SentryPrefix}.release", release);
internal void SetEnvironment(string environment) => SetMetaData($"{SentryPrefix}.environment", environment);
+ internal void SetSDK(string name) => SetMetaData($"{SentryPrefix}.sdk.name", name);
+
internal void SetAutoSessionTracking(bool enableAutoSessionTracking)
=> SetMetaData($"{SentryPrefix}.auto-session-tracking.enable", enableAutoSessionTracking.ToString());
diff --git a/test/Scripts.Tests/package-release.zip.snapshot b/test/Scripts.Tests/package-release.zip.snapshot
index f664d5aae..5065d5506 100644
--- a/test/Scripts.Tests/package-release.zip.snapshot
+++ b/test/Scripts.Tests/package-release.zip.snapshot
@@ -267,8 +267,8 @@ Plugins/iOS/Device/Sentry.framework/Headers/SentryUserFeedback.h.meta
Plugins/iOS/Device/Sentry.framework/Modules/module.modulemap
Plugins/iOS/Device/Sentry.framework/Modules/module.modulemap.meta
Plugins/Android/Sentry.meta
-Plugins/Android/Sentry/sentry-6.0.0-alpha.4.jar
-Plugins/Android/Sentry/sentry-6.0.0-alpha.4.jar.meta
+Plugins/Android/Sentry/sentry-6.0.0-rc.1.jar
+Plugins/Android/Sentry/sentry-6.0.0-rc.1.jar.meta
Plugins/Android/Sentry/sentry-android-core-release.aar
Plugins/Android/Sentry/sentry-android-core-release.aar.meta
Plugins/Android/Sentry/sentry-android-ndk-release.aar