Skip to content

Commit c58ab08

Browse files
tustanivskytustanivsky
committed
Merge branch 'main' into demo/build-settings
2 parents e2b9d7d + 437d21a commit c58ab08

File tree

84 files changed

+470
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+470
-407
lines changed

‎.clang-format

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
AccessModifierOffset: -4
2+
AlignAfterOpenBracket: DontAlign
3+
AllowShortLambdasOnASingleLine: None
4+
LambdaBodyIndentation: OuterScope
5+
AllowAllParametersOfDeclarationOnNextLine: false
6+
AllowAllArgumentsOnNextLine: false
7+
BreakBeforeBraces: Allman
8+
BreakConstructorInitializersBeforeComma: true
9+
BreakStringLiterals: false
10+
ColumnLimit: 0
11+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
12+
IncludeCategories:
13+
- Regex: '.*\.generated\.h'
14+
Priority: 100
15+
- Regex: '.*(PCH).*'
16+
Priority: -1
17+
- Regex: '".*"'
18+
Priority: 1
19+
- Regex: '^<.*\.(h)>'
20+
Priority: 3
21+
- Regex: '^<.*>'
22+
Priority: 4
23+
IndentWidth: 4
24+
ObjCBlockIndentWidth: 4
25+
ObjCBreakBeforeNestedBlockParam: false
26+
PointerAlignment: Left
27+
SpacesInContainerLiterals: true
28+
SpaceAfterTemplateKeyword: false
29+
Standard: c++11
30+
TabWidth: 4
31+
UseTab: Always
32+
MacroBlockBegin: '^BEGIN_DEFINE_SPEC'
33+
MacroBlockEnd: '^END_DEFINE_SPEC'
34+
Cpp11BracedListStyle: false

‎.github/workflows/lint.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "Lint"
2+
on:
3+
push:
4+
5+
jobs:
6+
lint:
7+
name: Lint
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v4
12+
with:
13+
submodules: recursive
14+
15+
- name: Clang Format
16+
run: find plugin-dev/Source/Sentry plugin-dev/Source/SentryEditor -name '*.h' -o -name '*.cpp' | xargs /usr/bin/clang-format --dry-run --Werror

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
FAndroidSentryAttachment::FAndroidSentryAttachment(const TArray<uint8>& data, const FString& filename, const FString& contentType)
99
: FSentryJavaObjectWrapper(SentryJavaClasses::Attachment, "([BLjava/lang/String;Ljava/lang/String;)V",
10-
FAndroidSentryConverters::ByteArrayToNative(data), *GetJString(filename), *GetJString(contentType))
10+
FAndroidSentryConverters::ByteArrayToNative(data), *GetJString(filename), *GetJString(contentType))
1111
{
1212
SetupClassMethods();
1313
}
1414

