Refactor code to better align with Unreal's structure

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 - Remove custom transport implementation for Linux ([#748](https://github.com/getsentry/sentry-unreal/pull/748))
+- Refactor code to better align with Unreal's structure ([#745](https://github.com/getsentry/sentry-unreal/pull/745))
 
 ### Fixes
 

plugin-dev/Source/Sentry/Private/Android/Jni/SentryJniAndroid.cpp

@@ -35,10 +35,8 @@ JNI_METHOD jobject Java_io_sentry_unreal_SentryBridgeJava_onBeforeSend(JNIEnv* e
 
 	USentryBeforeSendHandler* handler = reinterpret_cast<USentryBeforeSendHandler*>(objAddr);
 
-	USentryEvent* EventToProcess = NewObject<USentryEvent>();
-	EventToProcess->InitWithNativeImpl(MakeShareable(new SentryEventAndroid(event)));
-	USentryHint* HintToProcess = NewObject<USentryHint>();
-	HintToProcess->InitWithNativeImpl(MakeShareable(new SentryHintAndroid(hint)));
+	USentryEvent* EventToProcess = USentryEvent::Create(MakeShareable(new SentryEventAndroid(event)));
+	USentryHint* HintToProcess = USentryHint::Create(MakeShareable(new SentryHintAndroid(hint)));
 
 	return handler->HandleBeforeSend(EventToProcess, HintToProcess) ? event : nullptr;
 }
@@ -49,8 +47,7 @@ JNI_METHOD jfloat Java_io_sentry_unreal_SentryBridgeJava_onTracesSampler(JNIEnv*
 
 	USentryTraceSampler* sampler = reinterpret_cast<USentryTraceSampler*>(objAddr);
 
-	USentrySamplingContext* Context = NewObject<USentrySamplingContext>();
-	Context->InitWithNativeImpl(MakeShareable(new SentrySamplingContextAndroid(samplingContext)));
+	USentrySamplingContext* Context = USentrySamplingContext::Create(MakeShareable(new SentrySamplingContextAndroid(samplingContext)));
 
 	float samplingValue;
 	if(sampler->Sample(Context, samplingValue))

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

@@ -37,3 +37,5 @@ class SentrySubsystemAndroid : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override;
 };
+
+typedef SentrySubsystemAndroid FPlatformSentrySubsystem;

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

@@ -25,16 +25,16 @@ void SentryTransactionAndroid::SetupClassMethods()
 	ToSentryTraceMethod = GetMethod("toSentryTrace", "()Lio/sentry/SentryTraceHeader;");
 }
 
-TSharedPtr<ISentrySpan> SentryTransactionAndroid::StartChild(const FString& operation, const FString& desctiption)
+TSharedPtr<ISentrySpan> SentryTransactionAndroid::StartChildSpan(const FString& operation, const FString& desctiption)
 {
 	auto span = CallObjectMethod<jobject>(StartChildMethod, *GetJString(operation), *GetJString(desctiption));
 	return MakeShareable(new SentrySpanAndroid(*span));
 }
 
-TSharedPtr<ISentrySpan> SentryTransactionAndroid::StartChildWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp)
+TSharedPtr<ISentrySpan> SentryTransactionAndroid::StartChildSpanWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp)
 {
 	UE_LOG(LogSentrySdk, Log, TEXT("Starting child span with explicit timestamp not supported on Android."));
-	return StartChild(operation, desctiption);
+	return StartChildSpan(operation, desctiption);
 }
 
 void SentryTransactionAndroid::Finish()

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

@@ -13,8 +13,8 @@ class SentryTransactionAndroid : public ISentryTransaction, public FSentryJavaOb
 
 	void SetupClassMethods();
 
-	virtual TSharedPtr<ISentrySpan> StartChild(const FString& operation, const FString& desctiption) override;
-	virtual TSharedPtr<ISentrySpan> StartChildWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp) override;
+	virtual TSharedPtr<ISentrySpan> StartChildSpan(const FString& operation, const FString& desctiption) override;
+	virtual TSharedPtr<ISentrySpan> StartChildSpanWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp) override;
 	virtual void Finish() override;
 	virtual void FinishWithTimestamp(int64 timestamp) override;
 	virtual bool IsFinished() const override;

plugin-dev/Source/Sentry/Private/Apple/SentrySubsystemApple.cpp

