update sentry

src/apollo.ts

@@ -1,4 +1,3 @@
-import * as Sentry from '@sentry/node'
 import { ApolloServer, type BaseContext } from '@apollo/server'
 import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer'
 import { expressMiddleware, type ExpressContextFunctionArgument } from '@apollo/server/express4'
@@ -9,10 +8,9 @@ import { makeExecutableSchema } from '@graphql-tools/schema'
 import type { Logger } from 'pino'
 import type { Server } from 'http'
 
-import { GCP_PROJECT, SENTRY_DSN } from './config'
+import { GCP_PROJECT } from './config'
 import typeDefs from './schema'
 import { rootResolver as resolvers } from './resolvers/rootResolver'
-import sentryPlugin from './plugins/sentry'
 import loggingPlugin from './plugins/logging'
 import {
   type CategoryDataSource,
@@ -49,18 +47,6 @@ export async function initApollo (httpServer: Server) {
     loggingPlugin
   ]
 
-  if (SENTRY_DSN) {
-    logger.info('Sentry enabled')
-    Sentry.init({
-      dsn: SENTRY_DSN,
-      integrations: [
-        new Sentry.Integrations.Http({ tracing: true })
-      ],
-      tracesSampleRate: 1.0
-    })
-    plugins.push(sentryPlugin)
-  }
-
   const schema = makeExecutableSchema({ typeDefs, resolvers })
   const cache = new InMemoryLRUCache()
 

src/index.ts

@@ -1,10 +1,12 @@
+import './instrument'
 import { PORT } from './config'
 import { initApollo } from './apollo'
 import { logger } from './services/logger'
 import express from 'express'
 import cors from 'cors'
 import http from 'http'
 import bodyParser from 'body-parser'
+import { setupExpressErrorHandler } from '@sentry/node'
 
 const app = express()
 const httpServer = http.createServer(app)
@@ -29,6 +31,8 @@ initApollo(httpServer).then(async middleware => {
   app.use('/graphql', bodyParser.json(), middleware)
   app.use('/.well-known/apollo/server-health', (req, res) => { res.status(200).json({ status: 'pass' }) })
 
+  setupExpressErrorHandler(app)
+
   await new Promise<void>(resolve => httpServer.listen({ port: PORT }, resolve))
   logger.info(`Server ready at http://localhost:${PORT}`)
 })