1515
FAndroidSentryAttachment::FAndroidSentryAttachment(const FString& path, const FString& filename, const FString& contentType)
1616
: FSentryJavaObjectWrapper(SentryJavaClasses::Attachment, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
17-
*GetJString(path), *GetJString(filename), *GetJString(contentType))
17+
*GetJString(path), *GetJString(filename), *GetJString(contentType))
1818
{
1919
SetupClassMethods();
2020
}

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentrySamplingContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TSharedPtr<ISentryTransactionContext> FAndroidSentrySamplingContext::GetTransact
2727
TMap<FString, FString> FAndroidSentrySamplingContext::GetCustomSamplingContext() const
2828
{
2929
auto customSamplingContext = CallObjectMethod<jobject>(GetCustomSamplingContextMethod);
30-
if(!customSamplingContext)
30+
if (!customSamplingContext)
3131
return TMap<FString, FString>();
3232

3333
FSentryJavaObjectWrapper NativeCustomSamplingContext(SentryJavaClasses::CustomSamplingContext, *customSamplingContext);

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentryScope.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
#include "AndroidSentryScope.h"
44

5-
#include "AndroidSentryBreadcrumb.h"
65
#include "AndroidSentryAttachment.h"
6+
#include "AndroidSentryBreadcrumb.h"
77

88
#include "Infrastructure/AndroidSentryConverters.h"
99
#include "Infrastructure/AndroidSentryJavaClasses.h"
1010

1111
FAndroidSentryScope::FAndroidSentryScope()
12-
: FSentryJavaObjectWrapper(FSentryJavaClass { "io/sentry/Scope", ESentryJavaClassType::External }, "(Lio/sentry/SentryOptions;)V",
13-
*FSentryJavaObjectWrapper::CallStaticObjectMethod<jobject>(SentryJavaClasses::SentryBridgeJava, "getOptions", "()Lio/sentry/SentryOptions;"))
12+
: FSentryJavaObjectWrapper(SentryJavaClasses::ScopeImpl, "(Lio/sentry/SentryOptions;)V",
13+
*FSentryJavaObjectWrapper::CallStaticObjectMethod<jobject>(SentryJavaClasses::SentryBridgeJava, "getOptions", "()Lio/sentry/SentryOptions;"))
1414
{
1515
SetupClassMethods();
1616
}

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentrySpan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void FAndroidSentrySpan::FinishWithTimestamp(int64 timestamp)
4848

4949
bool FAndroidSentrySpan::IsFinished() const
5050
{
51-
return CallMethod<bool>(IsFinishedMethod);;
51+
return CallMethod<bool>(IsFinishedMethod);
5252
}
5353

5454
void FAndroidSentrySpan::SetTag(const FString& key, const FString& value)

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
#include "AndroidSentrySubsystem.h"
44

5-
#include "AndroidSentryEvent.h"
65
#include "AndroidSentryBreadcrumb.h"
7-
#include "AndroidSentryUserFeedback.h"
8-
#include "AndroidSentryUser.h"
6+
#include "AndroidSentryEvent.h"
7+
#include "AndroidSentryId.h"
98
#include "AndroidSentryTransaction.h"
109
#include "AndroidSentryTransactionContext.h"
1110
#include "AndroidSentryTransactionOptions.h"
12-
#include "AndroidSentryId.h"
11+
#include "AndroidSentryUser.h"
12+
#include "AndroidSentryUserFeedback.h"
1313

14-
#include "SentryDefines.h"
1514
#include "SentryBeforeSendHandler.h"
15+
#include "SentryDefines.h"
1616
#include "SentryTraceSampler.h"
1717

1818
#include "SentrySettings.h"
@@ -31,9 +31,7 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings,
3131
{
3232
TSharedPtr<FJsonObject> SettingsJson = MakeShareable(new FJsonObject);
3333
SettingsJson->SetStringField(TEXT("dsn"), settings->Dsn);
34-
SettingsJson->SetStringField(TEXT("release"), settings->OverrideReleaseName
35-
? settings->Release
36-
: settings->GetFormattedReleaseName());
34+
SettingsJson->SetStringField(TEXT("release"), settings->OverrideReleaseName ? settings->Release : settings->GetFormattedReleaseName());
3735
SettingsJson->SetStringField(TEXT("environment"), settings->Environment);
3836
SettingsJson->SetBoolField(TEXT("autoSessionTracking"), settings->EnableAutoSessionTracking);
3937
SettingsJson->SetNumberField(TEXT("sessionTimeout"), settings->SessionTimeout);
@@ -46,15 +44,15 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings,
4644
SettingsJson->SetArrayField(TEXT("inAppExclude"), FAndroidSentryConverters::StrinArrayToJsonArray(settings->InAppExclude));
4745
SettingsJson->SetBoolField(TEXT("sendDefaultPii"), settings->SendDefaultPii);
4846
SettingsJson->SetBoolField(TEXT("enableAnrTracking"), settings->EnableAppNotRespondingTracking);
49-
if(settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::UniformSampleRate)
47+
if (settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::UniformSampleRate)
5048
{
5149
SettingsJson->SetNumberField(TEXT("tracesSampleRate"), settings->TracesSampleRate);
5250
}
53-
if(settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::TracesSampler)
51+
if (settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::TracesSampler)
5452
{
5553
SettingsJson->SetNumberField(TEXT("tracesSampler"), (jlong)traceSampler);
5654
}
57-
if(beforeBreadcrumbHandler != nullptr)
55+
if (beforeBreadcrumbHandler != nullptr)
5856
{
5957
SettingsJson->SetNumberField(TEXT("beforeBreadcrumb"), (jlong)beforeBreadcrumbHandler);
6058
}
@@ -63,7 +61,7 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings,
6361
TSharedRef<TJsonWriter<>> JsonWriter = TJsonWriterFactory<>::Create(&SettingsJsonStr);
6462
FJsonSerializer::Serialize(SettingsJson.ToSharedRef(), JsonWriter);
6563

66-
FSentryJavaObjectWrapper::CallStaticMethod<void>(SentryJavaClasses::SentryBridgeJava,
64+
FSentryJavaObjectWrapper::CallStaticMethod<void>(SentryJavaClasses::SentryBridgeJava,
6765
"init", "(Landroid/app/Activity;Ljava/lang/String;J)V",
6866
FJavaWrapper::GameActivityThis,
6967
*FSentryJavaObjectWrapper::GetJString(SettingsJsonStr),
@@ -136,7 +134,7 @@ TSharedPtr<ISentryId> FAndroidSentrySubsystem::CaptureMessage(const FString& mes
136134
return MakeShareable(new FAndroidSentryId(*id));
137135
}
138136

139-
TSharedPtr<ISentryId> FAndroidSentrySubsystem::CaptureMessageWithScope(const FString& message, const FSentryScopeDelegate& onConfigureScope, ESentryLevel level)
137+
TSharedPtr<ISentryId> FAndroidSentrySubsystem::CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope)
140138
{
141139
int64 scopeCallbackId = AndroidSentryScopeCallback::SaveDelegate(onConfigureScope);
142140

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class FAndroidSentrySubsystem : public ISentrySubsystem
1515
virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) override;
1616
virtual void ClearBreadcrumbs() override;
1717
virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) override;
18-
virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, const FSentryScopeDelegate& onConfigureScope, ESentryLevel level) override;
18+
virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) override;
1919
virtual TSharedPtr<ISentryId> CaptureEvent(TSharedPtr<ISentryEvent> event) override;
2020
virtual TSharedPtr<ISentryId> CaptureEventWithScope(TSharedPtr<ISentryEvent> event, const FSentryScopeDelegate& onConfigureScope) override;
2121
virtual TSharedPtr<ISentryId> CaptureEnsure(const FString& type, const FString& message) override;

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentryTransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void FAndroidSentryTransaction::FinishWithTimestamp(int64 timestamp)
5050

