chore(release): Test and deploy to Production v8.25.4 (#10857)

Signed-off-by: Matt Krick <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Matt Krick <[email protected]> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Georg Bremer <[email protected]> Co-authored-by: Nick O'Ferrall <[email protected]> Co-authored-by: Terry Acker <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: Bruce Tian <[email protected]> Co-authored-by: Rafa <[email protected]> Co-authored-by: Sven Seeberg <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smruti Ranjan Badatya <[email protected]> Co-authored-by: Jordan Husney <[email protected]> Co-authored-by: Smruti Ranjan Badatya <[email protected]> Co-authored-by: Hemant Kumar Singh <[email protected]> Co-authored-by: github-actions <[email protected]>
ParabolInc · Feb 12, 2025 · b9f5ff9 · b9f5ff9
1 parent 5957572
commit b9f5ff9
Show file tree

Hide file tree

Showing 24 changed files with 81 additions and 111 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "8.25.3"
+  ".": "8.25.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [8.25.4](https://github.com/ParabolInc/parabol/compare/v8.25.3...v8.25.4) (2025-02-12)
+
+
+### Fixed
+
+* delay cleaning user presence ([#10855](https://github.com/ParabolInc/parabol/issues/10855)) ([b208f89](https://github.com/ParabolInc/parabol/commit/b208f89557a852e3b259d4076e6b5007ca0f2bfc))
+
 ## [8.25.3](https://github.com/ParabolInc/parabol/compare/v8.25.2...v8.25.3) (2025-02-11)
 
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "8.25.3"
+    "parabol-server": "8.25.4"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/client/types/AuthToken.ts → packages/client/types/AuthToken.d.ts b/packages/client/types/AuthToken.ts → packages/client/types/AuthToken.d.ts
@@ -1,7 +1,7 @@
 export interface AuthToken {
   sub: string
   tms: string[]
-  rol?: 'su' | 'impersonate'
+  rol?: 'su' | 'impersonate' | null
   bet?: 1
   iat: number
   iss: string

diff --git a/packages/client/types/reactHTML4.d.ts b/packages/client/types/reactHTML4.d.ts
@@ -1,12 +1,11 @@
 import 'react'
-
 declare module 'react' {
-  export interface TdHTMLAttributes<T> {
+  interface TdHTMLAttributes<T> {
     height?: string | number
     width?: string | number
     bgcolor?: string
   }
-  export interface TableHTMLAttributes<T> {
+  interface TableHTMLAttributes<T> {
     align?: 'center' | 'left' | 'right'
     bgcolor?: string
     height?: string | number

diff --git a/packages/embedder/custom.d.ts b/packages/embedder/custom.d.ts
@@ -1,4 +1,4 @@
-import {DataLoaderInstance} from '../server/dataloader/RootDataLoader'
+import type {DataLoaderInstance} from '../server/dataloader/RootDataLoader'
 import type {DB} from '../server/postgres/types/pg'
 import {JobQueueError} from './JobQueueError'
 

diff --git a/packages/embedder/package.json b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",

diff --git a/packages/gql-executor/gqlExecutor.ts b/packages/gql-executor/gqlExecutor.ts
@@ -2,10 +2,11 @@ import tracer from 'dd-trace'
 import {ServerChannel} from 'parabol-client/types/constEnums'
 import GQLExecutorChannelId from '../client/shared/gqlIds/GQLExecutorChannelId'
 import SocketServerChannelId from '../client/shared/gqlIds/SocketServerChannelId'
+import sleep from '../client/utils/sleep'
 import executeGraphQL from '../server/graphql/executeGraphQL'
 import '../server/initSentry'
 import '../server/monkeyPatchFetch'
-import {GQLRequest} from '../server/types/custom'
+import type {GQLRequest} from '../server/types/GQLRequest'
 import {Logger} from '../server/utils/Logger'
 import RedisInstance from '../server/utils/RedisInstance'
 import RedisStream from './RedisStream'
@@ -46,6 +47,9 @@ const run = async () => {
       ServerChannel.GQL_EXECUTOR_CONSUMER_GROUP,
       executorChannel
     )
+    // The executor has published SourceStream messages to webserver that include its executorServerId
+    // It expects the webserver call it back to make use of its cache. These should resovle within a couple seconds
+    await sleep(2000)
 
     setInterval(() => {
       if (Date.now() - start >= MAX_SHUTDOWN_TIME) {

diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "dd-trace": "^5.0.0",
-    "parabol-client": "8.25.3",
-    "parabol-server": "8.25.3",
+    "parabol-client": "8.25.4",
+    "parabol-server": "8.25.4",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/packages/mattermost-plugin/package.json b/packages/mattermost-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-mattermost-plugin",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Georg Bremer <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/mattermost-plugin#readme",
@@ -60,7 +60,7 @@
     "@tiptap/extension-link": "^2.9.1",
     "@tiptap/starter-kit": "^2.9.1",
     "mattermost-redux": "5.33.1",
-    "parabol-client": "8.25.3",
+    "parabol-client": "8.25.4",
     "react-relay": "^18.2.0",
     "react-select": "5.8.2",
     "relay-runtime": "^18.1.1",

diff --git a/packages/server/graphql/ResponseStream.ts b/packages/server/graphql/ResponseStream.ts
@@ -1,12 +1,9 @@
 import {ExecutionResult} from 'graphql'
 import SubscriptionIterator from '../utils/SubscriptionIterator'
-import {getUserId} from '../utils/authorization'
 import getGraphQLExecutor from '../utils/getGraphQLExecutor'
 import sendToSentry from '../utils/sendToSentry'
 import {SubscribeRequest} from './subscribeGraphQL'
 
-const {SERVER_ID} = process.env
-
 export default class ResponseStream implements AsyncIterableIterator<ExecutionResult> {
   private sourceStream: SubscriptionIterator
   private req: SubscribeRequest
@@ -44,19 +41,6 @@ export default class ResponseStream implements AsyncIterableIterator<ExecutionRe
       }
       return {done: false, value: result}
     } catch (e) {
-      const error =
-        e instanceof Error ? e : new Error(`GQL executor failed to publish. docId: ${docId}`)
-      sendToSentry(error, {
-        userId: getUserId(authToken),
-        tags: {
-          authToken: JSON.stringify(authToken),
-          docId: docId || '',
-          query: query || '',
-          variables: JSON.stringify(variables),
-          socketServerId: SERVER_ID!,
-          executorServerId
-        }
-      })
       return this.next()
     }
   }

diff --git a/packages/server/graphql/executeGraphQL.ts b/packages/server/graphql/executeGraphQL.ts
@@ -7,7 +7,7 @@
 import tracer from 'dd-trace'
 import {graphql} from 'graphql'
 import {FormattedExecutionResult} from 'graphql/execution/execute'
-import type {GQLRequest} from '../types/custom'
+import type {GQLRequest} from '../types/GQLRequest'
 import sendToSentry from '../utils/sendToSentry'
 import CompiledQueryCache from './CompiledQueryCache'
 import getDataLoader from './getDataLoader'

diff --git a/packages/server/graphql/handleGraphQLTrebuchetRequest.ts b/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
@@ -1,16 +1,12 @@
 import {OutgoingMessage} from '@mattkrick/graphql-trebuchet-client'
 import tracer from 'dd-trace'
 import ConnectionContext from '../socketHelpers/ConnectionContext'
-import {getUserId} from '../utils/authorization'
 import getGraphQLExecutor from '../utils/getGraphQLExecutor'
 import relayUnsubscribe from '../utils/relayUnsubscribe'
 import sanitizeGraphQLErrors from '../utils/sanitizeGraphQLErrors'
-import sendToSentry from '../utils/sendToSentry'
 import subscribeGraphQL from './subscribeGraphQL'
 export type GraphQLMessageType = 'data' | 'complete' | 'error'
 
-const {SERVER_ID} = process.env
-
 const handleGraphQLTrebuchetRequest = async (
   data: OutgoingMessage,
   connectionContext: ConnectionContext
@@ -38,10 +34,10 @@ const handleGraphQLTrebuchetRequest = async (
       subscribeGraphQL({docId, query, opId: opId!, variables, connectionContext})
       return
     }
-    try {
-      return tracer.trace('handleGraphQLTrebuchetRequest', async (span) => {
-        const carrier = {}
-        tracer.inject(span!, 'http_headers', carrier)
+    return tracer.trace('handleGraphQLTrebuchetRequest', async (span) => {
+      const carrier = {}
+      tracer.inject(span!, 'http_headers', carrier)
+      try {
         const result = await getGraphQLExecutor().publish({
           docId,
           query,
@@ -55,30 +51,14 @@ const handleGraphQLTrebuchetRequest = async (
         // TODO if multiple results, send GQL_DATA for all but the last
         const messageType = result.data ? 'complete' : 'error'
         return {type: messageType, id: opId, payload: safeResult} as const
-      })
-    } catch (e) {
-      if (e instanceof Error && e.message === 'TIMEOUT') {
-        sendToSentry(new Error('GQL executor took too long to respond'), {
-          userId: getUserId(authToken),
-          tags: {
-            authToken: JSON.stringify(authToken),
-            docId: docId || '',
-            query: query || '',
-            variables: JSON.stringify(variables),
-            socketServerId: SERVER_ID!
-          }
-        })
+      } catch (e) {
         return {
           type: 'error' as const,
           id: opId || '',
           payload: {errors: [{message: 'The request took too long'}]}
         }
       }
-      const viewerId = getUserId(authToken)
-      const error =
-        e instanceof Error ? e : new Error(`GQL executor failed to publish. docId: ${docId}`)
-      sendToSentry(error, {userId: viewerId})
-    }
+    })
   } else if (data.type === 'stop' && opId) {
     relayUnsubscribe(subs, opId)
   }

diff --git a/packages/server/listenHandler.ts b/packages/server/listenHandler.ts
@@ -1,3 +1,4 @@
+import ms from 'ms'
 import {us_listen_socket} from 'uWebSockets.js'
 import getGraphQLExecutor from './utils/getGraphQLExecutor'
 import {Logger} from './utils/Logger'
@@ -10,8 +11,12 @@ const listenHandler = (listenSocket: us_listen_socket) => {
   if (listenSocket) {
     Logger.log(`\n🔥🔥🔥 Server ID: ${SERVER_ID}. Ready for Sockets: Port ${PORT} 🔥🔥🔥`)
     getGraphQLExecutor().subscribe()
-    // Cleaning on startup because shutdowns may be abrupt
-    serverHealthChecker.cleanUserPresence().catch(sendToSentry)
+    setTimeout(() => {
+      // if shutdowns are clean, this isn't necessary
+      // that's why we wait 3 minutes to let all the old servers shut down gracefully
+      serverHealthChecker.cleanUserPresence().catch(sendToSentry)
+      //
+    }, ms('3m'))
   } else {
     Logger.log(`❌❌❌    Port ${PORT} is in use!    ❌❌❌`)
   }

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.25.3",
+  "version": "8.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -126,7 +126,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.53.0",
     "oy-vey": "^0.12.1",
-    "parabol-client": "8.25.3",
+    "parabol-client": "8.25.4",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/packages/server/types/GQLRequest.d.ts b/packages/server/types/GQLRequest.d.ts
@@ -0,0 +1,18 @@
+import type {AuthToken} from '../../client/types/AuthToken'
+
+export interface GQLRequest {
+  authToken: AuthToken
+  ip?: string
+  socketId?: string
+  variables?: {[key: string]: any}
+  docId?: string
+  query?: string
+  rootValue?: {[key: string]: any}
+  dataLoaderId?: string
+  // true if the query is on the private schema
+  isPrivate?: boolean
+  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
+  isAdHoc?: boolean
+  // Datadog opentracing span of the calling server
+  carrier?: any
+}
diff --git a/packages/server/types/custom.d.ts b/packages/server/types/custom.d.ts
@@ -1,7 +1,6 @@
-import {GraphQLSchema} from 'graphql'
+import type {GraphQLSchema} from 'graphql'
 import type nestGitHubEndpoint from 'nest-graphql-endpoint/lib/nestGitHubEndpoint'
 import '../../client/types/reactHTML4'
-import type AuthToken from '../database/types/AuthToken'
 import type ScheduledJobMeetingStageTimeLimit from '../database/types/ScheduledJobMetingStageTimeLimit'
 import type ScheduledTeamLimitsJob from '../database/types/ScheduledTeamLimitsJob'
 export interface OAuth2Success {
@@ -23,23 +22,6 @@ export interface OAuth2Error {
   error_description?: string
   error_uri?: string
 }
-export interface GQLRequest {
-  authToken: AuthToken
-  ip?: string
-  socketId?: string
-  variables?: {[key: string]: any}
-  docId?: string
-  query?: string
-  rootValue?: {[key: string]: any}
-  dataLoaderId?: string
-  // true if the query is on the private schema
-  isPrivate?: boolean
-  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
-  isAdHoc?: boolean
-  // Datadog opentracing span of the calling server
-  carrier?: any
-}
-
 export type ScheduledJobUnion = ScheduledJobMeetingStageTimeLimit | ScheduledTeamLimitsJob
 
 export type RootSchema = GraphQLSchema & {