diff options
| author | Mahmoud Elsherif <moelsherif@google.com> | 2023-12-19 23:56:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-19 23:56:45 +0000 |
| commit | 5fbeef961e8a4e9f88869c6fcc7b45a3ae1b9a14 (patch) | |
| tree | c661de781dfc2ad71853cc85fafca5df398c4976 | |
| parent | ac5e42387c2cacacd6df2b59594513477216d027 (diff) | |
| parent | f90e2043494cdd30f96312995bf5f19f6ffb5338 (diff) | |
| download | cuttlefish-5fbeef961e8a4e9f88869c6fcc7b45a3ae1b9a14.tar.gz | |
Merge "Update proto package for clientanalytics.proto to fix protoconflict presubmit" into main
| -rw-r--r-- | host/commands/cvd/metrics/proto/clientanalytics.proto | 1 | ||||
| -rw-r--r-- | host/commands/cvd/metrics/utils.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/commands/cvd/metrics/proto/clientanalytics.proto b/host/commands/cvd/metrics/proto/clientanalytics.proto index a120a91a3..e08838456 100644 --- a/host/commands/cvd/metrics/proto/clientanalytics.proto +++ b/host/commands/cvd/metrics/proto/clientanalytics.proto @@ -14,6 +14,7 @@ * limitations under the License. */ syntax = "proto2"; +package cuttlefish; message LogRequest { optional ClientInfo client_info = 1; diff --git a/host/commands/cvd/metrics/utils.h b/host/commands/cvd/metrics/utils.h index ff4d40ddc..283d6ffda 100644 --- a/host/commands/cvd/metrics/utils.h +++ b/host/commands/cvd/metrics/utils.h @@ -35,7 +35,7 @@ std::string GetMacAddress(); std::string GetCompany(); std::string GetVmmVersion(); uint64_t GetEpochTimeMs(); -std::string ProtoToString(LogEvent* event); +std::string ProtoToString(cuttlefish::LogEvent* event); cuttlefish::MetricsExitCodes PostRequest(const std::string& output, ClearcutServer server); |