5151
bool FAndroidSentryTransaction::IsFinished() const
5252
{
53-
return CallMethod<bool>(IsFinishedMethod);;
53+
return CallMethod<bool>(IsFinishedMethod);
5454
}
5555

5656
void FAndroidSentryTransaction::SetName(const FString& name)

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentryTransactionContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
FAndroidSentryTransactionContext::FAndroidSentryTransactionContext(const FString& name, const FString& operation)
99
: FSentryJavaObjectWrapper(SentryJavaClasses::TransactionContext, "(Ljava/lang/String;Ljava/lang/String;)V",
10-
*GetJString(name), *GetJString(operation))
10+
*GetJString(name), *GetJString(operation))
1111
{
1212
SetupClassMethods();
1313
}

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentryTransactionContext.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class FAndroidSentryTransactionContext : public ISentryTransactionContext, publi
1818
virtual FString GetOperation() const override;
1919

2020
private:
21-
2221
FSentryJavaMethod GetNameMethod;
2322
FSentryJavaMethod GetOperationMethod;
2423
};

‎plugin-dev/Source/Sentry/Private/Android/AndroidSentryUserFeedback.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
FAndroidSentryUserFeedback::FAndroidSentryUserFeedback(TSharedPtr<ISentryId> eventId)
1010
: FSentryJavaObjectWrapper(SentryJavaClasses::UserFeedback, "(Lio/sentry/protocol/SentryId;)V",
11-
StaticCastSharedPtr<FAndroidSentryId>(eventId)->GetJObject())
11+
StaticCastSharedPtr<FAndroidSentryId>(eventId)->GetJObject())
1212
{
1313
SetupClassMethods();
1414
}

‎plugin-dev/Source/Sentry/Private/Android/Infrastructure/AndroidSentryConverters.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) 2022 Sentry. All Rights Reserved.
22

33
#include "AndroidSentryConverters.h"
4-
#include "AndroidSentryJavaObjectWrapper.h"
54
#include "AndroidSentryJavaClasses.h"
5+
#include "AndroidSentryJavaObjectWrapper.h"
66

