Merge branch 'main' into destination-url

Author: nwhite-riot

.clang-format

@@ -0,0 +1,34 @@
+AccessModifierOffset:                           -4
+AlignAfterOpenBracket:                          DontAlign
+AllowShortLambdasOnASingleLine:                 None
+LambdaBodyIndentation:                          OuterScope
+AllowAllParametersOfDeclarationOnNextLine:      false
+AllowAllArgumentsOnNextLine:                    false
+BreakBeforeBraces:                              Allman
+BreakConstructorInitializersBeforeComma:        true
+BreakStringLiterals:                            false
+ColumnLimit:                                    0
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IncludeCategories:
+  - Regex:           '.*\.generated\.h'
+    Priority:        100
+  - Regex:           '.*(PCH).*'
+    Priority:        -1
+  - Regex:           '".*"'
+    Priority:        1
+  - Regex:           '^<.*\.(h)>'
+    Priority:        3
+  - Regex:           '^<.*>'
+    Priority:        4
+IndentWidth:                                    4
+ObjCBlockIndentWidth:                           4
+ObjCBreakBeforeNestedBlockParam:                false
+PointerAlignment:                               Left
+SpacesInContainerLiterals:                      true
+SpaceAfterTemplateKeyword:                      false
+Standard:                                       c++11
+TabWidth:                                       4
+UseTab:                                         Always
+MacroBlockBegin:                                '^BEGIN_DEFINE_SPEC'
+MacroBlockEnd:                                  '^END_DEFINE_SPEC'
+Cpp11BracedListStyle:                           false

.github/workflows/ci.yml

@@ -1,7 +1,11 @@
 name: package-plugin-workflow
 
-on: 
+on:
   push:
