Merge pull request #14869 from overleaf/revert-14603-td-upgrade-semver

Revert "Upgrade semver"

GitOrigin-RevId: 176399bbb91706e12aacba7ec9370093d8b957b5

libraries/metrics/package.json

@@ -7,16 +7,18 @@
     "url": "https://github.com/overleaf/metrics-module.git"
   },
   "dependencies": {
-    "@google-cloud/debug-agent": "^8.0.0",
-    "@google-cloud/opentelemetry-cloud-trace-exporter": "^2.1.0",
-    "@google-cloud/profiler": "^6.0.0",
-    "@google-cloud/trace-agent": "^7.1.2",
-    "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/auto-instrumentations-node": "^0.39.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.41.2",
-    "@opentelemetry/resources": "^1.15.2",
-    "@opentelemetry/sdk-node": "^0.41.2",
-    "@opentelemetry/semantic-conventions": "^1.15.2",
+    "@google-cloud/debug-agent": "^5.1.2",
+    "@google-cloud/opentelemetry-cloud-trace-exporter": "^1.1.0",
+    "@google-cloud/profiler": "^5.0.5",
+    "@google-cloud/trace-agent": "^5.1.1",
+    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/auto-instrumentations-node": "^0.28.0",
+    "@opentelemetry/exporter-collector": "^0.25.0",
+    "@opentelemetry/exporter-jaeger": "^1.2.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.28.0",
+    "@opentelemetry/resources": "^1.2.0",
+    "@opentelemetry/sdk-node": "^0.28.0",
+    "@opentelemetry/semantic-conventions": "^1.2.0",
     "compression": "^1.7.4",
     "prom-client": "^14.1.1",
     "yn": "^3.1.1"

libraries/metrics/tracing.js

@@ -15,9 +15,7 @@ function initialize(appName) {
     DiagLogLevel,
     trace,
   } = require('@opentelemetry/api')
-  const {
-    OTLPTraceExporter,
-  } = require('@opentelemetry/exporter-trace-otlp-http')
+  const { JaegerExporter } = require('@opentelemetry/exporter-jaeger')
   const { Resource } = require('@opentelemetry/resources')
   const {
     SemanticResourceAttributes,
@@ -36,9 +34,7 @@ function initialize(appName) {
   if (process.env.GCP_OPENTELEMETRY) {
     exporter = new GCP.TraceExporter()
   } else if (process.env.JAEGER_OPENTELEMETRY) {
-    exporter = new OTLPTraceExporter({
-      url: `http://${process.env.JAEGER_HOST || 'jaeger'}:4318/v1/traces`,
-    })
+    exporter = new JaegerExporter({ host: process.env.JAEGER_HOST || 'jaeger' })
   } else {
     return
   }

package.json

@@ -15,7 +15,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
-    "nodemon": "^3.0.1",
+    "nodemon": "^2.0.16",
     "prettier": "2.5.1"
   },
   "scripts": {

services/web/package.json

@@ -188,17 +188,18 @@
     "@lezer/highlight": "^1.1.6",
     "@lezer/lr": "^1.3.9",
     "@lezer/markdown": "^1.1.0",
-    "@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",
+    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/auto-instrumentations-web": "^0.27.2",
+    "@opentelemetry/context-zone": "^1.2.0",
+    "@opentelemetry/exporter-jaeger": "^1.2.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.28.0",
+    "@opentelemetry/instrumentation": "^0.27.0",
+    "@opentelemetry/instrumentation-document-load": "^0.27.1",
+    "@opentelemetry/instrumentation-xml-http-request": "^0.28.0",
+    "@opentelemetry/resources": "^1.2.0",
+    "@opentelemetry/sdk-trace-base": "^1.2.0",
+    "@opentelemetry/sdk-trace-web": "^1.2.0",
+    "@opentelemetry/semantic-conventions": "^1.2.0",
     "@overleaf/ranges-tracker": "*",
     "@overleaf/stream-utils": "*",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",