From 1ee6b09ce15f15c417385c13d795938f327dacc6 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Mon, 16 Dec 2024 20:04:55 +0100 Subject: [PATCH 1/2] feat: Add RN SDK package to `sdk.packages` on Android --- CHANGELOG.md | 1 + .../java/io/sentry/react/RNSentryModuleImpl.java | 13 ++++++------- .../main/java/io/sentry/react/RNSentryVersion.java | 8 ++++++++ scripts/version-bump.js | 5 ++++- 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d7275947b..6a7f8389f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ ``` - Export `Span` type from `@sentry/types` ([#4345](https://github.com/getsentry/sentry-react-native/pull/4345)) +- Add RN SDK package to `sdk.packages` on Android ([#4380](https://github.com/getsentry/sentry-react-native/pull/4380)) ### Fixes diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index 6fd2247002..ba3b8f0cfd 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -93,8 +93,6 @@ public class RNSentryModuleImpl { public static final String NAME = "RNSentry"; - private static final String NATIVE_SDK_NAME = "sentry.native.android.react-native"; - private static final String ANDROID_SDK_NAME = "sentry.java.android.react-native"; private static final ILogger logger = new AndroidLogger(NAME); private static final BuildInfoProvider buildInfo = new BuildInfoProvider(logger); private static final String modulesPath = "modules.json"; @@ -191,13 +189,14 @@ protected void getSentryAndroidOptions( @NotNull SentryAndroidOptions options, @NotNull ReadableMap rnOptions, ILogger logger) { @Nullable SdkVersion sdkVersion = options.getSdkVersion(); if (sdkVersion == null) { - sdkVersion = new SdkVersion(ANDROID_SDK_NAME, BuildConfig.VERSION_NAME); + sdkVersion = new SdkVersion(RNSentryVersion.ANDROID_SDK_NAME, BuildConfig.VERSION_NAME); } else { - sdkVersion.setName(ANDROID_SDK_NAME); + sdkVersion.setName(RNSentryVersion.ANDROID_SDK_NAME); } + sdkVersion.addPackage(RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_NAME, RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_VERSION); options.setSentryClientName(sdkVersion.getName() + "/" + sdkVersion.getVersion()); - options.setNativeSdkName(NATIVE_SDK_NAME); + options.setNativeSdkName(RNSentryVersion.NATIVE_SDK_NAME); options.setSdkVersion(sdkVersion); if (rnOptions.hasKey("debug") && rnOptions.getBoolean("debug")) { @@ -970,10 +969,10 @@ private void setEventOriginTag(SentryEvent event) { SdkVersion sdk = event.getSdk(); if (sdk != null) { switch (sdk.getName()) { - case NATIVE_SDK_NAME: + case RNSentryVersion.NATIVE_SDK_NAME: setEventEnvironmentTag(event, "native"); break; - case ANDROID_SDK_NAME: + case RNSentryVersion.ANDROID_SDK_NAME: setEventEnvironmentTag(event, "java"); break; default: diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java new file mode 100644 index 0000000000..f9bc4b442e --- /dev/null +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java @@ -0,0 +1,8 @@ +package io.sentry.react; + +class RNSentryVersion { + static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native"; + static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.4.0"; + static final String NATIVE_SDK_NAME = "sentry.native.android.react-native"; + static final String ANDROID_SDK_NAME = "sentry.java.android.react-native"; +} diff --git a/scripts/version-bump.js b/scripts/version-bump.js index 3bb74987a4..ff1a68f6b2 100644 --- a/scripts/version-bump.js +++ b/scripts/version-bump.js @@ -4,7 +4,10 @@ const replace = require('replace-in-file'); const pjson = require('../packages/core/package.json'); replace({ - files: ['packages/core/src/js/version.ts'], + files: [ + 'packages/core/src/js/version.ts', + 'packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java', + ], from: /\d+\.\d+.\d+(?:-\w+(?:\.\w+)?)?/g, to: pjson.version, }) From 1a71f24cf60618d9960cf5b696c54515f43098c5 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 17 Dec 2024 12:57:09 +0100 Subject: [PATCH 2/2] fix lint --- .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 4 +++- .../src/main/java/io/sentry/react/RNSentryVersion.java | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java index ba3b8f0cfd..b39261aca7 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java @@ -193,7 +193,9 @@ protected void getSentryAndroidOptions( } else { sdkVersion.setName(RNSentryVersion.ANDROID_SDK_NAME); } - sdkVersion.addPackage(RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_NAME, RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_VERSION); + sdkVersion.addPackage( + RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_NAME, + RNSentryVersion.REACT_NATIVE_SDK_PACKAGE_VERSION); options.setSentryClientName(sdkVersion.getName() + "/" + sdkVersion.getVersion()); options.setNativeSdkName(RNSentryVersion.NATIVE_SDK_NAME); diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java index f9bc4b442e..4660c838e4 100644 --- a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java +++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java @@ -1,8 +1,8 @@ package io.sentry.react; class RNSentryVersion { - static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native"; - static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.4.0"; - static final String NATIVE_SDK_NAME = "sentry.native.android.react-native"; - static final String ANDROID_SDK_NAME = "sentry.java.android.react-native"; + static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native"; + static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.4.0"; + static final String NATIVE_SDK_NAME = "sentry.native.android.react-native"; + static final String ANDROID_SDK_NAME = "sentry.java.android.react-native"; }