Skip to content

Commit 9d1fe6d

Browse files
authored
fix: Correctly set native SDK name when targeting Android (#2476)
1 parent 4ec22a7 commit 9d1fe6d

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Fixes
66

7+
- When targeting Android, the capturing native SDK now has its name correctly set ([#2476](https://github.com/getsentry/sentry-unity/pull/2476))
78
- Automatically captured transactions and spans now have their `Origin` correctly set. ([#2464](https://github.com/getsentry/sentry-unity/pull/2464))
89

910
### Dependencies

src/Sentry.Unity.Android/SentryJava.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public void Init(SentryUnityOptions options)
132132
androidOptions.Call("setSendDefaultPii", options.SendDefaultPii);
133133
androidOptions.Call("setEnableNdk", options.NdkIntegrationEnabled);
134134
androidOptions.Call("setEnableScopeSync", options.NdkScopeSyncEnabled);
135+
androidOptions.Call("setNativeSdkName", "sentry.native.android.unity");
135136

136137
// Options that are not to be set by the user
137138
// We're disabling some integrations as to not duplicate event or because the SDK relies on the .NET SDK

src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ internal void ModifyManifest(string basePath)
209209
// Disabling the native in favor of the C# layer for now
210210
androidManifest.SetNdkEnabled(_options.NdkIntegrationEnabled);
211211
androidManifest.SetNdkScopeSync(_options.NdkScopeSyncEnabled);
212+
androidManifest.SetNdkSdkName("sentry.native.android.unity");
212213
androidManifest.SetAutoTraceIdGeneration(false);
213214
androidManifest.SetAutoSessionTracking(false);
214215
androidManifest.SetAutoAppLifecycleBreadcrumbs(false);
@@ -493,6 +494,9 @@ internal void SetNdkEnabled(bool enableNdk)
493494
internal void SetNdkScopeSync(bool enableNdkScopeSync)
494495
=> SetMetaData($"{SentryPrefix}.ndk.scope-sync.enable", enableNdkScopeSync.ToString());
495496

497+
internal void SetNdkSdkName(string sdkName)
498+
=> SetMetaData($"{SentryPrefix}.ndk.sdk-name", sdkName);
499+
496500
internal void SetAutoTraceIdGeneration(bool enableAutoTraceIdGeneration)
497501
=> SetMetaData($"{SentryPrefix}.traces.enable-auto-id-generation", enableAutoTraceIdGeneration.ToString());
498502

0 commit comments

Comments
 (0)