Use variant for breadcrumb data

tustanivsky · tustanivsky · commit aae4b98453d5 · 2025-06-20T14:59:59.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ### Breaking Changes
 
-- In `SentryScope` class the "Value" suffix has been removed from the get/set functions for tags and extras.
-- The get/set functions for tags, contexts, and extras in `SentryScope` now accept a variant type instead of string for the value.
+- The "Value" suffix has been removed from the get/set function names for tags and extras in `SentryScope`.
+- The get/set functions for contexts and extras in `SentryScope` now accept a variant type instead of string for the value.
+- The get/set functions for arbitrary data in `SentryBreadcrumb` now accept a variant type instead of string for the value.
 
 ## 1.0.0-beta.3
 
diff --git a/plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.cpp b/plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.cpp
@@ -61,18 +61,18 @@ FString FAndroidSentryBreadcrumb::GetCategory() const
 	return CallMethod<FString>(GetCategoryMethod);
 }
 
-void FAndroidSentryBreadcrumb::SetData(const TMap<FString, FString>& data)
+void FAndroidSentryBreadcrumb::SetData(const TMap<FString, FSentryVariant>& data)
 {
 	for (const auto& dataItem : data)
 	{
-		CallMethod<void>(SetDataMethod, *GetJString(dataItem.Key), *GetJString(dataItem.Value));
+		CallMethod<void>(SetDataMethod, *GetJString(dataItem.Key), FAndroidSentryConverters::VariantToNative(dataItem.Value)->GetJObject());
 	}
 }
 
-TMap<FString, FString> FAndroidSentryBreadcrumb::GetData() const
+TMap<FString, FSentryVariant> FAndroidSentryBreadcrumb::GetData() const
 {
 	auto data = CallObjectMethod<jobject>(GetDataMethod);
-	return FAndroidSentryConverters::StringMapToUnreal(*data);
+	return FAndroidSentryConverters::VariantMapToUnreal(*data);
 }
 
 void FAndroidSentryBreadcrumb::SetLevel(ESentryLevel level)
diff --git a/plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.h b/plugin-dev/Source/Sentry/Private/Android/AndroidSentryBreadcrumb.h
@@ -20,8 +20,8 @@ class FAndroidSentryBreadcrumb : public ISentryBreadcrumb, public FSentryJavaObj
 	virtual FString GetType() const override;
 	virtual void SetCategory(const FString& category) override;
 	virtual FString GetCategory() const override;
-	virtual void SetData(const TMap<FString, FString>& data) override;
-	virtual TMap<FString, FString> GetData() const override;
+	virtual void SetData(const TMap<FString, FSentryVariant>& data) override;
+	virtual TMap<FString, FSentryVariant> GetData() const override;
 	virtual void SetLevel(ESentryLevel level) override;
 	virtual ESentryLevel GetLevel() const override;
 
diff --git a/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp
@@ -109,7 +109,7 @@ void FAndroidSentrySubsystem::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadc
 		breadcrumbAndroid->GetJObject());
 }
 
-void FAndroidSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)
+void FAndroidSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)
 {
 	TSharedPtr<FAndroidSentryBreadcrumb> breadcrumbAndroid = MakeShareable(new FAndroidSentryBreadcrumb());
 	breadcrumbAndroid->SetMessage(Message);
diff --git a/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.h b/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.h
@@ -12,7 +12,7 @@ class FAndroidSentrySubsystem : public ISentrySubsystem
 	virtual bool IsEnabled() override;
 	virtual ESentryCrashedLastRun IsCrashedLastRun() override;
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) override;
-	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) override;
+	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level) override;
 	virtual void ClearBreadcrumbs() override;
 	virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) override;
 	virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) override;
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentryBreadcrumb.cpp b/plugin-dev/Source/Sentry/Private/Apple/AppleSentryBreadcrumb.cpp
@@ -56,14 +56,14 @@ FString FAppleSentryBreadcrumb::GetCategory() const
 	return FString(BreadcrumbApple.category);
 }
 
-void FAppleSentryBreadcrumb::SetData(const TMap<FString, FString>& data)
+void FAppleSentryBreadcrumb::SetData(const TMap<FString, FSentryVariant>& data)
 {
-	BreadcrumbApple.data = FAppleSentryConverters::StringMapToNative(data);
+	BreadcrumbApple.data = FAppleSentryConverters::VariantMapToNative(data);
 }
 