+    branches:
+      - main
+      - release/*
+  pull_request:
     paths-ignore:
       - "**.md"
 
@@ -29,12 +33,14 @@ jobs:
     with:
       target: Linux
       runsOn: ubuntu-22.04
+      container: ubuntu:20.04
 
   linux-arm64-sdk:
     uses: ./.github/workflows/sdk-build.yml
     with:
       target: LinuxArm64
       runsOn: ubuntu-22.04-arm
+      container: arm64v8/ubuntu:20.04
 
   windows-crashpad-sdk:
     uses: ./.github/workflows/sdk-build.yml

.github/workflows/lint.yml

@@ -0,0 +1,16 @@
+name: "Lint"
+on:
+  push:
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Clang Format
+        run: find plugin-dev/Source/Sentry plugin-dev/Source/SentryEditor -name '*.h' -o -name '*.cpp' | xargs /usr/bin/clang-format --dry-run --Werror

.github/workflows/sdk-build.yml

@@ -21,6 +21,17 @@ jobs:
       run:
         shell: bash
     steps:
+      - name: Configure env for Linux docker containers
+        if: ${{ inputs.target == 'Linux' || inputs.target == 'LinuxArm64' }}
+        run: |
+          apt-get update
+          apt-get -y install sudo
+          apt-get -y install wget
+          apt-get -y install cmake
+          apt-get -y install software-properties-common
+          apt-get -y install git
+          git config --global --add safe.directory $(pwd)
+
       - uses: actions/checkout@v4
 
       - name: Select submodule

CHANGELOG.md

@@ -2,20 +2,38 @@
 
 ## Unreleased
 
+### Features
+
+- Add API allowing to get/set event fingerprint ([#920](https://github.com/getsentry/sentry-unreal/pull/920))
 - Add destination URL for crash envelope ([#905](https://github.com/getsentry/sentry-unreal/pull/905))
 
+### Dependencies
+
+- Bump Java SDK (Android) from v8.11.1 to v8.12.0 ([#911](https://github.com/getsentry/sentry-unreal/pull/911))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8120)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.11.1...8.12.0)
+- Bump Native SDK from v0.8.4 to v0.8.5 ([#912](https://github.com/getsentry/sentry-unreal/pull/912))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#085)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.8.4...0.8.5)
+- Bump Cocoa SDK (iOS and Mac) from v8.50.1 to v8.51.1 ([#913](https://github.com/getsentry/sentry-unreal/pull/913), [#916](https://github.com/getsentry/sentry-unreal/pull/916), [#925](https://github.com/getsentry/sentry-unreal/pull/925))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8511)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.50.1...8.51.1)
+
+## 1.0.0-beta.1
+
 ### Fixes
 
+- The image buffer is now allocated on the heap to prevent stack overflow during screenshot capture on Windows ([#900](https://github.com/getsentry/sentry-unreal/pull/900))
 - Windows default crash handling mechanism is no longer disabled if SDK initialization failed ([#901](https://github.com/getsentry/sentry-unreal/pull/901))
 
 ### Dependencies
 
-- Bump CLI from v2.43.1 to v2.44.0 ([#896](https://github.com/getsentry/sentry-unreal/pull/896))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2440)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.44.0)
-- Bump Cocoa SDK (iOS and Mac) from v8.49.2 to v8.50.0 ([#897](https://github.com/getsentry/sentry-unreal/pull/897))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8500)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.2...8.50.0)
+- Bump CLI from v2.43.1 to v2.45.0 ([#896](https://github.com/getsentry/sentry-unreal/pull/896), [#906](https://github.com/getsentry/sentry-unreal/pull/906))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2450)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.45.0)
+- Bump Cocoa SDK (iOS and Mac) from v8.49.2 to v8.50.1 ([#897](https://github.com/getsentry/sentry-unreal/pull/897), [#907](https://github.com/getsentry/sentry-unreal/pull/907))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8501)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.2...8.50.1)
 
 ## 1.0.0-alpha.6
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@ For big feature it's advised to raise an issue to discuss it first.
 
 ## Getting started
 
-### Dependencies
+### Prerequisites
 
 - [GitHub CLI](https://cli.github.com/)
 
@@ -22,6 +22,8 @@ To be able to build for Android, make sure to configure the SDK & NDK according
 
 > Currently this method is available only for C++ UE projects! Blueprint project can be converted to a C++ one simply by adding an empty class via Editor.
 
+> When working with a `sentry-unreal` fork, run `gh repo set-default` to select the default remote repository used for GitHub API queries (required for pulling plugin dependencies from CI). If you don't plan to configure the CI pipeline for your fork, it's recommended to set `getsentry/sentry-unreal` as the default remote.
+
 To get started, we recommend running the init script:
 
 * `./scripts/init.sh` on macOS/Linux
@@ -45,3 +47,21 @@ In order to run automation tests navigate to `Settings -> Plugins -> Testing` an
 There is a demo level (`SentryDemo.umap`) in project's Content folder which presents a simple UI allowing to send some test events to Sentry. `W_SentryDemo` blueprint implementation shows how to call the plugin API and can be used as a reference.
 
 In order to run the demo level navigate to `Content Browser -> Content -> Maps` and open `SentryDemo` map. Hit play to launch the demo.
+
+## Modifying plugin content
+
+All files that belong to the plugin are listed in the snapshot files:
+
+- `/scripts/packaging/package-github.snapshot` (for the GitHub package)
+- `/scripts/packaging/package-marketplace.snapshot` (for the Marketplace package)
+
+If you add, delete or move files within the `plugin-dev` directory these snapshot files must be updated to reflect the changes. To do that, run:
+
+```bash
+pwsh ./scripts/packaging/pack.ps1
+pwsh ./scripts/packaging/test-contents.ps1 accept
+```
+
+Once completed, make sure to commit the updated snapshot files to Git.
+
+CI will run a separate check to compare the actual plugin package contents against the snapshot files.

modules/sentry-cocoa.properties

@@ -1,2 +1,2 @@
-version=8.50.0
+version=8.51.1
 repo=https://github.com/getsentry/sentry-cocoa

modules/sentry-java

@@ -72,16 +72,7 @@ if not "%EnabledConfigurations%"=="" (
   )
 )
 
-if "%TargetPlatform%"=="Win64" (
-    set CliExec=%PluginPath:"=%\Source\ThirdParty\CLI\sentry-cli-Windows-x86_64.exe
-) else if "%TargetPlatform%"=="Linux" (
-    set CliExec=%PluginPath:"=%\Source\ThirdParty\CLI\sentry-cli-Windows-x86_64.exe
-) else if "%TargetPlatform%"=="LinuxArm64" (
-    set CliExec=%PluginPath:"=%\Source\ThirdParty\CLI\sentry-cli-Windows-x86_64.exe
-) else (
-    echo Warning: Sentry: Unexpected platform %TargetPlatform%. Skipping...
-    exit /B 0
-)
+set CliExec=%PluginPath:"=%\Source\ThirdParty\CLI\sentry-cli-Windows-x86_64.exe
 
 if not exist "%CliExec%" (
     echo Error: Sentry: Sentry CLI is missing. Skipping...

modules/sentry-native

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.0.0-alpha.6",
+	"VersionName": "1.0.0-beta.1",
 	"FriendlyName": "Sentry",
 	"Description": "Sentry catches all your errors and performance issues, and shows you how to fix them before they bring down the player experience.",
 	"Category": "Code Plugins",
@@ -31,7 +31,6 @@
 	"PostBuildSteps":
 	{
 		"Mac": [
-			"if [ $(TargetPlatform) = \"Mac\" ] && [ ! -f \"$(PluginDir)/Binaries/Mac/sentry.dylib\" ]; then\n cp \"$(PluginDir)/Source/ThirdParty/Mac/bin/sentry.dylib\" \"$(PluginDir)/Binaries/Mac/sentry.dylib\"\nfi",
 			"if [ -f \"$(PluginDir)/Scripts/upload-debug-symbols.sh\" ]; then\n \"$(PluginDir)/Scripts/upload-debug-symbols.sh\" $(TargetPlatform) $(TargetName) $(TargetType) $(TargetConfiguration) \"$(ProjectDir)\" \"$(PluginDir)\"\nelse\n echo \"Sentry: Symbol upload script is missing. Skipping post build step.\"\nfi"
 		],
 		"Linux": [

plugin-dev/Scripts/upload-debug-symbols-win.bat

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryAttachment.h"
 
@@ -7,14 +7,14 @@
 
 FAndroidSentryAttachment::FAndroidSentryAttachment(const TArray<uint8>& data, const FString& filename, const FString& contentType)
 	: FSentryJavaObjectWrapper(SentryJavaClasses::Attachment, "([BLjava/lang/String;Ljava/lang/String;)V",
-		FAndroidSentryConverters::ByteArrayToNative(data), *GetJString(filename), *GetJString(contentType))
+		  FAndroidSentryConverters::ByteArrayToNative(data), *GetJString(filename), *GetJString(contentType))
 {
 	SetupClassMethods();
 }
 
 FAndroidSentryAttachment::FAndroidSentryAttachment(const FString& path, const FString& filename, const FString& contentType)
 	: FSentryJavaObjectWrapper(SentryJavaClasses::Attachment, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-		*GetJString(path), *GetJString(filename), *GetJString(contentType))
+		  *GetJString(path), *GetJString(filename), *GetJString(contentType))
 {
 	SetupClassMethods();
 }

plugin-dev/Sentry.uplugin

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryAttachment.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryBreadcrumb.h"
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryAttachment.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryEvent.h"
 #include "AndroidSentryId.h"
@@ -26,6 +26,8 @@ void FAndroidSentryEvent::SetupClassMethods()
 	GetMessageMethod = GetMethod("getMessage", "()Lio/sentry/protocol/Message;");
 	SetLevelMethod = GetMethod("setLevel", "(Lio/sentry/SentryLevel;)V");
 	GetLevelMethod = GetMethod("getLevel", "()Lio/sentry/SentryLevel;");
+	SetFingerprintMethod = GetMethod("setFingerprints", "(Ljava/util/List;)V");
+	GetFingerprintMethod = GetMethod("getFingerprints()", "()Ljava/util/List;");
 	IsCrashMethod = GetMethod("isCrashed", "()Z");
 }
 
@@ -57,6 +59,17 @@ ESentryLevel FAndroidSentryEvent::GetLevel() const
 	return FAndroidSentryConverters::SentryLevelToUnreal(*level);
 }
 
+void FAndroidSentryEvent::SetFingerprint(const TArray<FString>& fingerprint)
+{
+	CallMethod<void>(SetFingerprintMethod, FAndroidSentryConverters::StringArrayToNative(fingerprint)->GetJObject());
+}
+
+TArray<FString> FAndroidSentryEvent::GetFingerprint()
+{
+	auto fingerprint = CallObjectMethod<jobject>(GetFingerprintMethod);
+	return FAndroidSentryConverters::StringListToUnreal(*fingerprint);
+}
+
 bool FAndroidSentryEvent::IsCrash() const
 {
 	return CallMethod<bool>(IsCrashMethod);

plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 
@@ -19,6 +19,8 @@ class FAndroidSentryEvent : public ISentryEvent, public FSentryJavaObjectWrapper
 	virtual FString GetMessage() const override;
 	virtual void SetLevel(ESentryLevel level) override;
 	virtual ESentryLevel GetLevel() const override;
+	virtual void SetFingerprint(const TArray<FString>& fingerprint) override;
+	virtual TArray<FString> GetFingerprint() override;
 	virtual bool IsCrash() const override;
 	virtual bool IsAnr() const override;
 
@@ -28,6 +30,8 @@ class FAndroidSentryEvent : public ISentryEvent, public FSentryJavaObjectWrapper
 	FSentryJavaMethod GetMessageMethod;
 	FSentryJavaMethod SetLevelMethod;
 	FSentryJavaMethod GetLevelMethod;
+	FSentryJavaMethod SetFingerprintMethod;
+	FSentryJavaMethod GetFingerprintMethod;
 	FSentryJavaMethod IsCrashMethod;
 };
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryEvent.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryHint.h"
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryEvent.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryHint.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryId.h"
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryHint.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryId.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentryMessage.h"
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryId.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once
 

plugin-dev/Source/Sentry/Private/Android/AndroidSentryMessage.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #include "AndroidSentrySamplingContext.h"
 #include "AndroidSentryTransactionContext.h"
@@ -27,7 +27,7 @@ TSharedPtr<ISentryTransactionContext> FAndroidSentrySamplingContext::GetTransact
 TMap<FString, FString> FAndroidSentrySamplingContext::GetCustomSamplingContext() const
 {
 	auto customSamplingContext = CallObjectMethod<jobject>(GetCustomSamplingContextMethod);
-	if(!customSamplingContext)
+	if (!customSamplingContext)
 		return TMap<FString, FString>();
 
 	FSentryJavaObjectWrapper NativeCustomSamplingContext(SentryJavaClasses::CustomSamplingContext, *customSamplingContext);

plugin-dev/Source/Sentry/Private/Android/AndroidSentryMessage.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 Sentry. All Rights Reserved.
+// Copyright (c) 2025 Sentry. All Rights Reserved.
 
 #pragma once