Remove dependency on CuttlefishConfig from events.cc

This will make it possible to call from `cvd`.

Bug: b/446266666

Author: Databean

base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel

@@ -10,7 +10,6 @@ cf_cc_library(
     hdrs = ["events.h"],
     deps = [
         "//cuttlefish/host/commands/metrics:libmetrics_utils",
-        "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:vmm_mode",
         "//external_proto:cf_log_cc_proto",
         "//external_proto:cf_metrics_event_cc_proto",
@@ -35,6 +34,7 @@ cf_cc_binary(
         "//cuttlefish/host/commands/metrics:events",
         "//cuttlefish/host/commands/metrics:libmetrics_utils",
         "//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",

base/cvd/cuttlefish/host/commands/metrics/events.cc

@@ -20,7 +20,6 @@
 #include "google/protobuf/timestamp.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 "external_proto/cf_log.pb.h"
 #include "external_proto/cf_metrics_event.pb.h"
@@ -97,10 +96,8 @@ MetricsEvent::OsType GetOsType() {
   return MetricsEvent::CUTTLEFISH_OS_TYPE_UNSPECIFIED;
 }
 
-MetricsEvent::VmmType GetVmm() {
-  const CuttlefishConfig* config = CuttlefishConfig::Get();
-  CHECK(config) << "Could not open cuttlefish config";
-  switch (config->vm_manager()) {
+MetricsEvent::VmmType GetVmm(VmmMode vmm_mode) {
+  switch (vmm_mode) {
     case VmmMode::kCrosvm:
       return MetricsEvent::CUTTLEFISH_VMM_TYPE_CROSVM;
     case VmmMode::kQemu:
@@ -111,14 +108,14 @@ MetricsEvent::VmmType GetVmm() {
 }
 
 // Builds the 2nd level MetricsEvent.
-MetricsEvent BuildMetricsEvent(uint64_t now_ms,
+MetricsEvent BuildMetricsEvent(uint64_t now_ms, VmmMode vmm_mode,
                                MetricsEvent::EventType event_type) {
   // "metrics_event" is the 2nd level MetricsEvent
   MetricsEvent metrics_event;
   metrics_event.set_event_type(event_type);
   metrics_event.set_os_type(GetOsType());
   metrics_event.set_os_version(GetOsVersion());
-  metrics_event.set_vmm_type(GetVmm());
+  metrics_event.set_vmm_type(GetVmm(vmm_mode));
 
   if (!GetVmmVersion().empty()) {
     metrics_event.set_vmm_version(GetVmmVersion());
@@ -150,11 +147,12 @@ LogRequest BuildLogRequest(uint64_t now_ms,
   return log_request;
 }
 
-int SendEvent(MetricsEvent::EventType event_type) {
+int SendEvent(MetricsEvent::EventType event_type, VmmMode vmm_mode) {
   uint64_t now_ms = GetEpochTimeMs();
 
   CuttlefishLogEvent cf_event = BuildCfLogEvent(now_ms);
-  *cf_event.mutable_metrics_event() = BuildMetricsEvent(now_ms, event_type);
+  *cf_event.mutable_metrics_event() =
+      BuildMetricsEvent(now_ms, vmm_mode, event_type);
 
   LogRequest log_request = BuildLogRequest(now_ms, cf_event);
   std::string log_request_str = log_request.SerializeAsString();
@@ -164,20 +162,22 @@ int SendEvent(MetricsEvent::EventType event_type) {
 
 }  // namespace
 
-int SendVMStart() {
-  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_VM_INSTANTIATION);
+int SendVMStart(VmmMode vmm_mode) {
+  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_VM_INSTANTIATION,
+                   vmm_mode);
 }
 
-int SendVMStop() {
-  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_VM_STOP);
+int SendVMStop(VmmMode vmm_mode) {
+  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_VM_STOP, vmm_mode);
 }
 
-int SendDeviceBoot() {
-  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_DEVICE_BOOT);
+int SendDeviceBoot(VmmMode vmm_mode) {
+  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_DEVICE_BOOT, vmm_mode);
 }
 
-int SendLockScreen() {
-  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_LOCK_SCREEN_AVAILABLE);
+int SendLockScreen(VmmMode vmm_mode) {
+  return SendEvent(MetricsEvent::CUTTLEFISH_EVENT_TYPE_LOCK_SCREEN_AVAILABLE,
+                   vmm_mode);
 }
 
 }  // namespace cuttlefish::metrics

base/cvd/cuttlefish/host/commands/metrics/events.h

@@ -15,11 +15,13 @@
  */
 #pragma once
 
+#include "cuttlefish/host/libs/config/vmm_mode.h"
+
 namespace cuttlefish::metrics {
 
-int SendVMStart();
-int SendVMStop();
-int SendDeviceBoot();
-int SendLockScreen();
+int SendVMStart(VmmMode);
+int SendVMStop(VmmMode);
+int SendDeviceBoot(VmmMode);
+int SendLockScreen(VmmMode);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/metrics/host_receiver.cc

@@ -20,9 +20,10 @@
 #include <android-base/logging.h>
 
 #include "cuttlefish/host/commands/metrics/events.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.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"
 
@@ -75,14 +76,18 @@ bool MetricsHostReceiver::Initialize(const std::string& metrics_queue_name) {
 void MetricsHostReceiver::ProcessMessage(const std::string& text) {
   int rc = MetricsExitCodes::kSuccess;
 
+  const CuttlefishConfig* config = CuttlefishConfig::Get();
+  CHECK(config) << "Could not open cuttlefish config";
+  VmmMode vmm_mode = config->vm_manager();
+
   if (text == "VMStart") {
-    rc = metrics::SendVMStart();
+    rc = metrics::SendVMStart(vmm_mode);
   } else if (text == "VMStop") {
-    rc = metrics::SendVMStop();
+    rc = metrics::SendVMStop(vmm_mode);
   } else if (text == "DeviceBoot") {
-    rc = metrics::SendDeviceBoot();
+    rc = metrics::SendDeviceBoot(vmm_mode);
   } else if (text == "LockScreen") {
-    rc = metrics::SendLockScreen();
+    rc = metrics::SendLockScreen(vmm_mode);
   } else {
     LOG(ERROR) << "Message not recognized: " << text;
     rc = MetricsExitCodes::kMetricsError;