-TMap<FString, FString> FAppleSentryBreadcrumb::GetData() const
+TMap<FString, FSentryVariant> FAppleSentryBreadcrumb::GetData() const
 {
-	return FAppleSentryConverters::StringMapToUnreal(BreadcrumbApple.data);
+	return FAppleSentryConverters::VariantMapToUnreal(BreadcrumbApple.data);
 }
 
 void FAppleSentryBreadcrumb::SetLevel(ESentryLevel level)
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentryBreadcrumb.h b/plugin-dev/Source/Sentry/Private/Apple/AppleSentryBreadcrumb.h
@@ -21,8 +21,8 @@ class FAppleSentryBreadcrumb : public ISentryBreadcrumb
 	virtual FString GetType() const override;
 	virtual void SetCategory(const FString& category) override;
 	virtual FString GetCategory() const override;
-	virtual void SetData(const TMap<FString, FString>& data) override;
-	virtual TMap<FString, FString> GetData() const override;
+	virtual void SetData(const TMap<FString, FSentryVariant>& data) override;
+	virtual TMap<FString, FSentryVariant> GetData() const override;
 	virtual void SetLevel(ESentryLevel level) override;
 	virtual ESentryLevel GetLevel() const override;
 
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp
@@ -183,7 +183,7 @@ void FAppleSentrySubsystem::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcru
 	[SentrySDK addBreadcrumb:breadcrumbIOS->GetNativeObject()];
 }
 
-void FAppleSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)
+void FAppleSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)
 {
 	TSharedPtr<FAppleSentryBreadcrumb> breadcrumbIOS = MakeShareable(new FAppleSentryBreadcrumb());
 	breadcrumbIOS->SetMessage(Message);
diff --git a/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.h b/plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.h
@@ -12,7 +12,7 @@ class FAppleSentrySubsystem : public ISentrySubsystem
 	virtual bool IsEnabled() override;
 	virtual ESentryCrashedLastRun IsCrashedLastRun() override;
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) override;
-	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) override;
+	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level) override;
 	virtual void ClearBreadcrumbs() override;
 	virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) override;
 	virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) override;
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryBreadcrumb.cpp b/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryBreadcrumb.cpp
@@ -54,15 +54,15 @@ FString FGenericPlatformSentryBreadcrumb::GetCategory() const
 	return FString(sentry_value_as_string(category));
 }
 
-void FGenericPlatformSentryBreadcrumb::SetData(const TMap<FString, FString>& data)
+void FGenericPlatformSentryBreadcrumb::SetData(const ::TMap<FString, FSentryVariant>& data)
 {
-	sentry_value_set_by_key(Breadcrumb, "data", FGenericPlatformSentryConverters::StringMapToNative(data));
+	sentry_value_set_by_key(Breadcrumb, "data", FGenericPlatformSentryConverters::VariantMapToNative(data));
 }
 
-TMap<FString, FString> FGenericPlatformSentryBreadcrumb::GetData() const
+TMap<FString, FSentryVariant> FGenericPlatformSentryBreadcrumb::GetData() const
 {
 	sentry_value_t data = sentry_value_get_by_key(Breadcrumb, "data");
-	return FGenericPlatformSentryConverters::StringMapToUnreal(data);
+	return FGenericPlatformSentryConverters::VariantMapToUnreal(data);
 }
 
 void FGenericPlatformSentryBreadcrumb::SetLevel(ESentryLevel level)
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryBreadcrumb.h b/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentryBreadcrumb.h
@@ -23,8 +23,8 @@ class FGenericPlatformSentryBreadcrumb : public ISentryBreadcrumb
 	virtual FString GetType() const override;
 	virtual void SetCategory(const FString& category) override;
 	virtual FString GetCategory() const override;
