Update sentry to 0.7.9 and make transaction names better (#373)

applications/settings-manager/main.cpp

@@ -154,7 +154,7 @@ int main(int argc, char *argv[]){
             if(args.length() == 3 && args.at(2) == "crash"){
                 trigger_crash();
             }else if(args.length() == 3 && args.at(2) == "transaction"){
-                sentry_transaction("settings", "transaction", [](Transaction* t){
+                sentry_transaction("Dummy rot transaction", "transaction", [](Transaction* t){
                     sentry_span(t, "span", "Transaction span", []{
                         qDebug() << "Triggered transaction";
                     });

applications/system-service/application.cpp

@@ -37,7 +37,7 @@ void Application::launchNoSecurityCheck(){
 #endif
             startSpan("starting", "Application is starting");
         }
-        Oxide::Sentry::sentry_transaction("application", "launch", [this](Oxide::Sentry::Transaction* t){
+        Oxide::Sentry::sentry_transaction("Launch Application", "launch", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
             if(t != nullptr){
                 sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -123,7 +123,7 @@ void Application::pauseNoSecurityCheck(bool startIfNone){
         return;
     }
     O_INFO("Pausing " << path());
-    Oxide::Sentry::sentry_transaction("application", "pause", [this, startIfNone](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Pause Application", "pause", [this, startIfNone](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -151,7 +151,7 @@ void Application::interruptApplication(){
     ){
         return;
     }
-    Oxide::Sentry::sentry_transaction("application", "interrupt", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Interrupt Application", "interrupt", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -236,7 +236,7 @@ void Application::resumeNoSecurityCheck(){
         O_DEBUG("Can't Resume" << path() << "Already running!");
         return;
     }
-    Oxide::Sentry::sentry_transaction("application", "resume", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Resume Application", "resume", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -265,7 +265,7 @@ void Application::uninterruptApplication(){
     ){
         return;
     }
-    Oxide::Sentry::sentry_transaction("application", "uninterrupt", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Uninterrupt Application", "uninterrupt", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -320,7 +320,7 @@ void Application::stopNoSecurityCheck(){
     if(state == Inactive){
         return;
     }
-    Oxide::Sentry::sentry_transaction("application", "stop", [this, state](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Stop Application", "stop", [this, state](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -536,7 +536,7 @@ void Application::saveScreen(){
     if(m_screenCapture != nullptr){
         return;
     }
-    Oxide::Sentry::sentry_transaction("application", "saveScreen", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Save screen for Application", "saveScreen", [this](Oxide::Sentry::Transaction* t){
         O_INFO("Saving screen...");
         QByteArray bytes;
         Oxide::Sentry::sentry_span(t, "save", "Save the framebuffer", [&bytes]{
@@ -813,7 +813,7 @@ const QString Application::resourcePath() { return "/tmp/tarnish-chroot/" + name
 const QString Application::chrootPath() { return resourcePath() + "/chroot"; }
 
 void Application::mountAll(){
-    Oxide::Sentry::sentry_transaction("application", "mount", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Mount directories for Application", "mount", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -869,7 +869,7 @@ void Application::mountAll(){
 }
 
 void Application::umountAll(){
-    Oxide::Sentry::sentry_transaction("application", "umount", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Unmount directories for Application", "umount", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -940,7 +940,7 @@ QStringList Application::getActiveMounts(){
 void Application::showSplashScreen(){
     auto frameBuffer = EPFrameBuffer::framebuffer();
     O_DEBUG("Waiting for other painting to finish...");
-    Oxide::Sentry::sentry_transaction("application", "showSplashScreen", [this, frameBuffer](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Show Application Splash Screen", "showSplashScreen", [this, frameBuffer](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
@@ -1031,7 +1031,7 @@ void Application::recallScreen() {
         return;
     }
     Oxide::Sentry::sentry_transaction(
-        "application", "recallScreen", [this](Oxide::Sentry::Transaction *t) {
+        "Recall Application Screen", "recallScreen", [this](Oxide::Sentry::Transaction *t) {
             O_DEBUG("Uncompressing screen...");
             QImage img;
             Oxide::Sentry::sentry_span(

applications/system-service/appsapi.cpp

@@ -27,7 +27,7 @@ AppsAPI::AppsAPI(QObject* parent)
   m_processManagerApplication("/"),
   m_taskSwitcherApplication("/"),
   m_sleeping(false) {
-    Oxide::Sentry::sentry_transaction("apps", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Init Apps API", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "start", "Launching initial application", [this](Oxide::Sentry::Span* s){
             Oxide::Sentry::sentry_span(s, "singleton", "Setup singleton", [this]{
                 singleton(this);
@@ -104,7 +104,7 @@ AppsAPI::AppsAPI(QObject* parent)
 }
 
 void AppsAPI::startup(){
-    Oxide::Sentry::sentry_transaction("apps", "startup", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Apps API Startup", "startup", [this](Oxide::Sentry::Transaction* t){
         if(applications.isEmpty()){
             O_INFO("No applications found");
             notificationAPI->errorNotification(_noApplicationsMessage);
@@ -189,7 +189,7 @@ QDBusObjectPath AppsAPI::registerApplicationNoSecurityCheck(QVariantMap properti
         return applications[name]->qPath();
     }
     QDBusObjectPath path;
-    Oxide::Sentry::sentry_transaction("apps", "registerApplication", [this, &path, name, properties](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Register Application", "registerApplication", [this, &path, name, properties](Oxide::Sentry::Transaction* t){
         Q_UNUSED(t);
         path = QDBusObjectPath(getPath(name));
         auto app = new Application(path, reinterpret_cast<QObject*>(this));
@@ -221,7 +221,7 @@ void AppsAPI::reload(){
     if(!hasPermission("apps")){
         return;
     }
-    Oxide::Sentry::sentry_transaction("apps", "reload", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Reload Apps", "reload", [this](Oxide::Sentry::Transaction* t){
         Q_UNUSED(t);
         writeApplications();
         readApplications();
@@ -356,7 +356,7 @@ QVariantMap AppsAPI::pausedApplications(){
 }
 
 void AppsAPI::unregisterApplication(Application* app){
-    Oxide::Sentry::sentry_transaction("apps", "unregisterApplication", [this, app](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Unregister Application", "unregisterApplication", [this, app](Oxide::Sentry::Transaction* t){
         Q_UNUSED(t);
         auto name = app->name();
         if(applications.contains(name)){

applications/system-service/dbusservice.cpp

@@ -60,7 +60,7 @@ DBusService::DBusService(QObject* parent) : APIBase(parent), apis(){
 #ifdef SENTRY
     sentry_breadcrumb("dbusservice", "Initializing APIs", "info");
 #endif
-    Oxide::Sentry::sentry_transaction("dbus", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("DBus Service Init", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "apis", "Initialize APIs", [this](Oxide::Sentry::Span* s){
             Oxide::Sentry::sentry_span(s, "wifi", "Initialize wifi API", [this]{
                 apis.insert("wifi", APIEntry{

applications/system-service/notificationapi.cpp

@@ -12,7 +12,7 @@ NotificationAPI* NotificationAPI::singleton(NotificationAPI* self){
 }
 
 NotificationAPI::NotificationAPI(QObject* parent) : APIBase(parent), notificationDisplayQueue(), m_enabled(false), m_notifications(), m_lock() {
-    Oxide::Sentry::sentry_transaction("apps", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Notification API init", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "singleton", "Setup singleton", [this]{
             singleton(this);
         });

applications/system-service/powerapi.cpp

@@ -10,7 +10,7 @@ PowerAPI* PowerAPI::singleton(PowerAPI* self){
 
 PowerAPI::PowerAPI(QObject* parent)
     : APIBase(parent), m_chargerState(ChargerUnknown){
-    Oxide::Sentry::sentry_transaction("power", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Power API Init", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "singleton", "Setup singleton", [this]{
             singleton(this);
         });

applications/system-service/screenapi.cpp

@@ -74,7 +74,7 @@ QDBusObjectPath ScreenAPI::addScreenshot(QByteArray blob){
 
 Screenshot* ScreenAPI::addScreenshot(QString filePath){
     Screenshot* instance;
-    Oxide::Sentry::sentry_transaction("screen", "addScreenshot", [this, filePath, &instance](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Add Screenshot", "addScreenshot", [this, filePath, &instance](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "screenshot", "Create screenshot", [this, filePath, &instance]{
             auto path = QString(OXIDE_SERVICE_PATH "/screenshots/") + QFileInfo(filePath).completeBaseName().remove('-').remove('.');
             instance = new Screenshot(path, filePath, this);
@@ -135,7 +135,7 @@ ScreenAPI* ScreenAPI::singleton(ScreenAPI* self){
 }
 
 ScreenAPI::ScreenAPI(QObject* parent) : APIBase(parent), m_screenshots(), m_enabled(false) {
-    Oxide::Sentry::sentry_transaction("screen", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Screen API Init", "init", [this](Oxide::Sentry::Transaction* t){
         qDBusRegisterMetaType<QList<double>>();
         Oxide::Sentry::sentry_span(t, "mkdirs", "Create screenshots directory", [this]{
             mkdirs("/home/root/screenshots/");
@@ -202,7 +202,7 @@ bool ScreenAPI::drawFullscreenImage(QString path, double rotate) {
         img = img.transformed(QTransform().rotate(rotate));
     }
     Oxide::Sentry::sentry_transaction(
-        "screen", "drawFullscrenImage",
+        "Draw Fullscreen Image", "drawFullscrenImage",
         [img, path](Oxide::Sentry::Transaction *t) {
             Q_UNUSED(t);
             Oxide::dispatchToMainThread([img] {

applications/system-service/systemapi.cpp

@@ -21,7 +21,7 @@ QDebug operator<<(QDebug debug, Touch* touch){
 void SystemAPI::PrepareForSleep(bool suspending){
     auto device = deviceSettings.getDeviceType();
     if(suspending){
-        Oxide::Sentry::sentry_transaction("system", "suspend", [this, device](Oxide::Sentry::Transaction* t){
+        Oxide::Sentry::sentry_transaction("Suspend System", "suspend", [this, device](Oxide::Sentry::Transaction* t){
             if(autoLock()){
                 lockTimestamp = QDateTime::currentMSecsSinceEpoch() + lockTimer.remainingTime();
                 O_DEBUG("Auto Lock timestamp:" << lockTimestamp);
@@ -66,7 +66,7 @@ void SystemAPI::PrepareForSleep(bool suspending){
             O_INFO("Suspending...");
         });
     }else{
-        Oxide::Sentry::sentry_transaction("system", "resume", [this, device](Oxide::Sentry::Transaction* t){
+        Oxide::Sentry::sentry_transaction("Resume System", "resume", [this, device](Oxide::Sentry::Transaction* t){
             Oxide::Sentry::sentry_span(t, "inhibit", "Inhibit sleep", [this]{
                 inhibitSleep();
             });
@@ -144,7 +144,7 @@ SystemAPI::SystemAPI(QObject* parent)
       touches(),
       swipeStates(),
       swipeLengths() {
-    Oxide::Sentry::sentry_transaction("system", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("System API Init", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "settings", "Sync settings", [this](Oxide::Sentry::Span* s){
             Oxide::Sentry::sentry_span(s, "swipes", "Default swipe values", [this]{
                 for(short i = Right; i <= Down; i++){

applications/system-service/wifiapi.cpp

@@ -18,7 +18,7 @@ WifiAPI::WifiAPI(QObject* parent)
       m_link(0),
       m_scanning(false)
 {
-    Oxide::Sentry::sentry_transaction("wifi", "init", [this](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("Wifi API Init", "init", [this](Oxide::Sentry::Transaction* t){
         Oxide::Sentry::sentry_span(t, "singleton", "Setup singleton", [this]{
             singleton(this);
         });

applications/task-switcher/controller.h

@@ -192,7 +192,7 @@ class Controller : public QObject {
     }
     void updateImage(){
         qDebug() << "Updating background...";
-        Oxide::Sentry::sentry_transaction("controller", "updateImage", [this](Oxide::Sentry::Transaction* t){
+        Oxide::Sentry::sentry_transaction("Update Task Switcher Background Image", "updateImage", [this](Oxide::Sentry::Transaction* t){
             QImage* img = nullptr;
             Oxide::Sentry::sentry_span(t, "previousApplications", "Get image from previous application", [this, &img](Oxide::Sentry::Span* s){
                 auto previousApplications = appsApi->previousApplications();

package

@@ -5,7 +5,7 @@
 pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry)
 _oxidever=$(grep 'VERSION =' qmake/common.pri | awk '{print $3}')
 pkgver="$_oxidever~VERSION~"
-_sentryver=0.7.6
+_sentryver=0.7.9
 timestamp="$(date -u +%Y-%m-%dT%H:%MZ)"
 maintainer="Eeems <[email protected]>"
 url=https://oxide.eeems.codes

shared/sentry/sentry.pro

@@ -28,7 +28,9 @@ PRE_TARGETDEPS += $$OUT_PWD/lib/libsentry.so
 sentry_install.target = $$OUT_PWD/lib/libsentry.so
 sentry_install.depends = sentry_build
 sentry_install.commands = \
-    cmake --install $$OUT_PWD/src --prefix $$OUT_PWD --config RelWithDebInfo
+    cmake --install $$OUT_PWD/src \
+        --prefix $$OUT_PWD \
+        --config RelWithDebInfo
 QMAKE_EXTRA_TARGETS += sentry_install
 
 QMAKE_CLEAN += -r $$OUT_PWD/src/

shared/sentry/src/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 0.7.9
+
+**Fixes**:
+
+- Check file-writer construction when writing envelope to path. ([#1036](https://github.com/getsentry/sentry-native/pull/1036))
+
+## 0.7.8
+
+**Features**:
+
+- Let the envelope serialization stream directly to the file. ([#1021](https://github.com/getsentry/sentry-native/pull/1021))
+- Support 16kb page sizes on Android 15. ([#1028](https://github.com/getsentry/sentry-native/pull/1028))
+
+## 0.7.7
+
+**Fixes**:
+
+- Further clean up of the exported dependency configuration. ([#1013](https://github.com/getsentry/sentry-native/pull/1013), [crashpad#106](https://github.com/getsentry/crashpad/pull/106))
+- Clean-up scope flushing synchronization in crashpad-backend. ([#1019](https://github.com/getsentry/sentry-native/pull/1019), [crashpad#109](https://github.com/getsentry/crashpad/pull/109))
+- Rectify user-feedback comment parameter guard. ([#1020](https://github.com/getsentry/sentry-native/pull/1020))
+
+**Internal**:
+
+- Updated `crashpad` to 2024-06-11. ([#1014](https://github.com/getsentry/sentry-native/pull/1014), [crashpad#105](https://github.com/getsentry/crashpad/pull/105))
+
+**Thank you**:
+
+- [@JonLiu1993](https://github.com/JonLiu1993)
+- [@dg0yt](https://github.com/dg0yt)
+- [@stima](https://github.com/stima)
+
 ## 0.7.6
 
 **Fixes**:

shared/sentry/src/CMakeLists.txt

@@ -62,6 +62,7 @@ option(SENTRY_BUILD_EXAMPLES "Build sentry-native example(s)" "${SENTRY_MAIN_PRO
 
 option(SENTRY_LINK_PTHREAD "Link platform threads library" ON)
 if(SENTRY_LINK_PTHREAD)
+	set(THREADS_PREFER_PTHREAD_FLAG ON)
 	find_package(Threads REQUIRED)
 endif()
 
@@ -276,15 +277,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS400")
 endif()
 
 if(SENTRY_TRANSPORT_CURL)
-	if(NOT CURL_FOUND) # Some other lib might bring libcurl already
+	if(NOT TARGET CURL::libcurl) # Some other lib might bring libcurl already
 		find_package(CURL REQUIRED COMPONENTS AsynchDNS)
 	endif()
 
 	target_link_libraries(sentry PRIVATE CURL::libcurl)
 endif()
 
 if(SENTRY_TRANSPORT_COMPRESSION)
-	if(NOT ZLIB_FOUND)
+	if(NOT TARGET ZLIB::ZLIB)
 		find_package(ZLIB REQUIRED)
 	endif()
 
@@ -387,11 +388,7 @@ if(SENTRY_LINK_PTHREAD)
 endif()
 
 # apply platform libraries to sentry library
-if(SENTRY_LIBRARY_TYPE STREQUAL "STATIC")
-	target_link_libraries(sentry PUBLIC ${_SENTRY_PLATFORM_LIBS})
-else()
-	target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
-endif()
+target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
 
 # suppress some errors and warnings for MinGW target
 if(MINGW)
@@ -599,4 +596,9 @@ endif()
 if(SENTRY_BUILD_SHARED_LIBS)
 	target_link_libraries(sentry PRIVATE
 			"$<$<OR:$<PLATFORM_ID:Linux>,$<PLATFORM_ID:Android>>:-Wl,--build-id=sha1,--version-script=${PROJECT_SOURCE_DIR}/src/exports.map>")
+
+	# Support 16KB page sizes
+	target_link_libraries(sentry PRIVATE
+	    "$<$<PLATFORM_ID:Android>:-Wl,-z,max-page-size=16384>"
+	)
 endif()

shared/sentry/src/README.md

@@ -261,8 +261,8 @@ using `cmake -D BUILD_SHARED_LIBS=OFF ..`.
 |            |         |       |       |         |     |
 | Backends   |         |       |       |         |     |
 | - inproc   | ✓       | ✓     | ✓     | ☑       |     |
-| - crashpad | ☑       | ☑     | ✓     |         |     |
-| - breakpad | ✓       | ✓     | ☑     | (✓)     | (✓) |
+| - crashpad | ☑       | ☑     | ☑     |         |     |
+| - breakpad | ✓       | ✓     | ✓     | (✓)     | (✓) |
 | - none     | ✓       | ✓     | ✓     | ✓       |     |
 
 Legend: