diff --git a/apps/scandic-web/env/server.ts b/apps/scandic-web/env/server.ts index 545725c9f..b2b924c9b 100644 --- a/apps/scandic-web/env/server.ts +++ b/apps/scandic-web/env/server.ts @@ -9,7 +9,6 @@ export const env = createEnv({ */ isServer: typeof window === "undefined" || "Deno" in window, server: { - APPLICATION_INSIGHTS_CONNECTION_STRING: z.string().optional(), ADOBE_SCRIPT_SRC: z.string().optional(), ADOBE_SDK_SCRIPT_SRC: z.string().optional(), ENABLE_GTMSCRIPT: z @@ -168,8 +167,6 @@ export const env = createEnv({ }, emptyStringAsUndefined: true, runtimeEnv: { - APPLICATION_INSIGHTS_CONNECTION_STRING: - process.env.APPLICATION_INSIGHTS_CONNECTION_STRING, ADOBE_SCRIPT_SRC: process.env.ADOBE_SCRIPT_SRC, ADOBE_SDK_SCRIPT_SRC: process.env.ADOBE_SDK_SCRIPT_SRC, ENABLE_GTMSCRIPT: process.env.ENABLE_GTMSCRIPT, diff --git a/apps/scandic-web/instrumentation.ts b/apps/scandic-web/instrumentation.ts index 4fab6c5d5..460b35f53 100644 --- a/apps/scandic-web/instrumentation.ts +++ b/apps/scandic-web/instrumentation.ts @@ -2,50 +2,12 @@ import * as Sentry from "@sentry/nextjs" import { isEdge } from "@scandic-hotels/common/utils/isEdge" -import { env } from "./env/server" - export async function register() { - /* - Order matters! - - Sentry hooks into OpenTelemetry, modifying its behavior. - Application Insights relies on OpenTelemetry exporters, - and these may not work correctly if Sentry has already altered the instrumentation pipeline. - */ - await configureApplicationInsights() await configureSentry() } export const onRequestError = Sentry.captureRequestError -async function configureApplicationInsights() { - if ( - process.env.NEXT_RUNTIME === "nodejs" && - env.APPLICATION_INSIGHTS_CONNECTION_STRING - ) { - const { AzureMonitorTraceExporter, AzureMonitorMetricExporter } = - await import("@azure/monitor-opentelemetry-exporter") - const { registerOTel } = await import("@vercel/otel") - const { PeriodicExportingMetricReader } = await import( - "@opentelemetry/sdk-metrics" - ) - const connectionString: string = env.APPLICATION_INSIGHTS_CONNECTION_STRING - const traceExporter = new AzureMonitorTraceExporter({ connectionString }) - const azureMetricExporter = new AzureMonitorMetricExporter({ - connectionString, - }) - const azureMetricReader = new PeriodicExportingMetricReader({ - exporter: azureMetricExporter, - exportIntervalMillis: 10000, - }) - registerOTel({ - serviceName: "scandic-web", - traceExporter, - metricReader: azureMetricReader, - }) - } -} - async function configureSentry() { if (isEdge) { await import("./sentry.edge.config") diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json index 431a67d77..3ff6a4324 100644 --- a/apps/scandic-web/package.json +++ b/apps/scandic-web/package.json @@ -22,7 +22,6 @@ "check-types": "tsc --noEmit" }, "dependencies": { - "@azure/monitor-opentelemetry-exporter": "^1.0.0-beta.31", "@contentstack/live-preview-utils": "^3.2.1", "@formatjs/intl": "^3.1.6", "@hookform/error-message": "^2.0.1", @@ -36,7 +35,6 @@ "@opentelemetry/instrumentation": "^0.56.0", "@opentelemetry/resources": "^1.29.0", "@opentelemetry/sdk-logs": "^0.56.0", - "@opentelemetry/sdk-metrics": "^1.25.1", "@opentelemetry/sdk-trace-base": "^1.29.0", "@radix-ui/react-slot": "^1.2.2", "@react-aria/ssr": "^3.9.8", @@ -57,7 +55,6 @@ "@tsparticles/confetti": "^3.8.1", "@types/geojson": "^7946.0.16", "@types/supercluster": "^7.1.3", - "@vercel/otel": "^1.12.0", "@vis.gl/react-google-maps": "^1.5.2", "class-variance-authority": "^0.7.1", "contentstack": "^3.25.3", diff --git a/yarn.lock b/yarn.lock index e25976004..7caa5cfc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -158,104 +158,6 @@ __metadata: languageName: node linkType: hard -"@azure/abort-controller@npm:^2.0.0": - version: 2.1.2 - resolution: "@azure/abort-controller@npm:2.1.2" - dependencies: - tslib: "npm:^2.6.2" - checksum: 10c0/3771b6820e33ebb56e79c7c68e2288296b8c2529556fbd29cf4cf2fbff7776e7ce1120072972d8df9f1bf50e2c3224d71a7565362b589595563f710b8c3d7b79 - languageName: node - linkType: hard - -"@azure/core-auth@npm:^1.4.0, @azure/core-auth@npm:^1.8.0, @azure/core-auth@npm:^1.9.0": - version: 1.9.0 - resolution: "@azure/core-auth@npm:1.9.0" - dependencies: - "@azure/abort-controller": "npm:^2.0.0" - "@azure/core-util": "npm:^1.11.0" - tslib: "npm:^2.6.2" - checksum: 10c0/b7d8f33b81a8c9a76531acacc7af63d888429f0d763bb1ab8e28e91ddbf1626fc19cf8ca74f79c39b0a3e5acb315bdc4c4276fb979816f315712ea1bd611273d - languageName: node - linkType: hard - -"@azure/core-client@npm:^1.9.2": - version: 1.9.4 - resolution: "@azure/core-client@npm:1.9.4" - dependencies: - "@azure/abort-controller": "npm:^2.0.0" - "@azure/core-auth": "npm:^1.4.0" - "@azure/core-rest-pipeline": "npm:^1.20.0" - "@azure/core-tracing": "npm:^1.0.0" - "@azure/core-util": "npm:^1.6.1" - "@azure/logger": "npm:^1.0.0" - tslib: "npm:^2.6.2" - checksum: 10c0/c38c494c0bf085a89720d97c5bfc098cd1a2bbc5b9c41f8c32ecf2f3b81b476af1afe2f0d996d7e23900581415306e59280d507410bf0aa80804e0e411b8a2be - languageName: node - linkType: hard - -"@azure/core-rest-pipeline@npm:^1.19.0, @azure/core-rest-pipeline@npm:^1.20.0": - version: 1.20.0 - resolution: "@azure/core-rest-pipeline@npm:1.20.0" - dependencies: - "@azure/abort-controller": "npm:^2.0.0" - "@azure/core-auth": "npm:^1.8.0" - "@azure/core-tracing": "npm:^1.0.1" - "@azure/core-util": "npm:^1.11.0" - "@azure/logger": "npm:^1.0.0" - "@typespec/ts-http-runtime": "npm:^0.2.2" - tslib: "npm:^2.6.2" - checksum: 10c0/d82094805fad3ef7b5c2646c21e3fc62ff9534806bfc9840a9439244800cdb3ea7e539f40f5077e7c4db2656f882d8a56ea736e81167ee39dd9f426919fe72f2 - languageName: node - linkType: hard - -"@azure/core-tracing@npm:^1.0.0, @azure/core-tracing@npm:^1.0.1": - version: 1.2.0 - resolution: "@azure/core-tracing@npm:1.2.0" - dependencies: - tslib: "npm:^2.6.2" - checksum: 10c0/7cd114b3c11730a1b8b71d89b64f9d033dfe0710f2364ef65645683381e2701173c08ff8625a0b0bc65bb3c3e0de46c80fdb2735e37652425489b65a283f043d - languageName: node - linkType: hard - -"@azure/core-util@npm:^1.11.0, @azure/core-util@npm:^1.6.1": - version: 1.11.0 - resolution: "@azure/core-util@npm:1.11.0" - dependencies: - "@azure/abort-controller": "npm:^2.0.0" - tslib: "npm:^2.6.2" - checksum: 10c0/245c93ec7fb3f2cb3a0b2f3a3be8d02ee401acba3cdd71620aa9e4e3ca50d831849f692332327bdbe1238ab979a76218f16a5166488ee31d5b67004298d110a3 - languageName: node - linkType: hard - -"@azure/logger@npm:^1.0.0": - version: 1.1.4 - resolution: "@azure/logger@npm:1.1.4" - dependencies: - tslib: "npm:^2.6.2" - checksum: 10c0/5bc7792ef334e18f4893814e83cc61780a0effb927ba898095c75df1a01e1f3093dc7a63b6de549694cef76c25f43db850b82a48ec0fab5f9f1c1d2053af791d - languageName: node - linkType: hard - -"@azure/monitor-opentelemetry-exporter@npm:^1.0.0-beta.31": - version: 1.0.0-beta.31 - resolution: "@azure/monitor-opentelemetry-exporter@npm:1.0.0-beta.31" - dependencies: - "@azure/core-auth": "npm:^1.9.0" - "@azure/core-client": "npm:^1.9.2" - "@azure/core-rest-pipeline": "npm:^1.19.0" - "@opentelemetry/api": "npm:^1.9.0" - "@opentelemetry/api-logs": "npm:^0.57.2" - "@opentelemetry/core": "npm:^1.30.1" - "@opentelemetry/resources": "npm:^1.30.1" - "@opentelemetry/sdk-logs": "npm:^0.57.2" - "@opentelemetry/sdk-metrics": "npm:^1.30.1" - "@opentelemetry/sdk-trace-base": "npm:^1.30.1" - "@opentelemetry/semantic-conventions": "npm:^1.30.0" - tslib: "npm:^2.8.1" - checksum: 10c0/8c00d851518d57f695e78e42542a2f1c971015d2e6a05045742d83c1c806119179d2b44ee05bdd12e1e36be016064e00f728a1c3ddb11a18408b2f18be177064 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.27.1": version: 7.27.1 resolution: "@babel/code-frame@npm:7.27.1" @@ -2943,7 +2845,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api-logs@npm:0.57.2, @opentelemetry/api-logs@npm:^0.57.2": +"@opentelemetry/api-logs@npm:0.57.2": version: 0.57.2 resolution: "@opentelemetry/api-logs@npm:0.57.2" dependencies: @@ -3681,31 +3583,6 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/sdk-logs@npm:^0.57.2": - version: 0.57.2 - resolution: "@opentelemetry/sdk-logs@npm:0.57.2" - dependencies: - "@opentelemetry/api-logs": "npm:0.57.2" - "@opentelemetry/core": "npm:1.30.1" - "@opentelemetry/resources": "npm:1.30.1" - peerDependencies: - "@opentelemetry/api": ">=1.4.0 <1.10.0" - checksum: 10c0/dda61cf656a93d2f5ef1ca0495db59bfa33efc8ca7ee11018850a9ff78ee0459fb0393e70be7ae5d3cd084e0652d36fbf5778c7b3e9028c6668f9bf0d6c9473e - languageName: node - linkType: hard - -"@opentelemetry/sdk-metrics@npm:^1.25.1, @opentelemetry/sdk-metrics@npm:^1.30.1": - version: 1.30.1 - resolution: "@opentelemetry/sdk-metrics@npm:1.30.1" - dependencies: - "@opentelemetry/core": "npm:1.30.1" - "@opentelemetry/resources": "npm:1.30.1" - peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.10.0" - checksum: 10c0/7e60178e61eaf49db5d74f6c3701706762d71d370044253c72bb5668dba3a435030ed6847605ee55d0e1b8908ad123a2517b5f00415a2fb3d98468a0a318e3c0 - languageName: node - linkType: hard - "@opentelemetry/sdk-trace-base@npm:^1.22, @opentelemetry/sdk-trace-base@npm:^1.29.0, @opentelemetry/sdk-trace-base@npm:^1.30.1": version: 1.30.1 resolution: "@opentelemetry/sdk-trace-base@npm:1.30.1" @@ -6263,7 +6140,6 @@ __metadata: version: 0.0.0-use.local resolution: "@scandic-hotels/scandic-web@workspace:apps/scandic-web" dependencies: - "@azure/monitor-opentelemetry-exporter": "npm:^1.0.0-beta.31" "@contentstack/live-preview-utils": "npm:^3.2.1" "@eslint/compat": "npm:^1.2.9" "@eslint/eslintrc": "npm:^3.3.1" @@ -6282,7 +6158,6 @@ __metadata: "@opentelemetry/instrumentation": "npm:^0.56.0" "@opentelemetry/resources": "npm:^1.29.0" "@opentelemetry/sdk-logs": "npm:^0.56.0" - "@opentelemetry/sdk-metrics": "npm:^1.25.1" "@opentelemetry/sdk-trace-base": "npm:^1.29.0" "@radix-ui/react-slot": "npm:^1.2.2" "@react-aria/ssr": "npm:^3.9.8" @@ -6317,7 +6192,6 @@ __metadata: "@types/supercluster": "npm:^7.1.3" "@typescript-eslint/eslint-plugin": "npm:^8.32.0" "@typescript-eslint/parser": "npm:^8.32.0" - "@vercel/otel": "npm:^1.12.0" "@vis.gl/react-google-maps": "npm:^1.5.2" "@vitejs/plugin-react": "npm:^5.0.0" adm-zip: "npm:^0.5.16" @@ -8347,17 +8221,6 @@ __metadata: languageName: node linkType: hard -"@typespec/ts-http-runtime@npm:^0.2.2": - version: 0.2.2 - resolution: "@typespec/ts-http-runtime@npm:0.2.2" - dependencies: - http-proxy-agent: "npm:^7.0.0" - https-proxy-agent: "npm:^7.0.0" - tslib: "npm:^2.6.2" - checksum: 10c0/0f7d633f9885bd7fb065b205887eb6a85639c37ef2d4b50a1b55cee3ef7ad270dcf4757db0882a39157624e8888c6f1f29aaf4c163403c91e75a4b646d362c49 - languageName: node - linkType: hard - "@unhead/schema@npm:^1.11.11, @unhead/schema@npm:^1.9.5": version: 1.11.20 resolution: "@unhead/schema@npm:1.11.20" @@ -8368,21 +8231,6 @@ __metadata: languageName: node linkType: hard -"@vercel/otel@npm:^1.12.0": - version: 1.12.0 - resolution: "@vercel/otel@npm:1.12.0" - peerDependencies: - "@opentelemetry/api": ^1.7.0 - "@opentelemetry/api-logs": "*" - "@opentelemetry/instrumentation": "*" - "@opentelemetry/resources": ^1.19.0 - "@opentelemetry/sdk-logs": "*" - "@opentelemetry/sdk-metrics": ^1.19.0 - "@opentelemetry/sdk-trace-base": ^1.19.0 - checksum: 10c0/37ad87c02c22e32b0c8b5573564923853824a8842858c7e7ac66ecb4695ed78f0fb023125420505d861181cce65671da0a214f81faee3ae14a58b3f3699edf63 - languageName: node - linkType: hard - "@vis.gl/react-google-maps@npm:^1.5.2": version: 1.5.2 resolution: "@vis.gl/react-google-maps@npm:1.5.2" @@ -13156,7 +13004,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.6": +"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.6": version: 7.0.6 resolution: "https-proxy-agent@npm:7.0.6" dependencies: @@ -19558,7 +19406,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2, tslib@npm:^2.8.0, tslib@npm:^2.8.1": +"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2, tslib@npm:^2.8.0": version: 2.8.1 resolution: "tslib@npm:2.8.1" checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62