-	virtual void SetData(const TMap<FString, FString>& data) override;
-	virtual TMap<FString, FString> GetData() const override;
+	virtual void SetData(const TMap<FString, FSentryVariant>& data) override;
+	virtual TMap<FString, FSentryVariant> GetData() const override;
 	virtual void SetLevel(ESentryLevel level) override;
 	virtual ESentryLevel GetLevel() const override;
 
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.cpp
@@ -355,7 +355,7 @@ void FGenericPlatformSentrySubsystem::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb
 	sentry_add_breadcrumb(StaticCastSharedPtr<FGenericPlatformSentryBreadcrumb>(breadcrumb)->GetNativeObject());
 }
 
-void FGenericPlatformSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)
+void FGenericPlatformSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)
 {
 	TSharedPtr<FGenericPlatformSentryBreadcrumb> Breadcrumb = MakeShareable(new FGenericPlatformSentryBreadcrumb());
 	Breadcrumb->SetMessage(Message);
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.h b/plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.h
@@ -23,7 +23,7 @@ class FGenericPlatformSentrySubsystem : public ISentrySubsystem
 	virtual bool IsEnabled() override;
 	virtual ESentryCrashedLastRun IsCrashedLastRun() override;
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) override;
-	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) override;
+	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level) override;
 	virtual void ClearBreadcrumbs() override;
 	virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) override;
 	virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) override;
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/Infrastructure/GenericPlatformSentryConverters.cpp b/plugin-dev/Source/Sentry/Private/GenericPlatform/Infrastructure/GenericPlatformSentryConverters.cpp
@@ -197,50 +197,56 @@ FSentryVariant FGenericPlatformSentryConverters::VariantToUnreal(sentry_value_t
 	case SENTRY_VALUE_TYPE_STRING:
 		return FSentryVariant(FString(sentry_value_as_string(variant)));
 	case SENTRY_VALUE_TYPE_LIST:
-	{
-		TArray<FSentryVariant> unrealArray;
+		return VariantArrayToUnreal(variant);
+	case SENTRY_VALUE_TYPE_OBJECT:
+		return VariantMapToUnreal(variant);
+	default:
+		UE_LOG(LogSentrySdk, Warning, TEXT("Unknown Sentry variant type used - an empty one will be returned."));
+		return FSentryVariant();
+	}
+}
 
-		int32 len = sentry_value_get_length(variant);
-		for (int32 i = 0; i < len; ++i)
-		{
-			unrealArray.Add(VariantToUnreal(sentry_value_get_by_index(variant, i)));
-		}
+TMap<FString, FSentryVariant> FGenericPlatformSentryConverters::VariantMapToUnreal(sentry_value_t map)
+{
+	TMap<FString, FSentryVariant> unrealMap;
 
-		return FSentryVariant(unrealArray);
+	FString mapJsonString = FString(sentry_value_to_json(map));
+	if (mapJsonString.IsEmpty() || mapJsonString.Equals(TEXT("null")))
+	{
+		return unrealMap;
 	}
-	case SENTRY_VALUE_TYPE_OBJECT:
+
+	TSharedPtr<FJsonObject> jsonObject;
+	TSharedRef<TJsonReader<>> jsonReader = TJsonReaderFactory<>::Create(mapJsonString);
+	bool bDeserializeSuccess = FJsonSerializer::Deserialize(jsonReader, jsonObject);
+	if (!bDeserializeSuccess)
+	{
+		UE_LOG(LogSentrySdk, Error, TEXT("VariantToUnreal failed to deserialize map Json."));
+		return unrealMap;
+	}
+
+	TArray<FString> keysArr;
+	jsonObject->Values.GetKeys(keysArr);
+
+	for (auto it = keysArr.CreateConstIterator(); it; ++it)
 	{
-		TMap<FString, FSentryVariant> unrealMap;
-
-		FString mapJsonString = FString(sentry_value_to_json(variant));
-		if (mapJsonString.IsEmpty() || mapJsonString.Equals(TEXT("null")))
-		{
-			return unrealMap;
-		}
-
-		TSharedPtr<FJsonObject> jsonObject;
-		TSharedRef<TJsonReader<>> jsonReader = TJsonReaderFactory<>::Create(mapJsonString);
-		bool bDeserializeSuccess = FJsonSerializer::Deserialize(jsonReader, jsonObject);
-		if (!bDeserializeSuccess)
-		{
-			UE_LOG(LogSentrySdk, Error, TEXT("VariantToUnreal failed to deserialize map Json."));
-			return unrealMap;
-		}
-
-		TArray<FString> keysArr;
-		jsonObject->Values.GetKeys(keysArr);
-
-		for (auto it = keysArr.CreateConstIterator(); it; ++it)
-		{
-			unrealMap.Add(*it, VariantToUnreal(sentry_value_get_by_key(variant, TCHAR_TO_ANSI(**it))));
-		}
-
-		return FSentryVariant(unrealMap);
+		unrealMap.Add(*it, VariantToUnreal(sentry_value_get_by_key(map, TCHAR_TO_ANSI(**it))));
 	}
-	default:
-		UE_LOG(LogSentrySdk, Warning, TEXT("Unknown Sentry variant type used - an empty one will be returned."));
-		return FSentryVariant();
+
+	return unrealMap;
+}
+
+TArray<FSentryVariant> FGenericPlatformSentryConverters::VariantArrayToUnreal(sentry_value_t array)
+{
+	TArray<FSentryVariant> unrealArray;
+
+	int32 len = sentry_value_get_length(array);
+	for (int32 i = 0; i < len; ++i)
+	{
+		unrealArray.Add(VariantToUnreal(sentry_value_get_by_index(array, i)));
 	}
+
+	return unrealArray;
 }
 
 TMap<FString, FString> FGenericPlatformSentryConverters::StringMapToUnreal(sentry_value_t map)
