From e478b10426f51f190693cc95ba3955607f53cae7 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 6 Feb 2025 14:23:35 -0800
Subject: [PATCH] fix: replace APP_VERSION with webpack global __APP_VERSION__
 (#10824)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/embedder/embedder.ts                 | 2 +-
 packages/embedder/establishPrimaryEmbedder.ts | 2 +-
 packages/gql-executor/gqlExecutor.ts          | 2 +-
 packages/server/initSentry.ts                 | 3 +--
 packages/server/server.ts                     | 2 +-
 packages/server/socketHandlers/handleOpen.ts  | 3 +--
 packages/server/sse/SSEConnectionHandler.ts   | 4 +---
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index 5e92dd6cf6b..dffb2d97540 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -16,7 +16,7 @@ tracer.init({
   service: `embedder`,
   appsec: process.env.DD_APPSEC_ENABLED === 'true',
   plugins: false,
-  version: process.env.npm_package_version
+  version: __APP_VERSION__
 })
 // The embedder queue is in PG & gets hits non-stop, which dirties up the logs. Ignore the polling query before enabling pg
 // tracer.use('pg')
diff --git a/packages/embedder/establishPrimaryEmbedder.ts b/packages/embedder/establishPrimaryEmbedder.ts
index 72f349d655f..28fb53ca76b 100644
--- a/packages/embedder/establishPrimaryEmbedder.ts
+++ b/packages/embedder/establishPrimaryEmbedder.ts
@@ -7,7 +7,7 @@ export const establishPrimaryEmbedder = async (redis: RedisInstance) => {
   const MAX_TIME_BETWEEN_WORKER_STARTUPS = ms('5s')
   try {
     const primaryWorkerLock = await redlock.acquire(
-      [`embedder_isPrimary_${process.env.npm_package_version}`],
+      [`embedder_isPrimary_${__APP_VERSION__}`],
       MAX_TIME_BETWEEN_WORKER_STARTUPS
     )
     return primaryWorkerLock
diff --git a/packages/gql-executor/gqlExecutor.ts b/packages/gql-executor/gqlExecutor.ts
index e5aee112c85..5a814d5d93a 100644
--- a/packages/gql-executor/gqlExecutor.ts
+++ b/packages/gql-executor/gqlExecutor.ts
@@ -14,7 +14,7 @@ tracer.init({
   service: `gql`,
   appsec: process.env.DD_APPSEC_ENABLED === 'true',
   plugins: false,
-  version: process.env.npm_package_version
+  version: __APP_VERSION__
 })
 tracer.use('ioredis').use('http').use('pg')
 
diff --git a/packages/server/initSentry.ts b/packages/server/initSentry.ts
index 54098174b9d..9d6fc46e10b 100644
--- a/packages/server/initSentry.ts
+++ b/packages/server/initSentry.ts
@@ -9,11 +9,10 @@ declare global {
   }
 }
 
-const APP_VERSION = process.env.npm_package_version
 Sentry.init({
   environment: 'server',
   dsn: process.env.SENTRY_DSN,
-  release: APP_VERSION,
+  release: __APP_VERSION__,
   ignoreErrors: [
     '429 Too Many Requests',
     /language \S+ is not supported/,
diff --git a/packages/server/server.ts b/packages/server/server.ts
index 77f8181316b..343b0910d03 100644
--- a/packages/server/server.ts
+++ b/packages/server/server.ts
@@ -33,7 +33,7 @@ tracer.init({
   service: `web`,
   appsec: process.env.DD_APPSEC_ENABLED === 'true',
   plugins: false,
-  version: process.env.npm_package_version
+  version: __APP_VERSION__
 })
 tracer.use('ioredis').use('http').use('pg')
 
diff --git a/packages/server/socketHandlers/handleOpen.ts b/packages/server/socketHandlers/handleOpen.ts
index a2e0f5fc77e..fd3ead28750 100644
--- a/packages/server/socketHandlers/handleOpen.ts
+++ b/packages/server/socketHandlers/handleOpen.ts
@@ -10,7 +10,6 @@ import checkBlacklistJWT from '../utils/checkBlacklistJWT'
 import sendToSentry from '../utils/sendToSentry'
 import handleConnect from './handleConnect'
 
-const APP_VERSION = process.env.npm_package_version
 export type SocketUserData = {
   connectionContext: ConnectionContext
   authToken: AuthToken
@@ -51,7 +50,7 @@ const handleOpen: WebSocketBehavior<SocketUserData>['open'] = async (socket) =>
 
   // messages will start coming in before handleConnect completes & sit in the readyQueue
   const nextAuthToken = await handleConnect(connectionContext)
-  sendEncodedMessage(connectionContext, {version: APP_VERSION, authToken: nextAuthToken})
+  sendEncodedMessage(connectionContext, {version: __APP_VERSION__, authToken: nextAuthToken})
   keepAlive(connectionContext)
 }
 
diff --git a/packages/server/sse/SSEConnectionHandler.ts b/packages/server/sse/SSEConnectionHandler.ts
index b544d411297..d413a2f91a2 100644
--- a/packages/server/sse/SSEConnectionHandler.ts
+++ b/packages/server/sse/SSEConnectionHandler.ts
@@ -14,8 +14,6 @@ import getQueryToken from '../utils/getQueryToken'
 import uwsGetIP from '../utils/uwsGetIP'
 import sendSSEMessage from './sendSSEMessage'
 
-const APP_VERSION = process.env.npm_package_version
-
 const SSEConnectionHandler = uWSAsyncHandler(async (res: HttpResponse, req: HttpRequest) => {
   const authToken = getQueryToken(req)
   const connectionContext = new ConnectionContext(res, authToken, uwsGetIP(res, req))
@@ -46,7 +44,7 @@ const SSEConnectionHandler = uWSAsyncHandler(async (res: HttpResponse, req: Http
   if (res.done) return
   res.tryEnd(`retry: 1000\n`, 1e8)
   sendSSEMessage(res, connectionContext.id, 'id')
-  sendEncodedMessage(connectionContext, {version: APP_VERSION, authToken: nextAuthToken})
+  sendEncodedMessage(connectionContext, {version: __APP_VERSION__, authToken: nextAuthToken})
   keepAlive(connectionContext)
 }, true)