77
#include "SentryDefines.h"
88

@@ -142,7 +142,7 @@ TMap<FString, FString> FAndroidSentryConverters::StringMapToUnreal(jobject map)
142142
FSentryJavaMethod HasNextMethod = NativeIterator.GetMethod("hasNext", "()Z");
143143
FSentryJavaMethod NextMethod = NativeIterator.GetMethod("next", "()Ljava/lang/Object;");
144144

145-
while(NativeIterator.CallMethod<bool>(HasNextMethod))
145+
while (NativeIterator.CallMethod<bool>(HasNextMethod))
146146
{
147147
FSentryJavaObjectWrapper NativeMapEntry(SentryJavaClasses::MapEntry, *NativeIterator.CallObjectMethod<jobject>(NextMethod));
148148
FSentryJavaMethod GetKeyMethod = NativeMapEntry.GetMethod("getKey", "()Ljava/lang/Object;");

‎plugin-dev/Source/Sentry/Private/Android/Infrastructure/AndroidSentryJavaClasses.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "AndroidSentryJavaClasses.h"
44

5+
// clang-format off
6+
57
// External Java classes definitions
68
const FSentryJavaClass SentryJavaClasses::SentryBridgeJava = FSentryJavaClass { "io/sentry/unreal/SentryBridgeJava", ESentryJavaClassType::External };
79
const FSentryJavaClass SentryJavaClasses::Sentry = FSentryJavaClass { "io/sentry/Sentry", ESentryJavaClassType::External };
@@ -10,6 +12,7 @@ const FSentryJavaClass SentryJavaClasses::Breadcrumb = FSentryJavaClass { "io/
1012
const FSentryJavaClass SentryJavaClasses::SentryEvent = FSentryJavaClass { "io/sentry/SentryEvent", ESentryJavaClassType::External };
1113
const FSentryJavaClass SentryJavaClasses::SentryId = FSentryJavaClass { "io/sentry/protocol/SentryId", ESentryJavaClassType::External };
1214
const FSentryJavaClass SentryJavaClasses::Scope = FSentryJavaClass { "io/sentry/IScope", ESentryJavaClassType::External };
15+
const FSentryJavaClass SentryJavaClasses::ScopeImpl = FSentryJavaClass { "io/sentry/Scope", ESentryJavaClassType::External };
1316
const FSentryJavaClass SentryJavaClasses::User = FSentryJavaClass { "io/sentry/protocol/User", ESentryJavaClassType::External };
1417
const FSentryJavaClass SentryJavaClasses::UserFeedback = FSentryJavaClass { "io/sentry/UserFeedback", ESentryJavaClassType::External };
1518
const FSentryJavaClass SentryJavaClasses::Message = FSentryJavaClass { "io/sentry/protocol/Message", ESentryJavaClassType::External };
@@ -31,4 +34,6 @@ const FSentryJavaClass SentryJavaClasses::Set = FSentryJavaClass { "java/uti
3134
const FSentryJavaClass SentryJavaClasses::Iterator = FSentryJavaClass { "java/util/Iterator", ESentryJavaClassType::System };
3235
const FSentryJavaClass SentryJavaClasses::MapEntry = FSentryJavaClass { "java/util/Map$Entry", ESentryJavaClassType::System };
3336
const FSentryJavaClass SentryJavaClasses::List = FSentryJavaClass { "java/util/List", ESentryJavaClassType::System };
34-
const FSentryJavaClass SentryJavaClasses::Double = FSentryJavaClass { "java/lang/Double", ESentryJavaClassType::System };
37+
const FSentryJavaClass SentryJavaClasses::Double = FSentryJavaClass { "java/lang/Double", ESentryJavaClassType::System };
38+
39+
// clang-format on

‎plugin-dev/Source/Sentry/Private/Android/Infrastructure/AndroidSentryJavaClasses.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ struct SentryJavaClasses
1414
const static FSentryJavaClass SentryEvent;
1515
const static FSentryJavaClass SentryId;
1616
const static FSentryJavaClass Scope;
17+
const static FSentryJavaClass ScopeImpl;
1718
const static FSentryJavaClass User;
1819
const static FSentryJavaClass UserFeedback;
1920
const static FSentryJavaClass Message;

0 commit comments

Comments
 (0)