Add local scope implementation for desktop

Author: tustanivsky

plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryScope.cpp

@@ -14,20 +14,13 @@
 #if USE_SENTRY_NATIVE
 
 FGenericPlatformSentryScope::FGenericPlatformSentryScope()
-	: Level(ESentryLevel::Debug)
 {
+	Scope = sentry_local_scope_new();
 }
 
-FGenericPlatformSentryScope::FGenericPlatformSentryScope(const FGenericPlatformSentryScope& Scope)
+FGenericPlatformSentryScope::FGenericPlatformSentryScope(sentry_scope_t* scope)
+	: Scope(scope)
 {
-	Dist = Scope.Dist;
-	Environment = Scope.Environment;
-	Fingerprint = Scope.Fingerprint;
-	Tags = Scope.Tags;
-	Extra = Scope.Extra;
-	Contexts = Scope.Contexts;
-	Breadcrumbs = TRingBuffer<TSharedPtr<FGenericPlatformSentryBreadcrumb>>(Scope.Breadcrumbs);
-	Level = Scope.Level;
 }
 
 FGenericPlatformSentryScope::~FGenericPlatformSentryScope()
@@ -36,21 +29,11 @@ FGenericPlatformSentryScope::~FGenericPlatformSentryScope()
 
 void FGenericPlatformSentryScope::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb)
 {
-	FScopeLock Lock(&CriticalSection);
-
-	if (Breadcrumbs.Num() >= FSentryModule::Get().GetSettings()->MaxBreadcrumbs)
-	{
-		Breadcrumbs.PopFront();
-	}
-
-	Breadcrumbs.Add(StaticCastSharedPtr<FGenericPlatformSentryBreadcrumb>(breadcrumb));
+	sentry_scope_add_breadcrumb(Scope, StaticCastSharedPtr<FGenericPlatformSentryBreadcrumb>(breadcrumb)->GetNativeObject());
 }
 
 void FGenericPlatformSentryScope::ClearBreadcrumbs()
 {
-	FScopeLock Lock(&CriticalSection);
-
-	Breadcrumbs.Empty();
 }
 
 void FGenericPlatformSentryScope::AddAttachment(TSharedPtr<ISentryAttachment> attachment)
