Merge pull request #1288 from snyk/staging

RELEASE
snyk · Mar 23, 2023 · c457e9b · c457e9b
2 parents 0da33a5 + 3de5679
commit c457e9b
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/transmitter/index.ts b/src/transmitter/index.ts
@@ -371,15 +371,15 @@ export async function sendClusterMetadata(): Promise<void> {
     namespace: config.NAMESPACE,
   };
 
+  const logContext = {
+    userLocator: payload.userLocator,
+    cluster: payload.cluster,
+    agentId: payload.agentId,
+    version: payload.version,
+  };
+
   try {
-    logger.info(
-      {
-        userLocator: payload.userLocator,
-        cluster: payload.cluster,
-        agentId: payload.agentId,
-      },
-      'attempting to send cluster metadata',
-    );
+    logger.info(logContext, 'attempting to send cluster metadata');
 
     const request: KubernetesUpstreamRequest = {
       method: 'post',
@@ -395,20 +395,16 @@ export async function sendClusterMetadata(): Promise<void> {
 
     logger.info(
       {
-        userLocator: payload.userLocator,
-        cluster: payload.cluster,
-        agentId: payload.agentId,
+        ...logContext,
         attempt,
       },
       'cluster metadata sent upstream successfully',
     );
   } catch (error) {
     logger.error(
       {
+        ...logContext,
         error,
-        userLocator: payload.userLocator,
-        cluster: payload.cluster,
-        agentId: payload.agentId,
       },
       'could not send cluster metadata',
     );