code review comments

Author: samanehsan

src/main/java/bio/terra/app/usermetrics/UserLoggingMetrics.java

@@ -46,9 +46,4 @@ public void setAll(HashMap<String, Object> value) {
     properties.putAll(value);
     metrics.set(properties);
   }
-
-  @VisibleForTesting
-  public void reset() {
-    metrics.get().clear();
-  }
 }

src/main/java/bio/terra/service/filedata/DrsService.java

@@ -491,16 +491,7 @@ private DRSAccessURL getAccessURL(
 
     BillingProfileModel billingProfileModel = cachedSnapshot.datasetBillingProfileModel;
 
-    loggingMetrics.set(BardEventProperties.DATASET_ID_FIELD_NAME, cachedSnapshot.getDatasetId());
-    loggingMetrics.set(
-        BardEventProperties.DATASET_NAME_FIELD_NAME, cachedSnapshot.getDatasetName());
-    loggingMetrics.set(BardEventProperties.SNAPSHOT_ID_FIELD_NAME, snapshotId);
-    loggingMetrics.set(BardEventProperties.SNAPSHOT_NAME_FIELD_NAME, cachedSnapshot.getName());
-    loggingMetrics.set(
-        BardEventProperties.BILLING_PROFILE_ID_FIELD_NAME,
-        cachedSnapshot.getSnapshotBillingProfileId());
-    loggingMetrics.set(
-        BardEventProperties.CLOUD_PLATFORM_FIELD_NAME, cachedSnapshot.getCloudPlatform());
+    logAdditionalProperties(cachedSnapshot);
 
     assertAccessMethodMatchingAccessId(accessId, drsObject);
 
@@ -526,6 +517,23 @@ private DRSAccessURL getAccessURL(
     }
   }
 
+  /**
+   * Include additional properties in the event log sent to Bard
+   * @param cachedSnapshot
+   */
+  private void logAdditionalProperties(SnapshotCacheResult cachedSnapshot) {
+    loggingMetrics.set(BardEventProperties.DATASET_ID_FIELD_NAME, cachedSnapshot.getDatasetId());
+    loggingMetrics.set(
+            BardEventProperties.DATASET_NAME_FIELD_NAME, cachedSnapshot.getDatasetName());
+    loggingMetrics.set(BardEventProperties.SNAPSHOT_ID_FIELD_NAME, cachedSnapshot.getId());
+    loggingMetrics.set(BardEventProperties.SNAPSHOT_NAME_FIELD_NAME, cachedSnapshot.getName());
+    loggingMetrics.set(
+            BardEventProperties.BILLING_PROFILE_ID_FIELD_NAME,
+            cachedSnapshot.getSnapshotBillingProfileId());
+    loggingMetrics.set(
+            BardEventProperties.CLOUD_PLATFORM_FIELD_NAME, cachedSnapshot.getCloudPlatform());
+  }
+
   @VisibleForTesting
   DrsId resolveDrsObjectId(String drsObjectId) {
     // If the drsObjectId is not a TDR generated DRS ID, then assume it's an alias and resolve it

src/test/java/bio/terra/app/usermetrics/UserMetricsInterceptorTest.java

@@ -70,7 +70,7 @@ class UserMetricsInterceptorTest {
 
   @BeforeEach
   void setUp() {
-    eventProperties.reset();
+    eventProperties.get().clear();
     when(metricsConfig.ignorePaths()).thenReturn(List.of());
     when(metricsConfig.appId()).thenReturn(APP_ID);
     when(metricsConfig.bardBasePath()).thenReturn(BARD_BASE_PATH);