diff --git a/plugin-dev/Source/Sentry/Private/GenericPlatform/Infrastructure/GenericPlatformSentryConverters.h b/plugin-dev/Source/Sentry/Private/GenericPlatform/Infrastructure/GenericPlatformSentryConverters.h
@@ -27,6 +27,8 @@ class FGenericPlatformSentryConverters
 	static ESentryLevel SentryLevelToUnreal(sentry_value_t level);
 	static ESentryLevel SentryLevelToUnreal(sentry_level_t level);
 	static FSentryVariant VariantToUnreal(sentry_value_t variant);
+	static TMap<FString, FSentryVariant> VariantMapToUnreal(sentry_value_t map);
+	static TArray<FSentryVariant> VariantArrayToUnreal(sentry_value_t array);
 	static TMap<FString, FString> StringMapToUnreal(sentry_value_t map);
 	static TArray<FString> StringArrayToUnreal(sentry_value_t array);
 
diff --git a/plugin-dev/Source/Sentry/Private/Interface/SentryBreadcrumbInterface.h b/plugin-dev/Source/Sentry/Private/Interface/SentryBreadcrumbInterface.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 
 #include "SentryDataTypes.h"
+#include "SentryVariant.h"
 
 class ISentryBreadcrumb
 {
@@ -18,8 +19,8 @@ class ISentryBreadcrumb
 	virtual FString GetType() const = 0;
 	virtual void SetCategory(const FString& category) = 0;
 	virtual FString GetCategory() const = 0;
-	virtual void SetData(const TMap<FString, FString>& data) = 0;
-	virtual TMap<FString, FString> GetData() const = 0;
+	virtual void SetData(const TMap<FString, FSentryVariant>& data) = 0;
+	virtual TMap<FString, FSentryVariant> GetData() const = 0;
 	virtual void SetLevel(ESentryLevel level) = 0;
 	virtual ESentryLevel GetLevel() const = 0;
 };
diff --git a/plugin-dev/Source/Sentry/Private/Interface/SentrySubsystemInterface.h b/plugin-dev/Source/Sentry/Private/Interface/SentrySubsystemInterface.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 
 #include "SentryDataTypes.h"
+#include "SentryVariant.h"
 
 class ISentryBreadcrumb;
 class ISentryEvent;
@@ -32,7 +33,7 @@ class ISentrySubsystem
 	virtual bool IsEnabled() = 0;
 	virtual ESentryCrashedLastRun IsCrashedLastRun() = 0;
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) = 0;
-	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) = 0;
+	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level) = 0;
 	virtual void ClearBreadcrumbs() = 0;
 	virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) = 0;
 	virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) = 0;
diff --git a/plugin-dev/Source/Sentry/Private/Null/NullSentryBreadcrumb.h b/plugin-dev/Source/Sentry/Private/Null/NullSentryBreadcrumb.h
@@ -17,8 +17,8 @@ class FNullSentryBreadcrumb final : public ISentryBreadcrumb
 	virtual FString GetType() const override { return TEXT(""); }
 	virtual void SetCategory(const FString& category) override {}
 	virtual FString GetCategory() const override { return TEXT(""); }
