diff --git a/.dev.vars.example b/.dev.vars.example index aa3f22623d9..5e3ac2ec579 100644 --- a/.dev.vars.example +++ b/.dev.vars.example @@ -18,6 +18,5 @@ MAILGUN_DOMAIN= MAILGUN_SENDING_KEY= # optional -SENTRY_DSN= SLACK_BOT_OAUTH_TOKEN= SLACK_ERROR_CHANNEL_ID=C016H0BNNB1 #bot-testing channel diff --git a/functions/donation/_middleware.ts b/functions/donation/_middleware.ts deleted file mode 100644 index 9135a17cf45..00000000000 --- a/functions/donation/_middleware.ts +++ /dev/null @@ -1,31 +0,0 @@ -import sentryPlugin from "@cloudflare/pages-plugin-sentry" -import { CaptureConsole } from "@sentry/integrations" - -interface SentryEnvVars { - SENTRY_DSN: string - ENV: "production" | "development" -} - -const hasSentryEnvVars = (env: any): env is SentryEnvVars => { - return ( - !!env.SENTRY_DSN && - !!env.ENV && - ["production", "development"].includes(env.ENV) - ) -} - -export const onRequest: PagesFunction = (context) => { - if (!hasSentryEnvVars(context.env)) { - console.error( - "Missing Sentry environment variables. Continuing without error logging..." - ) - // Gracefully continue if Sentry is not configured. - return context.next() - } - - return sentryPlugin({ - dsn: context.env.SENTRY_DSN, - integrations: [new CaptureConsole()], - environment: context.env.ENV, - })(context) -} diff --git a/functions/donation/_utils/error.ts b/functions/donation/_utils/error.ts index 215eeb0b435..6599945c6a1 100644 --- a/functions/donation/_utils/error.ts +++ b/functions/donation/_utils/error.ts @@ -10,7 +10,6 @@ export const logError = async ( filePath: string, env: SlackEnvVars ) => { - // Reporting to Sentry through the CaptureConsole integration in _middleware.ts console.error(error) // Reporting to Slack diff --git a/functions/package.json b/functions/package.json index 7b58e924fd9..ee9979ff2fa 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,7 +1,6 @@ { "name": "owid-functions", "dependencies": { - "@cloudflare/pages-plugin-sentry": "^1.1.1", "@ourworldindata/grapher": "workspace:^", "@ourworldindata/utils": "workspace:^", "itty-router": "^5.0.17", diff --git a/yarn.lock b/yarn.lock index 997919caaf3..df44c84b719 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1551,15 +1551,6 @@ __metadata: languageName: node linkType: hard -"@cloudflare/pages-plugin-sentry@npm:^1.1.1": - version: 1.1.1 - resolution: "@cloudflare/pages-plugin-sentry@npm:1.1.1" - dependencies: - toucan-js: "npm:^3.0.0" - checksum: 10/a9058ac31f662b6f6a2176f92e8befc07d82b28e72c73904600f173aa9ed782953cb0b3cdd82a23e84f6be7ea2c67ae81e377920206825083495c8b66075d582 - languageName: node - linkType: hard - "@cloudflare/workerd-darwin-64@npm:1.20240610.1": version: 1.20240610.1 resolution: "@cloudflare/workerd-darwin-64@npm:1.20240610.1" @@ -3721,44 +3712,6 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/core@npm:7.76.0" - dependencies: - "@sentry/types": "npm:7.76.0" - "@sentry/utils": "npm:7.76.0" - checksum: 10/f6b524036a0bfe875868882d31a822ae71e598a33da1c6bb6ebf62da0520ac2b6dca5e28c70e8fb7570751ae1ebd590fc3c5b5fcc49f857753dcb739bfa7f06e - languageName: node - linkType: hard - -"@sentry/integrations@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/integrations@npm:7.76.0" - dependencies: - "@sentry/core": "npm:7.76.0" - "@sentry/types": "npm:7.76.0" - "@sentry/utils": "npm:7.76.0" - localforage: "npm:^1.8.1" - checksum: 10/8f307c81fd0eec8ee250061a311bc0b5d7f0839a069b6939d0576aee74f9d87cd332e6376d41b75dc4c789aaeedba11087f28e7950f1769884bbf05a3898a3d0 - languageName: node - linkType: hard - -"@sentry/types@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/types@npm:7.76.0" - checksum: 10/67a4cde848be8be534b42608f930da91fcb3e6e9f38843d9fc670d5bd531f7d13f826fb24f0ef6f88f1e3e603e8377ea1412b2fd8097ba641746ad4243b90936 - languageName: node - linkType: hard - -"@sentry/utils@npm:7.76.0": - version: 7.76.0 - resolution: "@sentry/utils@npm:7.76.0" - dependencies: - "@sentry/types": "npm:7.76.0" - checksum: 10/141e40b3ed4da50b2b6ceb11d58e557db34431d0ad8837af21636de5692275e1fddb0b920bb20c9ac2ead67c28a446fc76f451eefd10304a4aea85f9f2b32242 - languageName: node - linkType: hard - "@sigstore/bundle@npm:^1.1.0": version: 1.1.0 resolution: "@sigstore/bundle@npm:1.1.0" @@ -11702,13 +11655,6 @@ __metadata: languageName: node linkType: hard -"immediate@npm:~3.0.5": - version: 3.0.6 - resolution: "immediate@npm:3.0.6" - checksum: 10/f9b3486477555997657f70318cc8d3416159f208bec4cca3ff3442fd266bc23f50f0c9bd8547e1371a6b5e82b821ec9a7044a4f7b944798b25aa3cc6d5e63e62 - languageName: node - linkType: hard - "immutable@npm:^4.0.0, immutable@npm:^4.3.6": version: 4.3.6 resolution: "immutable@npm:4.3.6" @@ -13557,15 +13503,6 @@ __metadata: languageName: node linkType: hard -"lie@npm:3.1.1": - version: 3.1.1 - resolution: "lie@npm:3.1.1" - dependencies: - immediate: "npm:~3.0.5" - checksum: 10/c2c7d9dcc3a9aae641f41cde4e2e2cd571e4426b1f5915862781d77776672dcbca43461e16f4d382c9a300825c15e1a4923f1def3a5568d97577e077a3cecb44 - languageName: node - linkType: hard - "lilconfig@npm:3.0.0": version: 3.0.0 resolution: "lilconfig@npm:3.0.0" @@ -13680,15 +13617,6 @@ __metadata: languageName: node linkType: hard -"localforage@npm:^1.8.1": - version: 1.10.0 - resolution: "localforage@npm:1.10.0" - dependencies: - lie: "npm:3.1.1" - checksum: 10/d5c44be3a09169b013a3ebe252e678aaeb6938ffe72e9e12c199fd4307c1ec9d1a057ac2dfdfbb1379dfeec467a34ad0fc3ecd27489a2c43a154fb72b2822542 - languageName: node - linkType: hard - "locate-path@npm:^2.0.0": version: 2.0.0 resolution: "locate-path@npm:2.0.0" @@ -15511,7 +15439,6 @@ __metadata: version: 0.0.0-use.local resolution: "owid-functions@workspace:functions" dependencies: - "@cloudflare/pages-plugin-sentry": "npm:^1.1.1" "@cloudflare/workers-types": "npm:^4.20240614.0" "@ourworldindata/grapher": "workspace:^" "@ourworldindata/utils": "workspace:^" @@ -19377,18 +19304,6 @@ __metadata: languageName: node linkType: hard -"toucan-js@npm:^3.0.0": - version: 3.3.1 - resolution: "toucan-js@npm:3.3.1" - dependencies: - "@sentry/core": "npm:7.76.0" - "@sentry/integrations": "npm:7.76.0" - "@sentry/types": "npm:7.76.0" - "@sentry/utils": "npm:7.76.0" - checksum: 10/6985980551f68170bca01e932f32b06ec14698bcd661188084cfa741a98a789ac3f5195ec2da3b535b8a254fadc2c8a018f3a334b6788884178a624e337a5179 - languageName: node - linkType: hard - "tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3": version: 4.1.4 resolution: "tough-cookie@npm:4.1.4"