Use QNetworkReply::requestSent to improve httplog

Fixes: #10313
owncloud · May 30, 2023 · bdf6faf · bdf6faf
1 parent 26476e5
commit bdf6faf
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/changelog/unreleased/10313 b/changelog/unreleased/10313
@@ -0,0 +1,6 @@
+Enhancement: Log http request when it is send
+
+We now log the http request when it is send, not when it is created.
+This will elable us to print more headers set by the platform and messaure the request time more accurately.
+
+https://github.com/owncloud/client/issues/10313
diff --git a/src/libsync/httplogger.cpp b/src/libsync/httplogger.cpp
@@ -17,10 +17,12 @@
 #include "common/chronoelapsedtimer.h"
 #include "common/utility.h"
 
-#include <QRegularExpression>
-#include <QLoggingCategory>
 #include <QBuffer>
+#include <QLoggingCategory>
+#include <QPointer>
+#include <QRegularExpression>
 
+#include <memory>
 
 using namespace std::chrono;
 
@@ -29,7 +31,8 @@ Q_LOGGING_CATEGORY(lcNetworkHttp, "sync.httplogger", QtWarningMsg)
 
 const qint64 PeekSize = 1024 * 1024;
 
-const QByteArray XRequestId(){
+const QByteArray XRequestId()
+{
     return QByteArrayLiteral("X-Request-ID");
 }
 
@@ -110,30 +113,30 @@ void HttpLogger::logRequest(QNetworkReply *reply, QNetworkAccessManager::Operati
     if (!lcNetworkHttp().isInfoEnabled()) {
         return;
     }
-    const auto timer = Utility::ChronoElapsedTimer();
-    const auto request = reply->request();
-
-    const auto keys = request.rawHeaderList();
-    QList<QNetworkReply::RawHeaderPair> header;
-    header.reserve(keys.size());
-    for (const auto &key : keys) {
-        header << qMakePair(key, request.rawHeader(key));
-    }
-    logHttp(requestVerb(operation, request),
-        request.url().toString(),
-        request.rawHeader(XRequestId()),
-        request.header(QNetworkRequest::ContentTypeHeader).toString(),
-        header,
-        device);
-
-    QObject::connect(reply, &QNetworkReply::finished, reply, [reply, timer] {
-        logHttp(requestVerb(*reply),
-            reply->url().toString(),
-            reply->request().rawHeader(XRequestId()),
-            reply->header(QNetworkRequest::ContentTypeHeader).toString(),
-            reply->rawHeaderPairs(),
-            reply,
-            timer.duration());
+    auto timer = std::make_unique<Utility::ChronoElapsedTimer>();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    // device should still exist, lets still use a qpointer to ensure we have valid data
+    QObject::connect(
+        reply, &QNetworkReply::requestSent, reply, [timer = timer.get(), operation, reply, device = QPointer<QIODevice>(device), deviceRaw = device] {
+            Q_ASSERT(!deviceRaw || device);
+            timer->reset();
+
+            const auto request = reply->request();
+            const auto keys = request.rawHeaderList();
+            QList<QNetworkReply::RawHeaderPair> header;
+            header.reserve(keys.size());
+            for (const auto &key : keys) {
+                header << qMakePair(key, request.rawHeader(key));
+            }
+            logHttp(requestVerb(operation, request), request.url().toString(), request.rawHeader(XRequestId()),
+                request.header(QNetworkRequest::ContentTypeHeader).toString(), header, device);
+        });
+#endif
+
+    QObject::connect(reply, &QNetworkReply::finished, reply, [reply, timer = std::move(timer)] {
+        logHttp(requestVerb(*reply), reply->url().toString(), reply->request().rawHeader(XRequestId()),
+            reply->header(QNetworkRequest::ContentTypeHeader).toString(), reply->rawHeaderPairs(), reply, timer->duration());
     });
 }