From 6f496c69e3f61e97bd71a25c808d4d094e2f9ca5 Mon Sep 17 00:00:00 2001 From: Hector Hernandez <39923391+hectorhdzg@users.noreply.github.com> Date: Mon, 12 Jul 2021 10:28:33 -0700 Subject: [PATCH] Updating to latest Azure SDK and OpenTelemetry dependencies (#790) * Updating to latest Azure SDK and OpenTelemetry dependencies * diagnostic-channel-publishers need to be updated as well, will update package.lock.json once is published * Trigger build * lock --- AutoCollection/AsyncHooksScopeManager.ts | 7 +- .../diagnostic-channel/SpanParser.ts | 2 +- .../azure-coretracing.sub.ts | 2 +- package-lock.json | 91 ++++++++----------- package.json | 8 +- 5 files changed, 49 insertions(+), 61 deletions(-) diff --git a/AutoCollection/AsyncHooksScopeManager.ts b/AutoCollection/AsyncHooksScopeManager.ts index 92334bba..a3a27468 100644 --- a/AutoCollection/AsyncHooksScopeManager.ts +++ b/AutoCollection/AsyncHooksScopeManager.ts @@ -21,7 +21,6 @@ export class OpenTelemetryScopeManagerWrapper { if (key === this._activeSymbol) { return context; } - return false; }, setValue: () => { } @@ -55,10 +54,10 @@ export class OpenTelemetryScopeManagerWrapper { } private static _spanToContext(span: Span, parentSpanId?: string, name?: string): CorrelationContext { - const _parentId = parentSpanId ? `|${span.context().traceId}.${parentSpanId}.` : span.context().traceId; + const _parentId = parentSpanId ? `|${span.spanContext().traceId}.${parentSpanId}.` : span.spanContext().traceId; const context: SpanContext = { - ...span.context(), - traceFlags: span.context().traceFlags + ...span.spanContext(), + traceFlags: span.spanContext().traceFlags }; const correlationContext = CorrelationContextManager.spanToContextObject(context, _parentId, name) return correlationContext; diff --git a/AutoCollection/diagnostic-channel/SpanParser.ts b/AutoCollection/diagnostic-channel/SpanParser.ts index a6a60ff7..348b391f 100644 --- a/AutoCollection/diagnostic-channel/SpanParser.ts +++ b/AutoCollection/diagnostic-channel/SpanParser.ts @@ -14,7 +14,7 @@ function filterSpanAttributes(attributes: SpanAttributes) { } export function spanToTelemetryContract(span: Span): (Contracts.DependencyTelemetry & Contracts.RequestTelemetry) & Contracts.Identified { - const id = `|${span.context().traceId}.${span.context().spanId}.`; + const id = `|${span.spanContext().traceId}.${span.spanContext().spanId}.`; const duration = Math.round(span["_duration"][0] * 1e3 + span["_duration"][1] / 1e6); let peerAddress = span.attributes["peer.address"] ? span.attributes["peer.address"].toString() : ""; let component = span.attributes["component"] ? span.attributes["component"].toString() : ""; diff --git a/AutoCollection/diagnostic-channel/azure-coretracing.sub.ts b/AutoCollection/diagnostic-channel/azure-coretracing.sub.ts index c881a96f..50965563 100644 --- a/AutoCollection/diagnostic-channel/azure-coretracing.sub.ts +++ b/AutoCollection/diagnostic-channel/azure-coretracing.sub.ts @@ -15,7 +15,7 @@ let clients: TelemetryClient[] = []; export const subscriber = (event: IStandardEvent) => { const span = event.data; const telemetry = SpanParser.spanToTelemetryContract(span); - const spanContext = span.context(); + const spanContext = span.spanContext(); const traceparent = new Traceparent(); traceparent.traceId = spanContext.traceId; traceparent.spanId = spanContext.spanId; diff --git a/package-lock.json b/package-lock.json index 87974eec..167a3f7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,23 +18,23 @@ "integrity": "sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==" }, "@azure/core-auth": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.0.tgz", - "integrity": "sha512-kSDSZBL6c0CYdhb+7KuutnKGf2geeT+bCJAgccB0DD7wmNJSsQPcF7TcuoZX83B7VK4tLz/u+8sOO/CnCsYp8A==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz", + "integrity": "sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==", "requires": { "@azure/abort-controller": "^1.0.0", - "tslib": "^2.0.0" + "tslib": "^2.2.0" } }, "@azure/core-http": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-1.2.6.tgz", - "integrity": "sha512-odtH7UMKtekc5YQ86xg9GlVHNXR6pq2JgJ5FBo7/jbOjNGdBqcrIVrZx2bevXVJz/uUTSx6vUf62gzTXTfqYSQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.0.0.tgz", + "integrity": "sha512-VBOfUh0z9ZF1WVqrLCtiGWMjkKic171p6mLXRkJKu+p5wuQTb4cU3bPq7nB6UuGAK17LI7hnU0SzydlCQrBuOw==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-asynciterator-polyfill": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "@types/node-fetch": "^2.5.0", "@types/tunnel": "^0.0.1", @@ -49,20 +49,12 @@ } }, "@azure/core-tracing": { - "version": "1.0.0-preview.11", - "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.11.tgz", - "integrity": "sha512-frF0pJc9HTmKncVokhBxCqipjbql02DThQ1ZJ9wLi7SDMLdPAFyDI5xZNzX5guLz+/DtPkY+SGK2li9FIXqshQ==", + "version": "1.0.0-preview.12", + "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz", + "integrity": "sha512-nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg==", "requires": { - "@opencensus/web-types": "0.0.7", - "@opentelemetry/api": "1.0.0-rc.0", - "tslib": "^2.0.0" - }, - "dependencies": { - "@opentelemetry/api": { - "version": "1.0.0-rc.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.0-rc.0.tgz", - "integrity": "sha512-iXKByCMfrlO5S6Oh97BuM56tM2cIBB0XsL/vWF/AtJrJEKx4MC/Xdu0xDsGXMGcNWpqF7ujMsjjnp0+UHBwnDQ==" - } + "@opentelemetry/api": "^1.0.0", + "tslib": "^2.2.0" } }, "@azure/logger": { @@ -90,45 +82,42 @@ "tar": "^6.1.0" } }, - "@opencensus/web-types": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@opencensus/web-types/-/web-types-0.0.7.tgz", - "integrity": "sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==" - }, "@opentelemetry/api": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.18.1.tgz", - "integrity": "sha512-pKNxHe3AJ5T2N5G3AlT9gx6FyF5K2FS9ZNc+FipC+f1CpVF/EY+JHTJ749dnM2kWIgZTbDJFiGMuc0FYjNSCOg==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz", + "integrity": "sha512-H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw==" }, "@opentelemetry/core": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.19.0.tgz", - "integrity": "sha512-t83FleVbHH6SWdUegclZbsnHn0OaHjq17Hd1zsJIRMM6WNuVzbXWA+3V6LCKXqUYyu3qwtZ/w45u/Nqfr5mEeQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.23.0.tgz", + "integrity": "sha512-7COVsnGEW96ITjc0waWYo/R27sFqjPUg4SCoP8XL48zAGr9zjzeuJoQe/xVchs7op//qOeeEEeBxiBvXy2QS0Q==", "requires": { + "@opentelemetry/semantic-conventions": "0.23.0", "semver": "^7.1.3" } }, "@opentelemetry/resources": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.19.0.tgz", - "integrity": "sha512-wrgclhxBH4ZO86u6veSXRtH3hv9q2kaQ1/cfstWun2y6YqjajpqAdyEHrlFWYyjr3t1ze0R68GjYQxPVWYURzg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.23.0.tgz", + "integrity": "sha512-sAiaoQ0pOwjaaKySuwCUlvej/W9M5d+SxpcuBFUBUojqRlEAYDbx1FHClPnKtOysIb9rXJDQvM3xlH++7NQQzg==", "requires": { - "@opentelemetry/core": "0.19.0" + "@opentelemetry/core": "0.23.0", + "@opentelemetry/semantic-conventions": "0.23.0" } }, "@opentelemetry/semantic-conventions": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.19.0.tgz", - "integrity": "sha512-MMXhYEvNakvXC+oa5muX8KS2z+rsXLXwabjuzXcbJPH+rvo5XFNQ1c7svxb0B1xPpm4KT7fnH2DVfYqQzsCteQ==" + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.23.0.tgz", + "integrity": "sha512-Tzo+VGR1zlzLbjVI+7mlDJ2xuaUsue4scWvFlK+fzcUfn9siF4NWbxoC2X6Br2B/g4dsq1OAwAYsPVYIEoY2rQ==" }, "@opentelemetry/tracing": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.19.0.tgz", - "integrity": "sha512-RUmPZLQi4+nlHwTFpHqU45TMW+osIraDtf0jcFKLacKltGIft65tVxIEVn1uF9N9eG7NZzjXLo3jsvCzpavJ8Q==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.23.0.tgz", + "integrity": "sha512-3vNLS55bE0CG1RBDz7+wAAKpLjbl8fhQKqM4MvTy/LYHSolgyM5BNutSb/TcA9LtWvkdI0djgFXxeRig1OFqoQ==", "requires": { - "@opentelemetry/core": "0.19.0", - "@opentelemetry/resources": "0.19.0", - "@opentelemetry/semantic-conventions": "0.19.0", + "@opentelemetry/core": "0.23.0", + "@opentelemetry/resources": "0.23.0", + "@opentelemetry/semantic-conventions": "0.23.0", "lodash.merge": "^4.6.2" } }, @@ -153,9 +142,9 @@ "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==" }, "@types/node-fetch": { - "version": "2.5.10", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.10.tgz", - "integrity": "sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==", + "version": "2.5.11", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.11.tgz", + "integrity": "sha512-2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ==", "requires": { "@types/node": "*", "form-data": "^3.0.0" @@ -580,9 +569,9 @@ } }, "diagnostic-channel-publishers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.0.tgz", - "integrity": "sha512-FTiMLPZa735iTsCVp3T9rgTC8tfOdEZVgpa0akPJrMXcsFBRQdskL1MWIW53xoZsWTBWHLQMjWUH75nz4NJHCw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.1.tgz", + "integrity": "sha512-9D6XicU15MLXVtYEaBc3q1Di/4ciUFMULApfBc8/RUUwBk7g16t7/aFKZF4Kt4B3aFBtCbsTYJRAMKCSFaYWDA==" }, "diff": { "version": "3.5.0", diff --git a/package.json b/package.json index 865569b2..5a82ca71 100644 --- a/package.json +++ b/package.json @@ -55,12 +55,12 @@ "typescript": "4.1.2" }, "dependencies": { - "@azure/core-http": "^1.2.5", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/tracing": "^0.19.0", + "@azure/core-http": "^2.0.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/tracing": "^0.23.0", "cls-hooked": "^4.2.2", "continuation-local-storage": "^3.2.1", "diagnostic-channel": "1.0.0", - "diagnostic-channel-publishers": "1.0.0" + "diagnostic-channel-publishers": "1.0.1" } }