-	virtual void SetData(const TMap<FString, FString>& data) override {}
-	virtual TMap<FString, FString> GetData() const override { return {}; }
+	virtual void SetData(const TMap<FString, FSentryVariant>& data) override {}
+	virtual TMap<FString, FSentryVariant> GetData() const override { return {}; }
 	virtual void SetLevel(ESentryLevel level) override {}
 	virtual ESentryLevel GetLevel() const override { return ESentryLevel::Debug; }
 };
diff --git a/plugin-dev/Source/Sentry/Private/Null/NullSentrySubsystem.h b/plugin-dev/Source/Sentry/Private/Null/NullSentrySubsystem.h
@@ -14,7 +14,7 @@ class FNullSentrySubsystem : public ISentrySubsystem
 	virtual bool IsEnabled() override { return false; }
 	virtual ESentryCrashedLastRun IsCrashedLastRun() override { return ESentryCrashedLastRun::NotEvaluated; }
 	virtual void AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcrumb) override {}
-	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level) override {}
+	virtual void AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level) override {}
 	virtual void ClearBreadcrumbs() override {}
 	virtual TSharedPtr<ISentryId> CaptureMessage(const FString& message, ESentryLevel level) override { return nullptr; }
 	virtual TSharedPtr<ISentryId> CaptureMessageWithScope(const FString& message, ESentryLevel level, const FSentryScopeDelegate& onConfigureScope) override { return nullptr; }
diff --git a/plugin-dev/Source/Sentry/Private/SentryBreadcrumb.cpp b/plugin-dev/Source/Sentry/Private/SentryBreadcrumb.cpp
@@ -57,18 +57,18 @@ FString USentryBreadcrumb::GetCategory() const
 	return NativeImpl->GetCategory();
 }
 
-void USentryBreadcrumb::SetData(const TMap<FString, FString>& Data)
+void USentryBreadcrumb::SetData(const TMap<FString, FSentryVariant>& Data)
 {
 	if (!NativeImpl)
 		return;
 
 	NativeImpl->SetData(Data);
 }
 
-TMap<FString, FString> USentryBreadcrumb::GetData() const
+TMap<FString, FSentryVariant> USentryBreadcrumb::GetData() const
 {
 	if (!NativeImpl)
-		return TMap<FString, FString>();
+		return TMap<FString, FSentryVariant>();
 
 	return NativeImpl->GetData();
 }
diff --git a/plugin-dev/Source/Sentry/Private/SentryLibrary.cpp b/plugin-dev/Source/Sentry/Private/SentryLibrary.cpp
@@ -61,7 +61,7 @@ USentryUserFeedback* USentryLibrary::CreateSentryUserFeedback(const FString& Eve
 }
 
 USentryBreadcrumb* USentryLibrary::CreateSentryBreadcrumb(const FString& Message, const FString& Type, const FString& Category,
-	const TMap<FString, FString>& Data, ESentryLevel Level)
+	const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)
 {
 	USentryBreadcrumb* Breadcrumb = USentryBreadcrumb::Create(CreateSharedSentryBreadcrumb());
 
diff --git a/plugin-dev/Source/Sentry/Private/SentryOutputDevice.cpp b/plugin-dev/Source/Sentry/Private/SentryOutputDevice.cpp
@@ -41,7 +41,7 @@ void FSentryOutputDevice::Serialize(const TCHAR* V, ELogVerbosity::Type Verbosit
 		return;
 	}
 
-	SentrySubsystem->AddBreadcrumbWithParams(Message, Category.ToString(), FString(), TMap<FString, FString>(), BreadcrumbLevel);
+	SentrySubsystem->AddBreadcrumbWithParams(Message, Category.ToString(), FString(), TMap<FString, FSentryVariant>(), BreadcrumbLevel);
 }
 
 bool FSentryOutputDevice::CanBeUsedOnAnyThread() const
diff --git a/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp
@@ -222,7 +222,7 @@ void USentrySubsystem::AddBreadcrumb(USentryBreadcrumb* Breadcrumb)
 	SubsystemNativeImpl->AddBreadcrumb(Breadcrumb->GetNativeObject());
 }
 
