From 7e221663e512330635a4279cabc66c0219399ef3 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 10 Feb 2022 12:38:27 -0500 Subject: [PATCH 1/5] allow defining `SENTRY_SDK_NAME` externally --- include/sentry.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sentry.h b/include/sentry.h index 307b782f2..8bafcd77c 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -23,6 +23,7 @@ extern "C" { #endif /* SDK Version */ +#ifndef SENTRY_SDK_NAME #define SENTRY_SDK_NAME "sentry.native" #define SENTRY_SDK_VERSION "0.4.15" #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION From a7563cac30cf455565174574f60fe26da1b6d16e Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Sat, 12 Feb 2022 01:34:21 +0100 Subject: [PATCH 2/5] Update include/sentry.h Co-authored-by: Arpad Borsos --- include/sentry.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sentry.h b/include/sentry.h index 8bafcd77c..f02caaf93 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -25,6 +25,7 @@ extern "C" { /* SDK Version */ #ifndef SENTRY_SDK_NAME #define SENTRY_SDK_NAME "sentry.native" +#endif #define SENTRY_SDK_VERSION "0.4.15" #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION From ddbb2a5403c9df6a3362756bf425ac3878f8dd5a Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Sat, 12 Feb 2022 17:19:53 +0100 Subject: [PATCH 3/5] Update include/sentry.h --- include/sentry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sentry.h b/include/sentry.h index f02caaf93..bdbb9e4d6 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -24,7 +24,7 @@ extern "C" { /* SDK Version */ #ifndef SENTRY_SDK_NAME -#define SENTRY_SDK_NAME "sentry.native" +# define SENTRY_SDK_NAME "sentry.native" #endif #define SENTRY_SDK_VERSION "0.4.15" #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION From 5f78fd592dae1277019d1ed45d610ce4b6dc4c23 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Sat, 12 Feb 2022 18:50:39 -0500 Subject: [PATCH 4/5] custom name for android --- include/sentry.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/sentry.h b/include/sentry.h index bdbb9e4d6..578ecc44b 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -23,7 +23,9 @@ extern "C" { #endif /* SDK Version */ -#ifndef SENTRY_SDK_NAME +#ifdef __ANDROID__ +# define SENTRY_SDK_NAME "sentry.native.android" +#else # define SENTRY_SDK_NAME "sentry.native" #endif #define SENTRY_SDK_VERSION "0.4.15" From f21aaa94bf8db7039d6eafbab03fd6a4ae4fe86c Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Mon, 14 Feb 2022 21:42:17 -0500 Subject: [PATCH 5/5] test --- tests/assertions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/assertions.py b/tests/assertions.py index acba4558e..bc956e199 100644 --- a/tests/assertions.py +++ b/tests/assertions.py @@ -59,7 +59,9 @@ def assert_meta( {"name": "github:getsentry/sentry-native", "version": "0.4.15"}, ], } - if not is_android: + if is_android: + expected_sdk["name"] = "sentry.native.android" + else: if sys.platform == "win32": assert_matches( event["contexts"]["os"],