diff --git a/package-lock.json b/package-lock.json index 5a8e18544a..890d826a33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7452,32 +7452,6 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, - "node_modules/@opentelemetry/context-zone": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone/-/context-zone-1.15.2.tgz", - "integrity": "sha512-VdzdaETT7Tm7OXRGLe+I01L0MERR+eMcKK7KLbIyLQFA4ThVWK5TUW+A28jQQ1P0UfHRPw/kub7162yUui5YKw==", - "dev": true, - "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.2", - "zone.js": "^0.11.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@opentelemetry/context-zone-peer-dep": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone-peer-dep/-/context-zone-peer-dep-1.15.2.tgz", - "integrity": "sha512-AEi2rTyLCL6y8jjD33lSQ6tEUMOT4QJH6Ep1RpT56UdkrPQbf60uUSuSx5Ufpms0DNZt2AnFZYShzfYUZmvOJQ==", - "dev": true, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "zone.js": "^0.10.2 || ^0.11.0" - } - }, "node_modules/@opentelemetry/core": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", @@ -8302,24 +8276,6 @@ "@opentelemetry/api": "^1.3.0" } }, - "node_modules/@opentelemetry/instrumentation-xml-http-request": { - "version": "0.41.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.41.2.tgz", - "integrity": "sha512-lRj9JPSVoE/lReUQ8afekoCyEAGdIWNrzF42Kv63cf5CCMqB/aoHH+NdnSXZ5ANsOvNQ9H65qTsqCbwkzn1x6g==", - "dev": true, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/instrumentation": "0.41.2", - "@opentelemetry/sdk-trace-web": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, "node_modules/@opentelemetry/instrumentation/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -8673,23 +8629,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/@opentelemetry/sdk-trace-web": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.15.2.tgz", - "integrity": "sha512-OjCrwtu4b+cAt540wyIr7d0lCA/cY9y42lmYDFUfJ8Ixj2bByIUJ4yyd9M7mXHpQHdiR/Kq2vzsgS14Uj+RU0Q==", - "dev": true, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, "node_modules/@opentelemetry/semantic-conventions": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", @@ -41668,15 +41607,6 @@ "node": ">=0.2.0" } }, - "node_modules/zone.js": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", - "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", - "dev": true, - "dependencies": { - "tslib": "^2.0.0" - } - }, "services/analytics": { "name": "@overleaf/analytics", "dependencies": { @@ -44071,17 +44001,6 @@ "@lezer/highlight": "^1.2.1", "@lezer/lr": "^1.4.2", "@lezer/markdown": "^1.3.2", - "@opentelemetry/api": "^1.4.1", - "@opentelemetry/auto-instrumentations-web": "^0.33.1", - "@opentelemetry/context-zone": "^1.15.2", - "@opentelemetry/exporter-trace-otlp-http": "^0.41.2", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/instrumentation-document-load": "^0.33.1", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.2", - "@opentelemetry/resources": "^1.15.2", - "@opentelemetry/sdk-trace-base": "^1.15.2", - "@opentelemetry/sdk-trace-web": "^1.15.2", - "@opentelemetry/semantic-conventions": "^1.15.2", "@overleaf/codemirror-tree-view": "^0.1.3", "@overleaf/dictionaries": "https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz", "@overleaf/ranges-tracker": "*", @@ -44356,80 +44275,6 @@ "node": ">=12" } }, - "services/web/node_modules/@opentelemetry/auto-instrumentations-web": { - "version": "0.33.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-web/-/auto-instrumentations-web-0.33.1.tgz", - "integrity": "sha512-0Tz4cnFEa49Opm74TTHpwGuwk9geWoYBEQxOGoUYOe8A3qFaEnW9jl69AnyEPfODhfUHcunwbzOjge4r3j2nHg==", - "dev": true, - "dependencies": { - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/instrumentation-document-load": "^0.33.1", - "@opentelemetry/instrumentation-fetch": "^0.41.2", - "@opentelemetry/instrumentation-user-interaction": "^0.33.1", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "services/web/node_modules/@opentelemetry/instrumentation-document-load": { - "version": "0.33.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.33.1.tgz", - "integrity": "sha512-FyLe5i85likVEp36ZewtM8jIZ8/7w55yz9tVoBBJHlTRCVZutff2EhVVCnGHx4etnMvuF+Es8CU2tTsnlCtl5g==", - "dev": true, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/sdk-trace-base": "^1.0.0", - "@opentelemetry/sdk-trace-web": "^1.15.0", - "@opentelemetry/semantic-conventions": "^1.0.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "services/web/node_modules/@opentelemetry/instrumentation-fetch": { - "version": "0.41.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.41.2.tgz", - "integrity": "sha512-L4jx7kq0R5XWAf5YcekSQ3Zm/6PE/+p/6rZe4NdtC+gp9u1lrQ/Vr0lwexxubS1odghbUSFo6PXKrqc25c+2hA==", - "dev": true, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/instrumentation": "0.41.2", - "@opentelemetry/sdk-trace-web": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "services/web/node_modules/@opentelemetry/instrumentation-user-interaction": { - "version": "0.33.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.33.1.tgz", - "integrity": "sha512-2oun4gwWpqtCW+qydC51jqSSUZSOuNCBXOWinTuTmO6w/sd4DJaQ6kEboSx5gENT/56qnCM9jQZlHI+zKbL63w==", - "dev": true, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/sdk-trace-web": "^1.8.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0", - "zone.js": "0.11.4" - } - }, "services/web/node_modules/@overleaf/dictionaries": { "version": "0.0.3", "resolved": "https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz", diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 163794298a..313d259f0b 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -869,7 +869,6 @@ const _ProjectController = { metadata: { viewport: false }, showUpgradePrompt, fixedSizeDocument: true, - useOpenTelemetry: Settings.useOpenTelemetryClient, hasTrackChangesFeature: Features.hasFeature('track-changes'), projectTags, usedLatex: diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug index 9659eeec50..8f24e94906 100644 --- a/services/web/app/views/project/editor/_meta.pug +++ b/services/web/app/views/project/editor/_meta.pug @@ -29,7 +29,6 @@ meta(name="ol-languages" data-type="json" content=languages) meta(name="ol-editorThemes" data-type="json" content=editorThemes) meta(name="ol-legacyEditorThemes" data-type="json" content=legacyEditorThemes) meta(name="ol-showUpgradePrompt" data-type="boolean" content=showUpgradePrompt) -meta(name="ol-useOpenTelemetry" data-type="boolean" content=useOpenTelemetry) meta(name="ol-showSupport", data-type="boolean" content=showSupport) meta(name="ol-showTemplatesServerPro", data-type="boolean" content=showTemplatesServerPro) meta(name="ol-hasTrackChangesFeature", data-type="boolean" content=hasTrackChangesFeature) diff --git a/services/web/app/views/project/ide-react.pug b/services/web/app/views/project/ide-react.pug index 09690b9140..a16345bbe9 100644 --- a/services/web/app/views/project/ide-react.pug +++ b/services/web/app/views/project/ide-react.pug @@ -26,6 +26,4 @@ block append meta include editor/_meta block prepend foot-scripts - each file in (useOpenTelemetry ? entrypointScripts("tracing") : []) - script(type="text/javascript", nonce=scriptNonce, src=file, defer=deferScripts) script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js', defer=deferScripts) diff --git a/services/web/frontend/js/tracing.js b/services/web/frontend/js/tracing.js deleted file mode 100644 index fed6d5c91b..0000000000 --- a/services/web/frontend/js/tracing.js +++ /dev/null @@ -1,37 +0,0 @@ -import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base' -import { Resource } from '@opentelemetry/resources' -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions' -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http/build/esnext' -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web' -import { ZoneContextManager } from '@opentelemetry/context-zone' -import { registerInstrumentations } from '@opentelemetry/instrumentation' -import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web' - -import getMeta from './utils/meta' - -if (getMeta('ol-useOpenTelemetry')) { - const resource = new Resource({ - [SemanticResourceAttributes.SERVICE_NAME]: 'frontend', - [SemanticResourceAttributes.SERVICE_NAMESPACE]: 'Overleaf', - }) - - const provider = new WebTracerProvider({ resource }) - - provider.addSpanProcessor( - new SimpleSpanProcessor( - new OTLPTraceExporter({ - url: `https://${window.location.hostname}/otlp/v1/traces`, - }) - ) - ) - - provider.register({ - // Changing default contextManager to use ZoneContextManager - supports asynchronous operations - optional - contextManager: new ZoneContextManager(), - }) - - // Registering instrumentations - registerInstrumentations({ - instrumentations: [getWebAutoInstrumentations()], - }) -} diff --git a/services/web/package.json b/services/web/package.json index d1bb5ddd91..3eaccf0fff 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -194,17 +194,6 @@ "@lezer/highlight": "^1.2.1", "@lezer/lr": "^1.4.2", "@lezer/markdown": "^1.3.2", - "@opentelemetry/api": "^1.4.1", - "@opentelemetry/auto-instrumentations-web": "^0.33.1", - "@opentelemetry/context-zone": "^1.15.2", - "@opentelemetry/exporter-trace-otlp-http": "^0.41.2", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/instrumentation-document-load": "^0.33.1", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.2", - "@opentelemetry/resources": "^1.15.2", - "@opentelemetry/sdk-trace-base": "^1.15.2", - "@opentelemetry/sdk-trace-web": "^1.15.2", - "@opentelemetry/semantic-conventions": "^1.15.2", "@overleaf/codemirror-tree-view": "^0.1.3", "@overleaf/dictionaries": "https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz", "@overleaf/ranges-tracker": "*", diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js index 72fa660589..deb480ca36 100644 --- a/services/web/webpack.config.js +++ b/services/web/webpack.config.js @@ -16,7 +16,6 @@ invalidateBabelCacheIfNeeded() // Generate a hash of entry points, including modules const entryPoints = { - tracing: './frontend/js/tracing.js', 'bootstrap-3': './frontend/js/bootstrap-3.ts', 'bootstrap-5': './frontend/js/bootstrap-5.ts', devToolbar: './frontend/js/dev-toolbar.ts',