-void USentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)
+void USentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)
 {
 	check(SubsystemNativeImpl);
 
diff --git a/plugin-dev/Source/Sentry/Private/Tests/SentryBreadcrumb.spec.cpp b/plugin-dev/Source/Sentry/Private/Tests/SentryBreadcrumb.spec.cpp
@@ -28,9 +28,11 @@ void SentryBreadcrumbSpec::Define()
 			const FString TestType = FString(TEXT("Test type"));
 			const FString TestCategory = FString(TEXT("Test category"));
 
-			TMap<FString, FString> TestData;
+			TMap<FString, FSentryVariant> TestData;
 			TestData.Add(TEXT("Key1"), TEXT("Val1"));
-			TestData.Add(TEXT("Key2"), TEXT("Val2"));
+			TestData.Add(TEXT("Key2"), 123);
+			TestData.Add(TEXT("Key3"), 4.5f);
+			TestData.Add(TEXT("Key4"), true);
 
 			SentryBreadcrumb->SetLevel(ESentryLevel::Fatal);
 			SentryBreadcrumb->SetMessage(TestMessage);
@@ -43,9 +45,11 @@ void SentryBreadcrumbSpec::Define()
 			TestEqual("Breadcrumb type", SentryBreadcrumb->GetType(), TestType);
 			TestEqual("Breadcrumb category", SentryBreadcrumb->GetCategory(), TestCategory);
 
-			TMap<FString, FString> ReceivedData = SentryBreadcrumb->GetData();
+			TMap<FString, FSentryVariant> ReceivedData = SentryBreadcrumb->GetData();
 			TestEqual("Data 1", ReceivedData[TEXT("Key1")], TestData[TEXT("Key1")]);
 			TestEqual("Data 2", ReceivedData[TEXT("Key2")], TestData[TEXT("Key2")]);
+			TestEqual("Data 3", ReceivedData[TEXT("Key3")], TestData[TEXT("Key3")]);
+			TestEqual("Data 4", ReceivedData[TEXT("Key4")], TestData[TEXT("Key4")]);
 		});
 	});
 }
diff --git a/plugin-dev/Source/Sentry/Public/SentryBreadcrumb.h b/plugin-dev/Source/Sentry/Public/SentryBreadcrumb.h
diff --git a/plugin-dev/Source/Sentry/Public/SentryLibrary.h b/plugin-dev/Source/Sentry/Public/SentryLibrary.h
diff --git a/plugin-dev/Source/Sentry/Public/SentrySubsystem.h b/plugin-dev/Source/Sentry/Public/SentrySubsystem.h

Original file line number	Diff line number	Diff line change
`@@ -61,18 +61,18 @@ FString FAndroidSentryBreadcrumb::GetCategory() const`
`61`	`61`	`return CallMethod<FString>(GetCategoryMethod);`
`62`	`62`	`}`
`63`	`63`
`64`		`-void FAndroidSentryBreadcrumb::SetData(const TMap<FString, FString>& data)`
	`64`	`+void FAndroidSentryBreadcrumb::SetData(const TMap<FString, FSentryVariant>& data)`