@@ -65,237 +48,109 @@ void FGenericPlatformSentryScope::ClearAttachments()
 
 void FGenericPlatformSentryScope::SetTagValue(const FString& key, const FString& value)
 {
-	Tags.Add(key, value);
+	sentry_scope_set_tag(Scope, TCHAR_TO_UTF8(*key), TCHAR_TO_UTF8(*value));
 }
 
 FString FGenericPlatformSentryScope::GetTagValue(const FString& key) const
 {
-	if (!Tags.Contains(key))
-		return FString();
-
-	return Tags[key];
+	return FString();
 }
 
 void FGenericPlatformSentryScope::RemoveTag(const FString& key)
 {
-	Tags.Remove(key);
 }
 
 void FGenericPlatformSentryScope::SetTags(const TMap<FString, FString>& tags)
 {
-	Tags.Append(tags);
+	for (const auto& tagItem : tags)
+	{
+		SetTagValue(tagItem.Key, tagItem.Value);
+	}
 }
 
 TMap<FString, FString> FGenericPlatformSentryScope::GetTags() const
 {
-	return Tags;
+	return TMap<FString, FString>();
 }
 
 void FGenericPlatformSentryScope::SetDist(const FString& dist)
 {
-	Dist = dist;
+	// Set via options during initialization
 }
 
 FString FGenericPlatformSentryScope::GetDist() const
 {
-	return Dist;
+	return FString();
 }
 
 void FGenericPlatformSentryScope::SetEnvironment(const FString& environment)
 {
-	Environment = environment;
+	// Set via options during initialization
 }
 
 FString FGenericPlatformSentryScope::GetEnvironment() const
 {
-	return Environment;
+	return FString();
 }
 
 void FGenericPlatformSentryScope::SetFingerprint(const TArray<FString>& fingerprint)
 {
-	Fingerprint = fingerprint;
+	sentry_scope_set_fingerprints(Scope, FGenericPlatformSentryConverters::StringArrayToNative(fingerprint));
 }
 
 TArray<FString> FGenericPlatformSentryScope::GetFingerprint() const
 {
-	return Fingerprint;
+	return TArray<FString>();
 }
 
 void FGenericPlatformSentryScope::SetLevel(ESentryLevel level)
 {
-	Level = level;
+	sentry_scope_set_level(Scope, FGenericPlatformSentryConverters::SentryLevelToNative(level));
 }
 
 ESentryLevel FGenericPlatformSentryScope::GetLevel() const
 {
-
-	return Level;
+	return ESentryLevel::Debug;
 }
 
 void FGenericPlatformSentryScope::SetContext(const FString& key, const TMap<FString, FString>& values)
 {
-	Contexts.Add(key, values);
+	sentry_scope_set_context(Scope, TCHAR_TO_UTF8(*key), FGenericPlatformSentryConverters::StringMapToNative(values));
 }
 
 void FGenericPlatformSentryScope::RemoveContext(const FString& key)
 {
-	if (!Contexts.Contains(key))
-		return;
-
-	Contexts.Remove(key);
 }
 
 void FGenericPlatformSentryScope::SetExtraValue(const FString& key, const FString& value)
 {
-	Extra.Add(key, value);
+	sentry_scope_set_extra(Scope, TCHAR_TO_UTF8(*key), sentry_value_new_string(TCHAR_TO_UTF8(*value)));
 }
 
 FString FGenericPlatformSentryScope::GetExtraValue(const FString& key) const
 {
-	if (!Extra.Contains(key))
-		return FString();
-
-	return Extra[key];
+	return FString();
 }
 
 void FGenericPlatformSentryScope::RemoveExtra(const FString& key)
 {
-	if (!Extra.Contains(key))
-		return;
-
-	Extra.Remove(key);
 }
 
 void FGenericPlatformSentryScope::SetExtras(const TMap<FString, FString>& extras)
 {
-	Extra.Append(extras);
+	for (const auto& extraItem : extras)
+	{
+		SetExtraValue(extraItem.Key, extraItem.Value);
+	}
 }
 
 TMap<FString, FString> FGenericPlatformSentryScope::GetExtras() const
 {
-	return Extra;
+	return TMap<FString, FString>();
 }
 
 void FGenericPlatformSentryScope::Clear()
 {
-	Dist = FString();
-	Environment = FString();
-	Fingerprint.Empty();
-	Tags.Empty();
-	Extra.Empty();
-	Contexts.Empty();
-	Breadcrumbs.Empty();
-	Level = ESentryLevel::Debug;
-}
-
-void FGenericPlatformSentryScope::Apply(TSharedPtr<FGenericPlatformSentryEvent> event)
-{
-	sentry_value_t nativeEvent = event->GetNativeObject();
-
-	sentry_value_t eventLevel = sentry_value_get_by_key(nativeEvent, "level");
-
-	FString scopeLevelStr = FGenericPlatformSentryConverters::SentryLevelToString(Level).ToLower();
-	if (!scopeLevelStr.IsEmpty() && sentry_value_is_null(eventLevel))
-	{
-		sentry_value_set_by_key(nativeEvent, "level", sentry_value_new_string(TCHAR_TO_ANSI(*scopeLevelStr)));
-	}
-
-	if (!Dist.IsEmpty())
-	{
-		sentry_value_set_by_key(nativeEvent, "dist", sentry_value_new_string(TCHAR_TO_ANSI(*Dist)));
-	}
-
-	if (!Environment.IsEmpty())
-	{
-		sentry_value_set_by_key(nativeEvent, "environment", sentry_value_new_string(TCHAR_TO_ANSI(*Environment)));
-	}
-
-	if (Fingerprint.Num() > 0)
-	{
-		sentry_value_set_by_key(nativeEvent, "fingerprint", FGenericPlatformSentryConverters::StringArrayToNative(Fingerprint));
-	}
-
-	if (Tags.Num() > 0)
-	{
-		sentry_value_t tagsExtra = sentry_value_get_by_key(nativeEvent, "tags");
-		if (sentry_value_is_null(tagsExtra))
-		{
-			sentry_value_set_by_key(nativeEvent, "tags", FGenericPlatformSentryConverters::StringMapToNative(Tags));
-		}
-		else
-		{
-			for (const auto& TagItem : Tags)
-			{
-				sentry_value_set_by_key(tagsExtra, TCHAR_TO_ANSI(*TagItem.Key), sentry_value_new_string(TCHAR_TO_ANSI(*TagItem.Value)));
-			}
-		}
-	}
-
-	if (Extra.Num() > 0)
-	{
-		sentry_value_t eventExtra = sentry_value_get_by_key(nativeEvent, "extra");
-		if (sentry_value_is_null(eventExtra))
-		{
-			sentry_value_set_by_key(nativeEvent, "extra", FGenericPlatformSentryConverters::StringMapToNative(Extra));
-		}
-		else
-		{
-			for (const auto& ExtraItem : Extra)
-			{
-				sentry_value_set_by_key(eventExtra, TCHAR_TO_ANSI(*ExtraItem.Key), sentry_value_new_string(TCHAR_TO_ANSI(*ExtraItem.Value)));
-			}
-		}
-	}
-
-	if (Contexts.Num() > 0)
-	{
-		sentry_value_t eventContexts = sentry_value_get_by_key(nativeEvent, "contexts");
-		if (sentry_value_is_null(eventContexts))
-		{
-			eventContexts = sentry_value_new_object();
-
-			for (const auto& ContextsItem : Contexts)
-			{
-				sentry_value_set_by_key(eventContexts, TCHAR_TO_ANSI(*ContextsItem.Key), FGenericPlatformSentryConverters::StringMapToNative(ContextsItem.Value));
-			}
-
-			sentry_value_set_by_key(nativeEvent, "contexts", eventContexts);
-		}
-		else
-		{
-			for (const auto& ContextsItem : Contexts)
-			{
-				sentry_value_set_by_key(eventContexts, TCHAR_TO_ANSI(*ContextsItem.Key), FGenericPlatformSentryConverters::StringMapToNative(ContextsItem.Value));
-			}
-		}
-	}
-
-	if (!Breadcrumbs.IsEmpty())
-	{
-		sentry_value_t eventBreadcrumbs = sentry_value_get_by_key(nativeEvent, "breadcrumbs");
-		if (sentry_value_is_null(eventBreadcrumbs))
-		{
-			eventBreadcrumbs = sentry_value_new_list();
-
-			for (const auto& Breadcrumb : Breadcrumbs)
-			{
-				sentry_value_t nativeBreadcrumb = Breadcrumb->GetNativeObject();
-				sentry_value_incref(nativeBreadcrumb);
-				sentry_value_append(eventBreadcrumbs, nativeBreadcrumb);
-			}
-
-			sentry_value_set_by_key(nativeEvent, "breadcrumbs", eventBreadcrumbs);
-		}
-		else
-		{
-			for (const auto& Breadcrumb : Breadcrumbs)
-			{
-				sentry_value_t nativeBreadcrumb = Breadcrumb->GetNativeObject();
-				sentry_value_incref(nativeBreadcrumb);
-				sentry_value_append(eventBreadcrumbs, nativeBreadcrumb);
-			}
-		}
-	}
 }
 
 #endif

plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryScope.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include "Containers/RingBuffer.h"
-#include "HAL/CriticalSection.h"
+#include "Convenience/GenericPlatformSentryInclude.h"
 
 #include "Interface/SentryScopeInterface.h"
 
@@ -16,7 +15,7 @@ class FGenericPlatformSentryScope : public ISentryScope
 {
 public:
 	FGenericPlatformSentryScope();
-	FGenericPlatformSentryScope(const FGenericPlatformSentryScope& Scope);
+	FGenericPlatformSentryScope(sentry_scope_t* scope);
 	virtual ~FGenericPlatformSentryScope() override;
 
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) override;
@@ -45,24 +44,8 @@ class FGenericPlatformSentryScope : public ISentryScope
 	virtual TMap<FString, FString> GetExtras() const override;
 	virtual void Clear() override;
 
-	void Apply(TSharedPtr<FGenericPlatformSentryEvent> event);
-
 private:
-	FString Dist;
-	FString Environment;
-
-	TArray<FString> Fingerprint;
-
-	TMap<FString, FString> Tags;
-	TMap<FString, FString> Extra;
-
-	TMap<FString, TMap<FString, FString>> Contexts;
-
-	TRingBuffer<TSharedPtr<FGenericPlatformSentryBreadcrumb>> Breadcrumbs;
-
-	ESentryLevel Level;
-
-	FCriticalSection CriticalSection;
+	sentry_scope_t* Scope;
 };
 
 typedef FGenericPlatformSentryScope FPlatformSentryScope;