github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Restore "Upgrade semver"

GitOrigin-RevId: 6eb5fcd3a5489d5f3968e1da2ab11341aba7d63b
This commit is contained in:
Tim Down 2023-09-20 12:43:53 +01:00 committed by Copybot
parent 1234534a7f
commit 994fcd68e2
5 changed files with 9122 additions and 6047 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/metrics/package.json
View file

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

8
libraries/metrics/tracing.js
View file

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

15068
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

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

23
services/web/package.json
View file

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