@@ -62,8 +62,7 @@ void SentrySubsystemApple::InitWithSettings(const USentrySettings* settings, USe
 			};
 			options.beforeSend = ^SentryEvent* (SentryEvent* event) {
 				FGCScopeGuard GCScopeGuard;
-				USentryEvent* EventToProcess = NewObject<USentryEvent>();
-				EventToProcess->InitWithNativeImpl(MakeShareable(new SentryEventApple(event)));
+				USentryEvent* EventToProcess = USentryEvent::Create(MakeShareable(new SentryEventApple(event)));
 				return beforeSendHandler->HandleBeforeSend(EventToProcess, nullptr) ? event : nullptr;
 			};
 			for (auto it = settings->InAppInclude.CreateConstIterator(); it; ++it)
@@ -83,8 +82,7 @@ void SentrySubsystemApple::InitWithSettings(const USentrySettings* settings, USe
 			{
 				options.tracesSampler = ^NSNumber* (SentrySamplingContext* samplingContext) {
 					FGCScopeGuard GCScopeGuard;
-					USentrySamplingContext* Context = NewObject<USentrySamplingContext>();
-					Context->InitWithNativeImpl(MakeShareable(new SentrySamplingContextApple(samplingContext)));
+					USentrySamplingContext* Context = USentrySamplingContext::Create(MakeShareable(new SentrySamplingContextApple(samplingContext)));
 					float samplingValue;
 					return traceSampler->Sample(Context, samplingValue) ? [NSNumber numberWithFloat:samplingValue] : nil;
 				};

plugin-dev/Source/Sentry/Private/Apple/SentrySubsystemApple.h

@@ -37,3 +37,5 @@ class SentrySubsystemApple : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override;
 };
+
+typedef SentrySubsystemApple FPlatformSentrySubsystem;

plugin-dev/Source/Sentry/Private/Apple/SentryTransactionApple.cpp

@@ -26,16 +26,16 @@ id<SentrySpan> SentryTransactionApple::GetNativeObject()
 	return TransactionApple;
 }
 
-TSharedPtr<ISentrySpan> SentryTransactionApple::StartChild(const FString& operation, const FString& desctiption)
+TSharedPtr<ISentrySpan> SentryTransactionApple::StartChildSpan(const FString& operation, const FString& desctiption)
 {
 	id<SentrySpan> span = [TransactionApple startChildWithOperation:operation.GetNSString() description:desctiption.GetNSString()];
 	return MakeShareable(new SentrySpanApple(span));
 }
 
-TSharedPtr<ISentrySpan> SentryTransactionApple::StartChildWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp)
+TSharedPtr<ISentrySpan> SentryTransactionApple::StartChildSpanWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp)
 {
 	UE_LOG(LogSentrySdk, Log, TEXT("Starting child span with explicit timestamp not supported on Mac/iOS."));
-	return StartChild(operation, desctiption);
+	return StartChildSpan(operation, desctiption);
 }
 
 void SentryTransactionApple::Finish()

plugin-dev/Source/Sentry/Private/Apple/SentryTransactionApple.h

@@ -14,8 +14,8 @@ class SentryTransactionApple : public ISentryTransaction
 
 	id<SentrySpan> GetNativeObject();
 
-	virtual TSharedPtr<ISentrySpan> StartChild(const FString& operation, const FString& desctiption) override;
-	virtual TSharedPtr<ISentrySpan> StartChildWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp) override;
+	virtual TSharedPtr<ISentrySpan> StartChildSpan(const FString& operation, const FString& desctiption) override;
+	virtual TSharedPtr<ISentrySpan> StartChildSpanWithTimestamp(const FString& operation, const FString& desctiption, int64 timestamp) override;
 	virtual void Finish() override;
 	virtual void FinishWithTimestamp(int64 timestamp) override;
 	virtual bool IsFinished() const override;

plugin-dev/Source/Sentry/Private/Core/SentryDsnUrl.h

@@ -0,0 +1,48 @@
+// Copyright (c) 2023 Sentry. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+#if USE_SENTRY_NATIVE
+
+class FSentryDsnUrl
+{
+public:
+	FSentryDsnUrl(const FString& Dsn)
+	{
+		FString UrlRemainder;
+
+		Dsn.Split(TEXT("://"), &Scheme, &UrlRemainder);
+		UrlRemainder.Split(TEXT("@"), &Key, &UrlRemainder);
+		UrlRemainder.Split(TEXT("/"), &Host, &ProjectId);
+	}
+
+	const FString& GetScheme() const
+	{
+		return Scheme;
+	}
+
+	const FString& GetHost() const
+	{
+		return Host;
+	}
+
+	const FString& GetProjectId() const
+	{
+		return ProjectId;
+	}
+
+	const FString& GetKey() const
+	{
+		return Key;
+	}
+
+private:
+	FString Scheme;
+	FString Key;
+	FString Host;
+	FString ProjectId;
+};
+
+#endif // USE_SENTRY_NATIVE