From 8199e0d2d51a496da9e0fd1c2bb20e68f38b9a99 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Wed, 7 Sep 2022 19:18:09 -0500
Subject: [PATCH] Set resource field on log entry

---
 event-logger/src/main/kotlin/loggers.kt                     | 6 ++++--
 .../whispersystems/textsecuregcm/WhisperServerService.java  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/event-logger/src/main/kotlin/loggers.kt b/event-logger/src/main/kotlin/loggers.kt
index 4ce29db55..4e87f7ea8 100644
--- a/event-logger/src/main/kotlin/loggers.kt
+++ b/event-logger/src/main/kotlin/loggers.kt
@@ -7,6 +7,7 @@ package org.signal.event
 
 import com.google.cloud.logging.LogEntry
 import com.google.cloud.logging.Logging
+import com.google.cloud.logging.MonitoredResourceUtil
 import com.google.cloud.logging.Payload.JsonPayload
 import com.google.cloud.logging.Severity
 import com.google.protobuf.Struct
@@ -22,7 +23,7 @@ class NoOpAdminEventLogger : AdminEventLogger {
     override fun logEvent(event: Event, labels: Map<String, String>?) {}
 }
 
-class GoogleCloudAdminEventLogger(private val logging: Logging, private val logName: String) : AdminEventLogger {
+class GoogleCloudAdminEventLogger(private val logging: Logging, private val projectId: String, private val logName: String) : AdminEventLogger {
     override fun logEvent(event: Event, labels: Map<String, String>?) {
         val structBuilder = Struct.newBuilder()
         JsonFormat.parser().merge(jsonFormat.encodeToString(event), structBuilder)
@@ -30,7 +31,8 @@ class GoogleCloudAdminEventLogger(private val logging: Logging, private val logN
 
         val logEntryBuilder = LogEntry.newBuilder(JsonPayload.of(struct))
                 .setLogName(logName)
-                .setSeverity(Severity.NOTICE);
+                .setSeverity(Severity.NOTICE)
+                .setResource(MonitoredResourceUtil.getResource(projectId, "project"));
         if (labels != null) {
             logEntryBuilder.setLabels(labels);
         }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 3678190f2..a6018ebc0 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -193,6 +193,7 @@ import org.whispersystems.textsecuregcm.storage.NonNormalizedAccountCrawlerListe
 import org.whispersystems.textsecuregcm.storage.PhoneNumberIdentifiers;
 import org.whispersystems.textsecuregcm.storage.Profiles;
 import org.whispersystems.textsecuregcm.storage.ProfilesManager;
+import org.whispersystems.textsecuregcm.storage.ProhibitedUsernames;
 import org.whispersystems.textsecuregcm.storage.PubSubManager;
 import org.whispersystems.textsecuregcm.storage.PushChallengeDynamoDb;
 import org.whispersystems.textsecuregcm.storage.PushFeedbackProcessor;
@@ -201,7 +202,6 @@ import org.whispersystems.textsecuregcm.storage.RemoteConfigs;
 import org.whispersystems.textsecuregcm.storage.RemoteConfigsManager;
 import org.whispersystems.textsecuregcm.storage.ReportMessageDynamoDb;
 import org.whispersystems.textsecuregcm.storage.ReportMessageManager;
-import org.whispersystems.textsecuregcm.storage.ProhibitedUsernames;
 import org.whispersystems.textsecuregcm.storage.StoredVerificationCodeManager;
 import org.whispersystems.textsecuregcm.storage.SubscriptionManager;
 import org.whispersystems.textsecuregcm.storage.VerificationCodeStore;
@@ -417,6 +417,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             .setCredentials(GoogleCredentials.fromStream(new ByteArrayInputStream(
                 config.getAdminEventLoggingConfiguration().credentials().getBytes(StandardCharsets.UTF_8))))
             .build().getService(),
+        config.getAdminEventLoggingConfiguration().projectId(),
         config.getAdminEventLoggingConfiguration().logName());
 
     StripeManager stripeManager = new StripeManager(config.getStripe().getApiKey(), stripeExecutor,