Move metrics protos outside of the cuttlefish directory

Databean · Databean · commit 039c0118b506 · 2025-09-19T23:52:14.000Z
This will simplify the internal import script.

Bug: b/446052689
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel
@@ -401,12 +401,12 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/metrics:is_enabled",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/commands/metrics:libmetrics_utils",
-        "//cuttlefish/host/commands/metrics/proto:cf_log_cc_proto",
-        "//cuttlefish/host/commands/metrics/proto:clientanalytics_cc_proto",
-        "//cuttlefish/host/commands/metrics/proto:log_source_enum_cc_proto",
         "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/metrics:metrics_headers",
+        "//external_proto:cf_log_cc_proto",
+        "//external_proto:clientanalytics_cc_proto",
+        "//external_proto:log_source_enum_cc_proto",
         "//libbase",
         "@fmt",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp
@@ -65,13 +65,13 @@
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/commands/cvd/utils/interrupt_listener.h"
 #include "cuttlefish/host/commands/cvd/utils/subprocess_waiter.h"
-#include "cuttlefish/host/commands/metrics/proto/cf_log.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/clientanalytics.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/log_source_enum.pb.h"
 #include "cuttlefish/host/commands/metrics/utils.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/metrics/metrics_defs.h"
+#include "external_proto/cf_log.pb.h"
+#include "external_proto/clientanalytics.pb.h"
+#include "external_proto/log_source_enum.pb.h"
 
 namespace cuttlefish {
 namespace {
diff --git a/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel b/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel
@@ -19,15 +19,15 @@ cf_cc_binary(
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:flag_parser",
         "//cuttlefish/common/libs/utils:tee_logging",
-        "//cuttlefish/host/commands/metrics/proto:cf_log_cc_proto",
-        "//cuttlefish/host/commands/metrics/proto:cf_metrics_event_cc_proto",
-        "//cuttlefish/host/commands/metrics/proto:clientanalytics_cc_proto",
-        "//cuttlefish/host/commands/metrics/proto:log_source_enum_cc_proto",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/metrics",
         "//cuttlefish/host/libs/metrics:metrics_headers",
         "//cuttlefish/host/libs/msg_queue",
+        "//external_proto:cf_log_cc_proto",
+        "//external_proto:cf_metrics_event_cc_proto",
+        "//external_proto:clientanalytics_cc_proto",
+        "//external_proto:log_source_enum_cc_proto",
         "//libbase",
         "@fruit",
         "@gflags",
@@ -43,12 +43,12 @@ cf_cc_library(
     hdrs = ["utils.h"],
     deps = [
         "//cuttlefish/common/libs/utils:tee_logging",
-        "//cuttlefish/host/commands/metrics/proto:clientanalytics_cc_proto",
         "//cuttlefish/host/libs/metrics:metrics_headers",
         "//cuttlefish/host/libs/web/http_client",
         "//cuttlefish/host/libs/web/http_client:curl_global_init",
         "//cuttlefish/host/libs/web/http_client:curl_http_client",
         "//cuttlefish/host/libs/web/http_client:http_string",
+        "//external_proto:clientanalytics_cc_proto",
         "//libbase",
         "@gflags",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/metrics/events.cc b/base/cvd/cuttlefish/host/commands/metrics/events.cc
@@ -21,14 +21,14 @@
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/flag_parser.h"
-#include "cuttlefish/host/commands/metrics/proto/cf_log.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/cf_metrics_event.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/clientanalytics.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/log_source_enum.pb.h"
 #include "cuttlefish/host/commands/metrics/utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/metrics/metrics_defs.h"
+#include "external_proto/cf_log.pb.h"
+#include "external_proto/cf_metrics_event.pb.h"
+#include "external_proto/clientanalytics.pb.h"
+#include "external_proto/log_source_enum.pb.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/metrics/events.h b/base/cvd/cuttlefish/host/commands/metrics/events.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include "cuttlefish/host/commands/metrics/proto/cf_log.pb.h"
-#include "cuttlefish/host/commands/metrics/proto/cf_metrics_event.pb.h"
+#include "external_proto/cf_log.pb.h"
+#include "external_proto/cf_metrics_event.pb.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/metrics/host_receiver.cc b/base/cvd/cuttlefish/host/commands/metrics/host_receiver.cc
@@ -20,11 +20,11 @@
 #include <android-base/logging.h>
 
 #include "cuttlefish/host/commands/metrics/events.h"
-#include "cuttlefish/host/commands/metrics/proto/cf_log.pb.h"
 #include "cuttlefish/host/libs/metrics/metrics_configs.h"
 #include "cuttlefish/host/libs/metrics/metrics_defs.h"
 #include "cuttlefish/host/libs/metrics/metrics_receiver.h"
 #include "cuttlefish/host/libs/msg_queue/msg_queue.h"
+#include "external_proto/cf_log.pb.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/metrics/utils.h b/base/cvd/cuttlefish/host/commands/metrics/utils.h
@@ -15,9 +15,9 @@
  */
 #pragma once
 
-#include "cuttlefish/host/commands/metrics/proto/clientanalytics.pb.h"
 #include "cuttlefish/host/libs/metrics/metrics_defs.h"
 #include "cuttlefish/host/libs/web/http_client/http_client.h"
+#include "external_proto/clientanalytics.pb.h"
 
 namespace cuttlefish::metrics {
 
diff --git a/base/cvd/external_proto/BUILD.bazel b/base/cvd/external_proto/BUILD.bazel
diff --git a/base/cvd/external_proto/cf_log.proto b/base/cvd/external_proto/cf_log.proto
@@ -17,7 +17,7 @@ syntax = "proto2";
 
 package logs.proto.wireless.android.cuttlefish;
 
-import "cuttlefish/host/commands/metrics/proto/cf_metrics_event.proto";
+import "external_proto/cf_metrics_event.proto";
 import "google/protobuf/timestamp.proto";
 
 // Wrapper for Cuttlefish log events
@@ -28,14 +28,14 @@ message CuttlefishLogEvent {
   // Next index: 3
   enum DeviceType {
     // The log event was sourced from an unspecified device type.
-    //TODO(moelsherif) : This event is not converted yet in the code
+    // TODO(moelsherif) : This event is not converted yet in the code
     CUTTLEFISH_DEVICE_TYPE_UNSPECIFIED = 0;
 
     // A log event that was sourced from a Cuttlefish host device.
     CUTTLEFISH_DEVICE_TYPE_HOST = 1;
 
     // A log event that was sent by an Cuttlefish guest device.
-    //TODO(moelsherif) : This event is not converted yet in the code
+    // TODO(moelsherif) : This event is not converted yet in the code
     CUTTLEFISH_DEVICE_TYPE_GUEST = 2;
   }
 
diff --git a/base/cvd/external_proto/cf_metrics_event.proto b/base/cvd/external_proto/cf_metrics_event.proto
diff --git a/base/cvd/external_proto/clientanalytics.proto b/base/cvd/external_proto/clientanalytics.proto
@@ -17,7 +17,7 @@ syntax = "proto2";
 
 package wireless_android_play_playlog;
 
-import "cuttlefish/host/commands/metrics/proto/log_source_enum.proto";
+import "external_proto/log_source_enum.proto";
 
 message LogRequest {
   optional ClientInfo client_info = 1;
@@ -35,7 +35,8 @@ message ClientInfo {
   optional ClientType client_type = 1;
 }
 
-// TODO(moelsherif) : This message is not used yet. It will be used to send back the next request wait time.
+// TODO(moelsherif) : This message is not used yet. It will be used to send back
+// the next request wait time.
 message LogResponse {
   optional int64 next_request_wait_millis = 1;
 }
diff --git a/base/cvd/external_proto/log_source_enum.proto b/base/cvd/external_proto/log_source_enum.proto
