Skip to content

Fix compatibility issues with Cocoa SDK 9.0.0 #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+25 −25
Draft

Fix compatibility issues with Cocoa SDK 9.0.0 #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6697a73
Remove InAppExclude option as it's no longer supported by Cocoa SDK
tustanivsky Nov 14, 2025
6e2402e
Logs no longer experimental
tustanivsky Nov 14, 2025
96b0534
Rename logs enum
tustanivsky Nov 14, 2025
70bc5d8
Update changelog
tustanivsky Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Fix compatibility issues with Cocoa SDK 9.0.0 ([#1149](https://github.com/getsentry/sentry-unreal/pull/1149))

### Dependencies

- Bump Native SDK from v0.12.0 to v0.12.1 ([#1136](https://github.com/getsentry/sentry-unreal/pull/1136))
Expand Down
6 changes: 3 additions & 3 deletions plugin-dev/Source/Sentry/Private/Apple/AppleSentryLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FAppleSentryLog::FAppleSentryLog()
LogApple.traceId = [[SENTRY_APPLE_CLASS(SentryId) alloc] init];
LogApple.body = @"";
LogApple.attributes = @{};
LogApple.level = SentryStructuredLogLevelDebug;
LogApple.level = SentryLogLevelDebug;
}

FAppleSentryLog::FAppleSentryLog(SentryLog* log)
Expand Down Expand Up @@ -56,10 +56,10 @@ FString FAppleSentryLog::GetBody() const

void FAppleSentryLog::SetLevel(ESentryLevel level)
{
LogApple.level = FAppleSentryConverters::SentryStructuredLogLevelToNative(level);
LogApple.level = FAppleSentryConverters::SentryLogLevelToNative(level);
}

ESentryLevel FAppleSentryLog::GetLevel() const
{
return FAppleSentryConverters::SentryStructuredLogLevelToUnreal(LogApple.level);
return FAppleSentryConverters::SentryLogLevelToUnreal(LogApple.level);
}
6 changes: 1 addition & 5 deletions plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void FAppleSentrySubsystem::InitWithSettings(const USentrySettings* settings, US
options.maxBreadcrumbs = settings->MaxBreadcrumbs;
options.sendDefaultPii = settings->SendDefaultPii;
options.maxAttachmentSize = settings->MaxAttachmentSize;
options.experimental.enableLogs = settings->EnableStructuredLogging;
options.enableLogs = settings->EnableStructuredLogging;
#if SENTRY_UIKIT_AVAILABLE
options.attachScreenshot = settings->AttachScreenshot;
#endif
Expand All @@ -86,10 +86,6 @@ void FAppleSentrySubsystem::InitWithSettings(const USentrySettings* settings, US
{
[options addInAppInclude:it->GetNSString()];
}
for (auto it = settings->InAppExclude.CreateConstIterator(); it; ++it)
{
[options addInAppExclude:it->GetNSString()];
}
options.enableAppHangTracking = settings->EnableAppNotRespondingTracking;
if (settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::UniformSampleRate)
{
Expand Down
28 changes: 14 additions & 14 deletions plugin-dev/Source/Sentry/Private/Apple/Infrastructure/AppleSentryConverters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@ SentryLevel FAppleSentryConverters::SentryLevelToNative(ESentryLevel level)
return nativeLevel;
}

SentryStructuredLogLevel FAppleSentryConverters::SentryStructuredLogLevelToNative(ESentryLevel level)
SentryLogLevel FAppleSentryConverters::SentryLogLevelToNative(ESentryLevel level)
{
SentryStructuredLogLevel nativeLevel = SentryStructuredLogLevelDebug;
SentryLogLevel nativeLevel = SentryLogLevelDebug;

switch (level)
{
case ESentryLevel::Debug:
nativeLevel = SentryStructuredLogLevelDebug;
nativeLevel = SentryLogLevelDebug;
break;
case ESentryLevel::Info:
nativeLevel = SentryStructuredLogLevelInfo;
nativeLevel = SentryLogLevelInfo;
break;
case ESentryLevel::Warning:
nativeLevel = SentryStructuredLogLevelWarn;
nativeLevel = SentryLogLevelWarn;
break;
case ESentryLevel::Error:
nativeLevel = SentryStructuredLogLevelError;
nativeLevel = SentryLogLevelError;
break;
case ESentryLevel::Fatal:
nativeLevel = SentryStructuredLogLevelFatal;
nativeLevel = SentryLogLevelFatal;
break;
default:
UE_LOG(LogSentrySdk, Warning, TEXT("Unknown Sentry level value used. Debug will be returned."));
Expand Down Expand Up @@ -183,26 +183,26 @@ ESentryLevel FAppleSentryConverters::SentryLevelToUnreal(SentryLevel level)
return unrealLevel;
}

ESentryLevel FAppleSentryConverters::SentryStructuredLogLevelToUnreal(SentryStructuredLogLevel level)
ESentryLevel FAppleSentryConverters::SentryLogLevelToUnreal(SentryLogLevel level)
{
ESentryLevel unrealLevel = ESentryLevel::Debug;

switch (level)
{
case SentryStructuredLogLevelTrace:
case SentryStructuredLogLevelDebug:
case SentryLogLevelTrace:
case SentryLogLevelDebug:
unrealLevel = ESentryLevel::Debug;
break;
case SentryStructuredLogLevelInfo:
case SentryLogLevelInfo:
unrealLevel = ESentryLevel::Info;
break;
case SentryStructuredLogLevelWarn:
case SentryLogLevelWarn:
unrealLevel = ESentryLevel::Warning;
break;
case SentryStructuredLogLevelError:
case SentryLogLevelError:
unrealLevel = ESentryLevel::Error;
break;
case SentryStructuredLogLevelFatal:
case SentryLogLevelFatal:
unrealLevel = ESentryLevel::Fatal;
break;
default:
Expand Down
4 changes: 2 additions & 2 deletions plugin-dev/Source/Sentry/Private/Apple/Infrastructure/AppleSentryConverters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class FAppleSentryConverters
public:
/** Conversions to native Mac/iOS types */
static SentryLevel SentryLevelToNative(ESentryLevel level);
static SentryStructuredLogLevel SentryStructuredLogLevelToNative(ESentryLevel level);
static SentryLogLevel SentryLogLevelToNative(ESentryLevel level);
static NSDictionary* StringMapToNative(const TMap<FString, FString>& map);
static NSArray* StringArrayToNative(const TArray<FString>& array);
static NSData* ByteDataToNative(const TArray<uint8>& array);
Expand All @@ -27,7 +27,7 @@ class FAppleSentryConverters

/** Conversions from native Mac/iOS types */
static ESentryLevel SentryLevelToUnreal(SentryLevel level);
static ESentryLevel SentryStructuredLogLevelToUnreal(SentryStructuredLogLevel level);
static ESentryLevel SentryLogLevelToUnreal(SentryLogLevel level);
static TMap<FString, FString> StringMapToUnreal(NSDictionary* dict);
static TArray<FString> StringArrayToUnreal(NSArray* array);
static TArray<uint8> ByteDataToUnreal(NSData* data);
Expand Down
2 changes: 1 addition & 1 deletion plugin-dev/Source/Sentry/Public/SentrySettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class SENTRY_API USentrySettings : public UObject
TArray<FString> InAppInclude;

UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Mobile",
Meta = (DisplayName = "In-app excludes (for Android/Apple only)", Tooltip = "A list of string prefixes of module names that don't belong to the app."))
Meta = (DisplayName = "In-app excludes (for Android only)", Tooltip = "A list of string prefixes of module names that don't belong to the app."))
TArray<FString> InAppExclude;

UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Mobile",
Expand Down
Loading