`65`	`65`	`{`
`66`	`66`	`for (const auto& dataItem : data)`
`67`	`67`	`{`
`68`		`- CallMethod<void>(SetDataMethod, GetJString(dataItem.Key), GetJString(dataItem.Value));`
	`68`	`+ CallMethod<void>(SetDataMethod, *GetJString(dataItem.Key), FAndroidSentryConverters::VariantToNative(dataItem.Value)->GetJObject());`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-TMap<FString, FString> FAndroidSentryBreadcrumb::GetData() const`
	`72`	`+TMap<FString, FSentryVariant> FAndroidSentryBreadcrumb::GetData() const`
`73`	`73`	`{`
`74`	`74`	`auto data = CallObjectMethod<jobject>(GetDataMethod);`
`75`		`- return FAndroidSentryConverters::StringMapToUnreal(*data);`
	`75`	`+ return FAndroidSentryConverters::VariantMapToUnreal(*data);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void FAndroidSentryBreadcrumb::SetLevel(ESentryLevel level)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void FAndroidSentrySubsystem::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadc`
`109`	`109`	`breadcrumbAndroid->GetJObject());`
`110`	`110`	`}`
`111`	`111`
`112`		`-void FAndroidSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)`
	`112`	`+void FAndroidSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)`
`113`	`113`	`{`
`114`	`114`	`TSharedPtr<FAndroidSentryBreadcrumb> breadcrumbAndroid = MakeShareable(new FAndroidSentryBreadcrumb());`
`115`	`115`	`breadcrumbAndroid->SetMessage(Message);`
Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,14 @@ FString FAppleSentryBreadcrumb::GetCategory() const`
`56`	`56`	`return FString(BreadcrumbApple.category);`
`57`	`57`	`}`
`58`	`58`
`59`		`-void FAppleSentryBreadcrumb::SetData(const TMap<FString, FString>& data)`
	`59`	`+void FAppleSentryBreadcrumb::SetData(const TMap<FString, FSentryVariant>& data)`
`60`	`60`	`{`
`61`		`- BreadcrumbApple.data = FAppleSentryConverters::StringMapToNative(data);`
	`61`	`+ BreadcrumbApple.data = FAppleSentryConverters::VariantMapToNative(data);`
`62`	`62`	`}`
`63`	`63`
`64`		`-TMap<FString, FString> FAppleSentryBreadcrumb::GetData() const`
	`64`	`+TMap<FString, FSentryVariant> FAppleSentryBreadcrumb::GetData() const`
`65`	`65`	`{`
`66`		`- return FAppleSentryConverters::StringMapToUnreal(BreadcrumbApple.data);`
	`66`	`+ return FAppleSentryConverters::VariantMapToUnreal(BreadcrumbApple.data);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`void FAppleSentryBreadcrumb::SetLevel(ESentryLevel level)`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void FAppleSentrySubsystem::AddBreadcrumb(TSharedPtr<ISentryBreadcrumb> breadcru`
`183`	`183`	`[SentrySDK addBreadcrumb:breadcrumbIOS->GetNativeObject()];`
`184`	`184`	`}`
`185`	`185`
`186`		`-void FAppleSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FString>& Data, ESentryLevel Level)`
	`186`	`+void FAppleSentrySubsystem::AddBreadcrumbWithParams(const FString& Message, const FString& Category, const FString& Type, const TMap<FString, FSentryVariant>& Data, ESentryLevel Level)`
`187`	`187`	`{`
`188`	`188`	`TSharedPtr<FAppleSentryBreadcrumb> breadcrumbIOS = MakeShareable(new FAppleSentryBreadcrumb());`
`189`	`189`	`breadcrumbIOS->SetMessage(Message);`
Original file line number	Diff line number	Diff line change
`@@ -54,15 +54,15 @@ FString FGenericPlatformSentryBreadcrumb::GetCategory() const`
`54`	`54`	`return FString(sentry_value_as_string(category));`
`55`	`55`	`}`
`56`	`56`
`57`		`-void FGenericPlatformSentryBreadcrumb::SetData(const TMap<FString, FString>& data)`
	`57`	`+void FGenericPlatformSentryBreadcrumb::SetData(const ::TMap<FString, FSentryVariant>& data)`
`58`	`58`	`{`
`59`		`- sentry_value_set_by_key(Breadcrumb, "data", FGenericPlatformSentryConverters::StringMapToNative(data));`
	`59`	`+ sentry_value_set_by_key(Breadcrumb, "data", FGenericPlatformSentryConverters::VariantMapToNative(data));`
`60`	`60`	`}`
`61`	`61`
`62`		`-TMap<FString, FString> FGenericPlatformSentryBreadcrumb::GetData() const`
	`62`	`+TMap<FString, FSentryVariant> FGenericPlatformSentryBreadcrumb::GetData() const`
`63`	`63`	`{`
`64`	`64`	`sentry_value_t data = sentry_value_get_by_key(Breadcrumb, "data");`
`65`		`- return FGenericPlatformSentryConverters::StringMapToUnreal(data);`
	`65`	`+ return FGenericPlatformSentryConverters::VariantMapToUnreal(data);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`void FGenericPlatformSentryBreadcrumb::SetLevel(ESentryLevel level)`