diff --git a/lib/http-routes/api/create-call.js b/lib/http-routes/api/create-call.js index a30ed5ac..7f93b162 100644 --- a/lib/http-routes/api/create-call.js +++ b/lib/http-routes/api/create-call.js @@ -150,7 +150,7 @@ router.post('/', async(req, res) => { /* ok our outbound INVITE is in flight */ const tasks = [restDial]; - const rootSpan = new RootSpan('rest-call', req); + const rootSpan = new RootSpan('rest-call', inviteReq); const callInfo = new CallInfo({ direction: CallDirection.Outbound, req: inviteReq, diff --git a/package-lock.json b/package-lock.json index 7c448411..6994d11c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@opentelemetry/instrumentation-express": "^0.28.0", "@opentelemetry/instrumentation-http": "^0.27.0", "@opentelemetry/instrumentation-pino": "^0.28.1", + "@opentelemetry/propagator-b3": "^1.0.0", "@opentelemetry/resources": "^1.1.0", "@opentelemetry/sdk-trace-base": "^1.1.0", "@opentelemetry/sdk-trace-node": "^1.1.0", @@ -932,17 +933,54 @@ } }, "node_modules/@opentelemetry/propagator-b3": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz", - "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.0.0.tgz", + "integrity": "sha512-KKHUltvvlcxUTyWPPhXi6J7ipUy+bj3zQ8psfhEsdhYM568RimmS5IcZNJMNVCMiuWOdamn5hRBmCNLmn+rFxg==", "dependencies": { - "@opentelemetry/core": "1.1.0" + "@opentelemetry/core": "1.0.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.2.0" + "@opentelemetry/api": "^1.0.2" + } + }, + "node_modules/@opentelemetry/propagator-b3/node_modules/@opentelemetry/core": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.0.0.tgz", + "integrity": "sha512-1+qvKilADnSFW4PiXy+f7D22pvfGVxepZ69GcbF8cTcbQTUt7w63xEBWn5f5j92x9I3c0sqbW1RUx5/a4wgzxA==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": ">=8.5.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.2" + } + }, + "node_modules/@opentelemetry/propagator-b3/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.0.tgz", + "integrity": "sha512-XCZ6ZSmc8FOspxKUU+Ow9UtJeSSRcS5rFBYGpjzix02U2v+X9ofjOjgNRnpvxlSvkccYIhdTuwcvNskmZ46SeA==", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@opentelemetry/propagator-b3/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/@opentelemetry/propagator-jaeger": { @@ -1089,6 +1127,20 @@ "@opentelemetry/api": ">=1.1.0 <1.2.0" } }, + "node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/propagator-b3": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz", + "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==", + "dependencies": { + "@opentelemetry/core": "1.1.0" + }, + "engines": { + "node": ">=8.0.0" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.2.0" + } + }, "node_modules/@opentelemetry/sdk-trace-node/node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -6987,11 +7039,35 @@ } }, "@opentelemetry/propagator-b3": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz", - "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.0.0.tgz", + "integrity": "sha512-KKHUltvvlcxUTyWPPhXi6J7ipUy+bj3zQ8psfhEsdhYM568RimmS5IcZNJMNVCMiuWOdamn5hRBmCNLmn+rFxg==", "requires": { - "@opentelemetry/core": "1.1.0" + "@opentelemetry/core": "1.0.0" + }, + "dependencies": { + "@opentelemetry/core": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.0.0.tgz", + "integrity": "sha512-1+qvKilADnSFW4PiXy+f7D22pvfGVxepZ69GcbF8cTcbQTUt7w63xEBWn5f5j92x9I3c0sqbW1RUx5/a4wgzxA==", + "requires": { + "@opentelemetry/semantic-conventions": "1.0.0", + "semver": "^7.3.5" + } + }, + "@opentelemetry/semantic-conventions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.0.tgz", + "integrity": "sha512-XCZ6ZSmc8FOspxKUU+Ow9UtJeSSRcS5rFBYGpjzix02U2v+X9ofjOjgNRnpvxlSvkccYIhdTuwcvNskmZ46SeA==" + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "@opentelemetry/propagator-jaeger": { @@ -7084,6 +7160,14 @@ "semver": "^7.3.5" }, "dependencies": { + "@opentelemetry/propagator-b3": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.1.0.tgz", + "integrity": "sha512-UkqE7H4T8JY55JqGi+FVjbNk8SakSm/yRfBDcmF8Zsg+RA5wwxzgfPRwHeFNQg2RjYUW5UeOH/1eUneEqLA0OA==", + "requires": { + "@opentelemetry/core": "1.1.0" + } + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", diff --git a/package.json b/package.json index caf9a72b..865e3dae 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "@opentelemetry/instrumentation-express": "^0.28.0", "@opentelemetry/instrumentation-http": "^0.27.0", "@opentelemetry/instrumentation-pino": "^0.28.1", + "@opentelemetry/propagator-b3": "^1.0.0", "@opentelemetry/resources": "^1.1.0", "@opentelemetry/sdk-trace-base": "^1.1.0", "@opentelemetry/sdk-trace-node": "^1.1.0",