P3A: Report sent from the json format submission.

Prevously, we marked P3A reports as sent when the protobuf
format message was delivered successfully. When we started
sending only json format messages, this led to messages being
queued for retrial endlessly, greatly delaying submission.

Move the completetion callback to the new json log uploader.
Now that we're sending json-format messages to both P3A and P2A
endpoints, we can consider that the completion of the task and
only send protobuf messages incidentally.

Fixes brave/brave-browser#23754

Author: rillian

components/p3a/brave_p3a_new_uploader.cc

@@ -72,10 +72,12 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation(
 BraveP3ANewUploader::BraveP3ANewUploader(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
     const GURL& p3a_endpoint,
-    const GURL& p2a_endpoint)
+    const GURL& p2a_endpoint,
+    const UploadCallback& on_upload_complete)
     : url_loader_factory_(url_loader_factory),
       p3a_endpoint_(p3a_endpoint),
-      p2a_endpoint_(p2a_endpoint) {}
+      p2a_endpoint_(p2a_endpoint),
+      on_upload_complete_(on_upload_complete) {}
 
 BraveP3ANewUploader::~BraveP3ANewUploader() = default;
 
@@ -107,7 +109,15 @@ void BraveP3ANewUploader::UploadLog(const std::string& compressed_log_data,
 
 void BraveP3ANewUploader::OnUploadComplete(
     std::unique_ptr<std::string> response_body) {
+  int response_code = -1;
+  if (url_loader_->ResponseInfo() && url_loader_->ResponseInfo()->headers)
+    response_code = url_loader_->ResponseInfo()->headers->response_code();
+
+  int error_code = url_loader_->NetError();
+
+  bool was_https = url_loader_->GetFinalURL().SchemeIs(url::kHttpsScheme);
   url_loader_.reset();
+  on_upload_complete_.Run(response_code, error_code, was_https);
 }
 
 }  // namespace brave

components/p3a/brave_p3a_new_uploader.h

@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "url/gurl.h"
 
@@ -25,10 +26,13 @@ namespace brave {
 // testing the new endpoint).
 class BraveP3ANewUploader {
  public:
+  using UploadCallback = base::RepeatingCallback<void(int, int, bool)>;
+
   BraveP3ANewUploader(
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
       const GURL& p3a_endpoint,
-      const GURL& p2a_endpoint);
+      const GURL& p2a_endpoint,
+      const UploadCallback& on_upload_complete);
 
   BraveP3ANewUploader(const BraveP3ANewUploader&) = delete;
   BraveP3ANewUploader& operator=(const BraveP3ANewUploader&) = delete;
@@ -45,6 +49,7 @@ class BraveP3ANewUploader {
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
   const GURL p3a_endpoint_;
   const GURL p2a_endpoint_;
+  const UploadCallback on_upload_complete_;
   std::unique_ptr<network::SimpleURLLoader> url_loader_;
 };
 

components/p3a/brave_p3a_service.cc

@@ -167,11 +167,11 @@ void BraveP3AService::Init(
 
   // Init other components.
   uploader_ = std::make_unique<BraveP3AUploader>(
-      url_loader_factory, upload_server_url_, GURL(kP2AServerUrl),
-      base::BindRepeating(&BraveP3AService::OnLogUploadComplete, this));
+      url_loader_factory, upload_server_url_, GURL(kP2AServerUrl));
 
   new_uploader_ = std::make_unique<BraveP3ANewUploader>(
-      url_loader_factory, GURL(kP3AJsonServerUrl), GURL(kP2AJsonServerUrl));
+      url_loader_factory, GURL(kP3AJsonServerUrl), GURL(kP2AJsonServerUrl),
+      base::BindRepeating(&BraveP3AService::OnLogUploadComplete, this));
 
   upload_scheduler_ = std::make_unique<BraveP3AScheduler>(
       base::BindRepeating(&BraveP3AService::StartScheduledUpload, this),

components/p3a/brave_p3a_uploader.cc

@@ -72,12 +72,10 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation(
 BraveP3AUploader::BraveP3AUploader(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
     const GURL& p3a_endpoint,
-    const GURL& p2a_endpoint,
-    const UploadCallback& on_upload_complete)
+    const GURL& p2a_endpoint)
     : url_loader_factory_(url_loader_factory),
       p3a_endpoint_(p3a_endpoint),
-      p2a_endpoint_(p2a_endpoint),
-      on_upload_complete_(on_upload_complete) {}
+      p2a_endpoint_(p2a_endpoint) {}
 
 BraveP3AUploader::~BraveP3AUploader() = default;
 
@@ -112,15 +110,7 @@ void BraveP3AUploader::UploadLog(const std::string& compressed_log_data,
 
 void BraveP3AUploader::OnUploadComplete(
     std::unique_ptr<std::string> response_body) {
-  int response_code = -1;
-  if (url_loader_->ResponseInfo() && url_loader_->ResponseInfo()->headers)
-    response_code = url_loader_->ResponseInfo()->headers->response_code();
-
-  int error_code = url_loader_->NetError();
-
-  bool was_https = url_loader_->GetFinalURL().SchemeIs(url::kHttpsScheme);
   url_loader_.reset();
-  on_upload_complete_.Run(response_code, error_code, was_https);
 }
 
 }  // namespace brave

components/p3a/brave_p3a_uploader.h

@@ -9,7 +9,6 @@
 #include <memory>
 #include <string>
 
-#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "url/gurl.h"
 
@@ -22,13 +21,10 @@ namespace brave {
 
 class BraveP3AUploader {
  public:
-  using UploadCallback = base::RepeatingCallback<void(int, int, bool)>;
-
   BraveP3AUploader(
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
       const GURL& p3a_endpoint,
-      const GURL& p2a_endpoint,
-      const UploadCallback& on_upload_complete);
+      const GURL& p2a_endpoint);
 
   BraveP3AUploader(const BraveP3AUploader&) = delete;
   BraveP3AUploader& operator=(const BraveP3AUploader&) = delete;
@@ -45,7 +41,6 @@ class BraveP3AUploader {
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
   const GURL p3a_endpoint_;
   const GURL p2a_endpoint_;
-  const UploadCallback on_upload_complete_;
   std::unique_ptr<network::SimpleURLLoader> url_loader_;
 };