Use managed guid in the native layer

Author: konraddysput

CHANGELOG.md

@@ -1,34 +1,42 @@
 # Backtrace Android Release Notes
 
 ## Version 3.7.5
+
 - Maintenance: Update various components to latest versions
 - Maintenance: CI job improvements
 - Bugfix: Handle corrupt or empty database records
+- Bugfix: Managed and native reports generated by the same user now have the same `guid`
 - Backtrace metrics support - now the interface doesn't require to use `BacktraceCredentials` anymore
 - Upgraded native crash reporter. The new version should capture crashes generated by the newest version of SDK
 
 ## Version 3.7.4
+
 - Feature: migrated to AndroidX
 - Improvement: removed READ_EXTERNAL_STORAGE permission from library AndroidManifest.xml
 
 ## Version 3.7.3
+
 - Bug: Crashpad attachment syntax changed
 
 ## Version 3.7.2
+
 - Bug: Fix issue rolling over Breadcrumb file
 - Feature: update gradle to latest
 - Feature: integrate crashpad via cmake
 - Improvement: Make local.properties optional
 - Improvement: Cleanup build scripts for speed
 
 ## Version 3.7.1 - 14.06.2022
+
 - Error type "crash" only on unhandled exceptions from main thread for other threads - error type will be "unhandled exception"
 
 ## Version 3.7.0 - 28.04.2022
+
 - Added error.type attribute that shows type of the report
 - Added backtrace.version attribute that shows Backtrace agent version
 
 ## Version 3.6.0 - 29.1.2022
+
 - Added error-free metrics
 - Added method to disable native crash reporting
 - Fixed Crashpad initialization failure in Samsung A20
@@ -37,57 +45,69 @@
 - GitHub actions CICD support
 
 ## Version 3.5.0 - 14.09.2021
+
 - Added support for native crash reporting in NDK 16b
 - Bug fixes and expanded supported NDK versions for client side unwinding
 
 ## Version 3.4.0 - 07.09.2021
+
 - Added support for NDK 22
 
 ## Version 3.3.0 - 15.07.2021
+
 - Added support for client side unwinding of native crashes
 
 ## Version 3.2.2 - 10.03.2021
+
 - Hotfix for crash when user enables native integration without file attachments
 
 ## Version 3.2.1 - 09.03.2021
+
 - Native crashes now support custom attributes
 - Improved file attachment support for managed and native crashes
 - Fixed file attachments bug in BacktraceDatabaseRecord
 
 ## Version 3.2.0 - 02.03.2021
+
 - Added Breadcrumbs feature to give Backtrace users context leading up to a `BacktraceReport`
 - Improved support for Proguard
 
 ## Version 3.1.0 - 29.09.2020
+
 - Backtrace Android allows to capture native crashes from Android NDK code. To enable NDK crashes exception handler use `setupNativeIntegration` method and pass backtraceClient with credentials.
 
 ```java
 database.setupNativeIntegration(backtraceClient, credentials);
 ```
 
 ## Version 3.0.2 - 23.01.2020
+
 - Fixed checking internal path during filtering attachments
 
 ## Version 3.0.1 - 15.01.2020
+
 - Fixed setting custom global attributes on BacktraceClient
 - Added support for custom attributes to BacktraceExceptionHandler
 
 ## Version 3.0.0 - 03.12.2019
+
 - Added support for `submit.backtrace.io` urls
 - Moved generating a server url from BacktraceApi to BacktraceCredentials
 - Refactored name of below libraries interfaces:
-    * IBacktraceApi -> Api
-    * IBacktraceClient -> Client
-    * IBacktraceDatabase -> Database
-    * IBacktraceDatabaseRecordWriter -> DatabaseRecordWriter
-    * IBacktraceDatabaseFileContext -> DatabaseFileContext
-    * IBacktraceDatabaseContext -> DatabaseContext
+  - IBacktraceApi -> Api
+  - IBacktraceClient -> Client
+  - IBacktraceDatabase -> Database
+  - IBacktraceDatabaseRecordWriter -> DatabaseRecordWriter
+  - IBacktraceDatabaseFileContext -> DatabaseFileContext
+  - IBacktraceDatabaseContext -> DatabaseContext
 
 ## Version 2.1.0 - 16.06.2019
+
 - Added support for detecting ANR (Application Not Responding)
 - Added methods and structures to detecting blocked custom threads
 
 ## Version 2.0.0 - 06.05.2019
+
 - Removed `sendAsync` method
 - Removed event `OnAfterSendEventListener`
 - Moved event `OnServerResponseEventListener` to parameter of `send` method
@@ -96,20 +116,25 @@ database.setupNativeIntegration(backtraceClient, credentials);
 - Removed deprecated and unused code
 
 ## Version 1.2.1 - 12.04.2019
+
 - Added check is temperature file is empty and remove print stacktrace
 - Changed attribute name `app.version_name` to `version`
 
 ## Version 1.2.0 - 07.04.2019
+
 - `BacktraceDatabase` - offline error report storage and auto re-submission support in the event of network outage and server unavailability,
 
 ## Version 1.1.2 - 07.03.2019
+
 - Added class name to function name in exception StackFrame
 - Added exception message to annotations
 
 ## Version 1.1.1 - 26.02.2019
+
 - Fixed exception on filter out Backtrace files from StackTraceElements when file name is null
 
 ## Version 1.1.0 - 25.02.2019
+
 - Added support for file attachments and annotations
 - Added battery level and status attributes
 - Added screen brightness attribute
@@ -120,4 +145,5 @@ database.setupNativeIntegration(backtraceClient, credentials);
 - Replaced spaces with underscore in all enums strings
 
 ## Version 1.0 - 27.01.2019
+
 - First release.

backtrace-library/src/main/cpp/backends/crashpad-backend.cpp

@@ -120,6 +120,11 @@ bool InitializeCrashpad(jstring url,
 
     // Start crash handler
     client = new crashpad::CrashpadClient();
+    std::map<std::string, std::string>::iterator guidIterator = attributes.find("guid");
+    if(guidIterator != attributes.end())
+    {
+        client->OverrideGuid(guidIterator->second);
+    }
 
     initialized = client->StartHandlerAtCrash(handler, db, db, backtraceUrl, attributes,
                                               arguments);