Merge branch 'main' into feat/trace-propagation

getsentry · Oct 9, 2024 · 3933fd6 · 3933fd6
2 parents bd599fd + 1790c73
commit 3933fd6
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,19 +7,20 @@
 - Add setting that allows switching between the project and user directories for the internal Sentry database location on Windows/Linux ([#616](https://github.com/getsentry/sentry-unreal/pull/616))
 - Add non-ASCII characters support for user messages ([#624](https://github.com/getsentry/sentry-unreal/pull/624))
 - Add API to allow users to trace their distributed system and connect in-game with backend errors ([#631](https://github.com/getsentry/sentry-unreal/pull/631))
+- Allow overriding `UploadSymbolsAutomatically` via environment variable `SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY` ([#636](https://github.com/getsentry/sentry-unreal/pull/636))
 
 ### Fixes
 
 - Fix intermittent errors during plugin initialization on macOS/iOS ([#618](https://github.com/getsentry/sentry-unreal/pull/618))
 
 ### Dependencies
 
-- Bump CLI from v2.33.0 to v2.34.1 ([#608](https://github.com/getsentry/sentry-unreal/pull/608), [#626](https://github.com/getsentry/sentry-unreal/pull/626))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2341)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.33.0...2.34.1)
-- Bump Cocoa SDK (iOS) from v8.32.0 to v8.36.0 ([#610](https://github.com/getsentry/sentry-unreal/pull/610), [#615](https://github.com/getsentry/sentry-unreal/pull/615),[#617](https://github.com/getsentry/sentry-unreal/pull/617),[#620](https://github.com/getsentry/sentry-unreal/pull/620),[#622](https://github.com/getsentry/sentry-unreal/pull/622))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8360)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.32.0...8.36.0)
+- Bump CLI from v2.33.0 to v2.37.0 ([#608](https://github.com/getsentry/sentry-unreal/pull/608), [#626](https://github.com/getsentry/sentry-unreal/pull/626), [#629](https://github.com/getsentry/sentry-unreal/pull/629), [#632](https://github.com/getsentry/sentry-unreal/pull/632), [#634](https://github.com/getsentry/sentry-unreal/pull/634), [#638](https://github.com/getsentry/sentry-unreal/pull/638), [#640](https://github.com/getsentry/sentry-unreal/pull/640), [#641](https://github.com/getsentry/sentry-unreal/pull/641), [#642](https://github.com/getsentry/sentry-unreal/pull/642), [#643](https://github.com/getsentry/sentry-unreal/pull/643), [#647](https://github.com/getsentry/sentry-unreal/pull/647))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2370)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.33.0...2.37.0)
+- Bump Cocoa SDK (iOS) from v8.32.0 to v8.37.0 ([#610](https://github.com/getsentry/sentry-unreal/pull/610), [#615](https://github.com/getsentry/sentry-unreal/pull/615),[#617](https://github.com/getsentry/sentry-unreal/pull/617),[#620](https://github.com/getsentry/sentry-unreal/pull/620),[#622](https://github.com/getsentry/sentry-unreal/pull/622), [#648](https://github.com/getsentry/sentry-unreal/pull/648))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8370)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.32.0...8.37.0)
 - Bump Java SDK (Android) from v7.13.0 to v7.14.0 ([#613](https://github.com/getsentry/sentry-unreal/pull/613))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7140)
   - [diff](https://github.com/getsentry/sentry-java/compare/7.13.0...7.14.0)

diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa
diff --git a/plugin-dev/Scripts/upload-debug-symbols-win.bat b/plugin-dev/Scripts/upload-debug-symbols-win.bat
@@ -33,9 +33,15 @@ if "%TargetPlatform%"=="Win64" (
 )
 
 call :ParseIniFile "%ConfigPath%\DefaultEngine.ini" /Script/Sentry.SentrySettings UploadSymbolsAutomatically UploadSymbols
+echo Sentry: Automatic symbols upload is '%UploadSymbols%' from plugin settings
+
+if /i "%SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY%" NEQ "" (
+  set UploadSymbols=%SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY%
+  echo Sentry: Automatic symbols upload is overridden as '%SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY%' from environment variable SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY
+)
 
 if /i "%UploadSymbols%" NEQ "True" (
-    echo Sentry: Automatic symbols upload is disabled in plugin settings. Skipping...
+    echo Sentry: Automatic symbols upload is disabled. Skipping...
     exit /B 0
 )
 

diff --git a/plugin-dev/Scripts/upload-debug-symbols.sh b/plugin-dev/Scripts/upload-debug-symbols.sh
@@ -31,6 +31,12 @@ else
 fi
 
 UPLOAD_SYMBOLS=$(awk -F "=" '/UploadSymbolsAutomatically/ {print $2}' "${CONFIG_PATH}/DefaultEngine.ini")
+echo "Sentry: Automatic symbols upload is '$UPLOAD_SYMBOLS' from plugin settings"
+
+if [ ! -z $SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY ]; then
+    UPLOAD_SYMBOLS=$SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY
+    echo "Sentry: Automatic symbols upload is overridden as '$SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY' from environment variable SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY"
+fi
 
 if [ -z $UPLOAD_SYMBOLS ]; then
     echo "Sentry: Automatic symbols upload is disabled in plugin settings. Skipping..."

diff --git a/plugin-dev/sentry-cli.properties b/plugin-dev/sentry-cli.properties
@@ -1,2 +1,2 @@
-version=2.34.1
+version=2.37.0
 repo=https://github.com/getsentry/sentry-cli
diff --git a/scripts/packaging/package-github.snapshot b/scripts/packaging/package-github.snapshot
@@ -245,6 +245,7 @@ Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMessage.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryNSError.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryOptions.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryProfilingConditionals.h
+Source/ThirdParty/IOS/Sentry.framework/Headers/SentryReplayApi.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryRequest.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySampleDecision.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySamplingContext.h
@@ -358,6 +359,7 @@ Source/ThirdParty/Mac/include/Sentry/SentryOptions.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions+HybridSDKs.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions+Private.h
 Source/ThirdParty/Mac/include/Sentry/SentryProfilingConditionals.h
+Source/ThirdParty/Mac/include/Sentry/SentryReplayApi.h
 Source/ThirdParty/Mac/include/Sentry/SentryRequest.h
 Source/ThirdParty/Mac/include/Sentry/SentryRequestOperation.h
 Source/ThirdParty/Mac/include/Sentry/SentrySampleDecision.h

diff --git a/scripts/packaging/package-marketplace.snapshot b/scripts/packaging/package-marketplace.snapshot
@@ -242,6 +242,7 @@ Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMessage.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryNSError.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryOptions.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryProfilingConditionals.h
+Source/ThirdParty/IOS/Sentry.framework/Headers/SentryReplayApi.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentryRequest.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySampleDecision.h
 Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySamplingContext.h
@@ -355,6 +356,7 @@ Source/ThirdParty/Mac/include/Sentry/SentryOptions.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions+HybridSDKs.h
 Source/ThirdParty/Mac/include/Sentry/SentryOptions+Private.h
 Source/ThirdParty/Mac/include/Sentry/SentryProfilingConditionals.h
+Source/ThirdParty/Mac/include/Sentry/SentryReplayApi.h
 Source/ThirdParty/Mac/include/Sentry/SentryRequest.h
 Source/ThirdParty/Mac/include/Sentry/SentryRequestOperation.h
 Source/ThirdParty/Mac/include/Sentry/SentrySampleDecision.h