From aec8b1a0d59b9b8842445999af71a2c027c09a58 Mon Sep 17 00:00:00 2001 From: t2t2 Date: Tue, 24 Aug 2021 13:12:03 +0300 Subject: [PATCH 1/2] update and rename dependencies --- docs/Exporters.md | 2 +- package.json | 24 +++++++++---------- src/SplunkDocumentLoadInstrumentation.ts | 4 ++-- src/SplunkErrorInstrumentation.ts | 2 +- src/SplunkExporter.ts | 2 +- ...plunkPostDocLoadResourceInstrumentation.ts | 2 +- src/SplunkWebTracerProvider.ts | 4 ++-- src/index.ts | 2 +- src/servertiming.ts | 2 +- test/SplunkContextManager.test.ts | 2 +- test/api.test.ts | 2 +- test/init.test.ts | 2 +- test/utils.ts | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/Exporters.md b/docs/Exporters.md index 8a58d94c..5e2c0314 100644 --- a/docs/Exporters.md +++ b/docs/Exporters.md @@ -4,7 +4,7 @@ Splunk's RUM uses Zipkin exporter for sending data to `beaconUrl` endpoint. Othe ```html import SplunkRum from '@splunk/otel-js-browser' -import {BatchSpanProcessor} from '@opentelemetry/tracing' +import {BatchSpanProcessor} from '@opentelemetry/sdk-trace-base' import {CollectorTraceExporter} from '@opentelemetry/exporter-collector' const exporter = new CollectorTraceExporter({ diff --git a/package.json b/package.json index fa23d55e..62f82f90 100644 --- a/package.json +++ b/package.json @@ -36,18 +36,18 @@ "dependencies": { "@babel/runtime": "~7.14.0", "@opentelemetry/api": "1.0.2", - "@opentelemetry/api-metrics": "0.24.0", - "@opentelemetry/core": "0.24.0", - "@opentelemetry/exporter-zipkin": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/instrumentation-document-load": "0.24.0", - "@opentelemetry/instrumentation-fetch": "0.24.0", - "@opentelemetry/instrumentation-user-interaction": "0.24.0", - "@opentelemetry/instrumentation-xml-http-request": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0", - "@opentelemetry/web": "0.24.0", + "@opentelemetry/api-metrics": "0.25.0", + "@opentelemetry/core": "0.25.0", + "@opentelemetry/exporter-zipkin": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/instrumentation-document-load": "0.25.0", + "@opentelemetry/instrumentation-fetch": "0.25.0", + "@opentelemetry/instrumentation-user-interaction": "0.25.0", + "@opentelemetry/instrumentation-xml-http-request": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0", "shimmer": "~1.2.1", "web-vitals": "~1.1.2" }, diff --git a/src/SplunkDocumentLoadInstrumentation.ts b/src/SplunkDocumentLoadInstrumentation.ts index ef5b633a..6af13dc1 100644 --- a/src/SplunkDocumentLoadInstrumentation.ts +++ b/src/SplunkDocumentLoadInstrumentation.ts @@ -18,8 +18,8 @@ import { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { DocumentLoadInstrumentation } from '@opentelemetry/instrumentation-document-load'; import * as api from '@opentelemetry/api'; import { captureTraceParentFromPerformanceEntries } from './servertiming'; -import { PerformanceEntries } from '@opentelemetry/web'; -import { Span } from '@opentelemetry/tracing'; +import { PerformanceEntries } from '@opentelemetry/sdk-trace-web'; +import { Span } from '@opentelemetry/sdk-trace-base'; const excludedInitiatorTypes = ['beacon', 'fetch', 'xmlhttprequest']; diff --git a/src/SplunkErrorInstrumentation.ts b/src/SplunkErrorInstrumentation.ts index aee44607..0f0aeecf 100644 --- a/src/SplunkErrorInstrumentation.ts +++ b/src/SplunkErrorInstrumentation.ts @@ -15,7 +15,7 @@ limitations under the License. */ import * as shimmer from 'shimmer'; -import { getElementXPath } from '@opentelemetry/web'; +import { getElementXPath } from '@opentelemetry/sdk-trace-web'; import { limitLen } from './utils'; import { Span } from '@opentelemetry/api'; import { hrTime } from '@opentelemetry/core'; diff --git a/src/SplunkExporter.ts b/src/SplunkExporter.ts index 83557b59..62cdfad1 100644 --- a/src/SplunkExporter.ts +++ b/src/SplunkExporter.ts @@ -22,7 +22,7 @@ import { import { ExportResult, ExportResultCode } from '@opentelemetry/core'; import { limitLen } from './utils'; import { SpanAttributes, SpanKind } from '@opentelemetry/api'; -import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing'; +import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; const MAX_VALUE_LIMIT = 4096; const SPAN_RATE_LIMIT_PERIOD = 30000; // millis, sweep to clear out span counts diff --git a/src/SplunkPostDocLoadResourceInstrumentation.ts b/src/SplunkPostDocLoadResourceInstrumentation.ts index 144b44a7..fe7745e3 100644 --- a/src/SplunkPostDocLoadResourceInstrumentation.ts +++ b/src/SplunkPostDocLoadResourceInstrumentation.ts @@ -20,7 +20,7 @@ import { import { VERSION } from './version'; import { hrTime, isUrlIgnored } from '@opentelemetry/core'; -import { addSpanNetworkEvents } from '@opentelemetry/web'; +import { addSpanNetworkEvents } from '@opentelemetry/sdk-trace-web'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; export interface SplunkPostDocLoadResourceInstrumentationConfig extends InstrumentationConfig { diff --git a/src/SplunkWebTracerProvider.ts b/src/SplunkWebTracerProvider.ts index e9609ef1..36ed2bd7 100644 --- a/src/SplunkWebTracerProvider.ts +++ b/src/SplunkWebTracerProvider.ts @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { WebTracerConfig, WebTracerProvider } from '@opentelemetry/web'; +import { WebTracerConfig, WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { propagation, context, trace, SpanAttributes } from '@opentelemetry/api'; -import { Tracer } from '@opentelemetry/tracing'; +import { Tracer } from '@opentelemetry/sdk-trace-base'; export interface SplunkWebTracerProviderConfig extends WebTracerConfig { app: string; diff --git a/src/index.ts b/src/index.ts index b375249b..23bece2d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,7 +24,7 @@ import { SpanExporter, SpanProcessor, BufferConfig, -} from '@opentelemetry/tracing'; +} from '@opentelemetry/sdk-trace-base'; import { diag, DiagConsoleLogger, DiagLogLevel, SpanAttributes } from '@opentelemetry/api'; import { SplunkDocumentLoadInstrumentation } from './SplunkDocumentLoadInstrumentation'; import { SplunkXhrPlugin } from './SplunkXhrPlugin'; diff --git a/src/servertiming.ts b/src/servertiming.ts index cb205f4b..1e2c24db 100644 --- a/src/servertiming.ts +++ b/src/servertiming.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Span } from '@opentelemetry/api'; -import { PerformanceEntries } from '@opentelemetry/web'; +import { PerformanceEntries } from '@opentelemetry/sdk-trace-web'; function addMatchToSpan(match: RegExpMatchArray, span: Span): void { if (match && match[1] && match[2]) { diff --git a/test/SplunkContextManager.test.ts b/test/SplunkContextManager.test.ts index 2f791c6c..9ebf53dd 100644 --- a/test/SplunkContextManager.test.ts +++ b/test/SplunkContextManager.test.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { context, trace } from '@opentelemetry/api'; -import { SpanProcessor } from '@opentelemetry/tracing'; +import { SpanProcessor } from '@opentelemetry/sdk-trace-base'; import { expect } from 'chai'; import SplunkOtelWeb, { INSTRUMENTATIONS_ALL_DISABLED } from '../src/index'; import { SpanCapturer } from './utils'; diff --git a/test/api.test.ts b/test/api.test.ts index a6e76e2e..eabcb8d7 100644 --- a/test/api.test.ts +++ b/test/api.test.ts @@ -19,7 +19,7 @@ import { context, trace, SpanStatusCode } from '@opentelemetry/api'; import SplunkOtelWeb, { INSTRUMENTATIONS_ALL_DISABLED } from '../src/index'; import { SpanCapturer } from './utils'; -import { SpanProcessor } from '@opentelemetry/tracing'; +import { SpanProcessor } from '@opentelemetry/sdk-trace-base'; // note: we've added these tests mainly to keep track of substantial changes in the Open Telemetry API describe('Transitive API', () => { diff --git a/test/init.test.ts b/test/init.test.ts index 2bc1e182..0a1728f1 100644 --- a/test/init.test.ts +++ b/test/init.test.ts @@ -17,7 +17,7 @@ limitations under the License. import * as assert from 'assert'; import SplunkRum from '../src/index'; import { context, trace } from '@opentelemetry/api'; -import * as tracing from '@opentelemetry/tracing'; +import * as tracing from '@opentelemetry/sdk-trace-base'; import { deinit, initWithDefaultConfig, SpanCapturer } from './utils'; import sinon from 'sinon'; import { expect } from 'chai'; diff --git a/test/utils.ts b/test/utils.ts index c4b1408d..990da2c3 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ReadableSpan, SimpleSpanProcessor, SpanProcessor } from '@opentelemetry/tracing'; +import { ReadableSpan, SimpleSpanProcessor, SpanProcessor } from '@opentelemetry/sdk-trace-base'; import SplunkRum, { SplunkExporter, ZipkinSpan } from '../src/index'; export class SpanCapturer implements SpanProcessor { From 27abd0c1e6d0c93cb2e486b84f22b1e06138c0d7 Mon Sep 17 00:00:00 2001 From: mhennoch Date: Mon, 27 Sep 2021 21:51:08 +0300 Subject: [PATCH 2/2] Update package lock --- package-lock.json | 338 +++++++++++++++++++++++----------------------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f89dd6a..e79fb077 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,18 +11,18 @@ "dependencies": { "@babel/runtime": "~7.14.0", "@opentelemetry/api": "1.0.2", - "@opentelemetry/api-metrics": "0.24.0", - "@opentelemetry/core": "0.24.0", - "@opentelemetry/exporter-zipkin": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/instrumentation-document-load": "0.24.0", - "@opentelemetry/instrumentation-fetch": "0.24.0", - "@opentelemetry/instrumentation-user-interaction": "0.24.0", - "@opentelemetry/instrumentation-xml-http-request": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0", - "@opentelemetry/web": "0.24.0", + "@opentelemetry/api-metrics": "0.25.0", + "@opentelemetry/core": "0.25.0", + "@opentelemetry/exporter-zipkin": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/instrumentation-document-load": "0.25.0", + "@opentelemetry/instrumentation-fetch": "0.25.0", + "@opentelemetry/instrumentation-user-interaction": "0.25.0", + "@opentelemetry/instrumentation-xml-http-request": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0", "shimmer": "~1.2.1", "web-vitals": "~2.1.0" }, @@ -3067,29 +3067,29 @@ } }, "node_modules/@opentelemetry/api-metrics": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.24.0.tgz", - "integrity": "sha512-hdpkMeVlRGTuMshD2ZFaDjA/U0cZTkxUkJFvS/4yOiWfw+kEASmGE+U0/i9lbdQKuCR7X1rXSjbcYumlHcMG+A==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz", + "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==", "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/core": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.24.0.tgz", - "integrity": "sha512-KpsfxBbFTZT9zaB4Es/fFLbvSzVl9Io/8UUu/TYl4/HgqkmyVInNlWTgRiKyz9nsHzFpGP1kdZJj+YIut0IFsw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz", + "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==", "dependencies": { - "@opentelemetry/semantic-conventions": "0.24.0", - "semver": "^7.1.3" + "@opentelemetry/semantic-conventions": "0.25.0", + "semver": "^7.3.5" }, "engines": { "node": ">=8.5.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/core/node_modules/lru-cache": { @@ -3123,103 +3123,103 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@opentelemetry/exporter-zipkin": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.24.0.tgz", - "integrity": "sha512-SUV9yKnl7QrXL7EP2/xY3ryP1giSkQHTE+9uoLt/yC8hLCvh5AnJmBk5g9COaBQ6qANFEVKs74LJcjTOZU2dgg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.25.0.tgz", + "integrity": "sha512-tdVHdA0vrsQm/+OEdLiZtHUfuIcU+NBBntM+IDfrRqecHlvm/NnOd1nMLkGVveEd/SuZWgYTANUTIHEprpusbg==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/instrumentation": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.24.0.tgz", - "integrity": "sha512-Kn581LUJrVsuV6j8KjNpNWFecyrLoc3GRiTpXUl48LVtm9CCbdwNZGe3PRmWN1Mb/bmWr/tt3GHcuhyUxAsY0A==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.25.0.tgz", + "integrity": "sha512-G9V2ISxrgUgdckZHZXu+kzeEgC76vRyZXlRdwXOT6VsJKHE+UENnC/502wNtPCFERgWSJ56W/51egkgkcKp6bA==", "dependencies": { - "@opentelemetry/api-metrics": "0.24.0", + "@opentelemetry/api-metrics": "0.25.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/instrumentation-document-load": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.24.0.tgz", - "integrity": "sha512-saJDPPJt2aCen8mI6/6/YTwp5nGFOgINfY5HfEDWF/VEdCXGCR3ZXh2RC1Sh9w3Kbk3ggCkg6iI18B+6GTkclw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.25.0.tgz", + "integrity": "sha512-qwQzprwDQvFt+Hvi7es/6Bmm7QTTxTL6+RbOnSE3m+DsGAvd8SUhzi3oOm6PslOsyJiMXZvDLIxApGqvE3jxpw==", "dependencies": { - "@opentelemetry/core": "^0.24.0", - "@opentelemetry/instrumentation": "^0.24.0", - "@opentelemetry/semantic-conventions": "^0.24.0", - "@opentelemetry/tracing": "^0.24.0", - "@opentelemetry/web": "^0.24.0" + "@opentelemetry/core": "^0.25.0", + "@opentelemetry/instrumentation": "^0.25.0", + "@opentelemetry/sdk-trace-base": "^0.25.0", + "@opentelemetry/sdk-trace-web": "^0.25.0", + "@opentelemetry/semantic-conventions": "^0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/instrumentation-fetch": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.24.0.tgz", - "integrity": "sha512-ZxjEctn5um5R7zBMqo6wdURmP+3gCtmhkg+id4q+1CQIKbZax6/uFCHeXPWyW/svz6QY0985/FJn8f+UStOWaw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.25.0.tgz", + "integrity": "sha512-hZKQRoX6jNeCi5Sn/uo4lqd31DICYnq8uKk5PUkMsrzpnn77AcVSoFFMsIHdt7zWVLpeMfD979e/rAKxR2JSBg==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/web": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/instrumentation-user-interaction": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.24.0.tgz", - "integrity": "sha512-Bic5ClQQmfSfDQwmdFMiOrVhGOdSA8hlIBJUVsAv7PESaHpiZpxSkaIRB6E2ShHcVXg8EyhM84J2ufDhs6hQUA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.25.0.tgz", + "integrity": "sha512-6aFZdRD2GtRFSE7dWOaqXlzD1UkddSB8EcTdf9JDSBcbV+lGVqIFNA+D5EkXQmM+HWKI+5tS8/IFN/kdfuYrJA==", "dependencies": { - "@opentelemetry/core": "^0.24.0", - "@opentelemetry/instrumentation": "^0.24.0", - "@opentelemetry/web": "^0.24.0" + "@opentelemetry/core": "^0.25.0", + "@opentelemetry/instrumentation": "^0.25.0", + "@opentelemetry/sdk-trace-web": "^0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1", + "@opentelemetry/api": "^1.0.2", "zone.js": "0.11.4" } }, "node_modules/@opentelemetry/instrumentation-xml-http-request": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.24.0.tgz", - "integrity": "sha512-DB8Zy9cLAiViRj3GGM4HVU/l4hLHoJwpneHGdL6KIKhUlj5r2J18W+Ev0nDgOwkxAMDxmpF0pIsLBwXZObpIRQ==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.25.0.tgz", + "integrity": "sha512-M842qwB1j9l0KDWubJLdrKDX8tNR82ZxnYltJdwdGTdLgEKoKrdv+NPRjv+XnLKTJ8DX4PmYJmHz2Tw+ecD32A==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/web": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, "node_modules/@opentelemetry/instrumentation/node_modules/lru-cache": { @@ -3253,59 +3253,59 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@opentelemetry/resources": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.24.0.tgz", - "integrity": "sha512-uEr2m13IRkjQAjX6fsYqJ21aONCspRvuQunaCl8LbH1NS1Gj82TuRUHF6TM82ulBPK8pU+nrrqXKuky2cMcIzw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz", + "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz", - "integrity": "sha512-a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.24.0.tgz", - "integrity": "sha512-sTLEs1SIon3xV8vLe53PzfbU0FahoxL9NPY/CYvA1mwGbMu4zHkHAjqy1Tc8JmqRrfa+XrHkmzeSM4hrvloBaA==", + "node_modules/@opentelemetry/sdk-trace-base": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz", + "integrity": "sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", + "@opentelemetry/core": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0", "lodash.merge": "^4.6.2" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" } }, - "node_modules/@opentelemetry/web": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.24.0.tgz", - "integrity": "sha512-yxAKj7bQ3czfif9MtYXaSJrgRcrLUNltslyhEE+Oh7Ojh9XQ0Q5RhPnE9cwHdR7yp1+HjbEHE+I91QIMKMlVWA==", + "node_modules/@opentelemetry/sdk-trace-web": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-0.25.0.tgz", + "integrity": "sha512-5+X89BPgNnJ3pzLNI3L7+xeoe2yt6Q//kdS3Ox2vYTTMnVEw+Ee8UummkiWki5Q4XTK6FbaIRcAOhrQtBmi+Jg==", "dependencies": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.1" + "@opentelemetry/api": "^1.0.2" + } + }, + "node_modules/@opentelemetry/semantic-conventions": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz", + "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==", + "engines": { + "node": ">=8.0.0" } }, "node_modules/@rollup/plugin-babel": { @@ -16738,18 +16738,18 @@ "integrity": "sha512-DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww==" }, "@opentelemetry/api-metrics": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.24.0.tgz", - "integrity": "sha512-hdpkMeVlRGTuMshD2ZFaDjA/U0cZTkxUkJFvS/4yOiWfw+kEASmGE+U0/i9lbdQKuCR7X1rXSjbcYumlHcMG+A==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz", + "integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==", "requires": {} }, "@opentelemetry/core": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.24.0.tgz", - "integrity": "sha512-KpsfxBbFTZT9zaB4Es/fFLbvSzVl9Io/8UUu/TYl4/HgqkmyVInNlWTgRiKyz9nsHzFpGP1kdZJj+YIut0IFsw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz", + "integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==", "requires": { - "@opentelemetry/semantic-conventions": "0.24.0", - "semver": "^7.1.3" + "@opentelemetry/semantic-conventions": "0.25.0", + "semver": "^7.3.5" }, "dependencies": { "lru-cache": { @@ -16776,22 +16776,22 @@ } }, "@opentelemetry/exporter-zipkin": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.24.0.tgz", - "integrity": "sha512-SUV9yKnl7QrXL7EP2/xY3ryP1giSkQHTE+9uoLt/yC8hLCvh5AnJmBk5g9COaBQ6qANFEVKs74LJcjTOZU2dgg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.25.0.tgz", + "integrity": "sha512-tdVHdA0vrsQm/+OEdLiZtHUfuIcU+NBBntM+IDfrRqecHlvm/NnOd1nMLkGVveEd/SuZWgYTANUTIHEprpusbg==", "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" } }, "@opentelemetry/instrumentation": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.24.0.tgz", - "integrity": "sha512-Kn581LUJrVsuV6j8KjNpNWFecyrLoc3GRiTpXUl48LVtm9CCbdwNZGe3PRmWN1Mb/bmWr/tt3GHcuhyUxAsY0A==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.25.0.tgz", + "integrity": "sha512-G9V2ISxrgUgdckZHZXu+kzeEgC76vRyZXlRdwXOT6VsJKHE+UENnC/502wNtPCFERgWSJ56W/51egkgkcKp6bA==", "requires": { - "@opentelemetry/api-metrics": "0.24.0", + "@opentelemetry/api-metrics": "0.25.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" @@ -16821,84 +16821,84 @@ } }, "@opentelemetry/instrumentation-document-load": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.24.0.tgz", - "integrity": "sha512-saJDPPJt2aCen8mI6/6/YTwp5nGFOgINfY5HfEDWF/VEdCXGCR3ZXh2RC1Sh9w3Kbk3ggCkg6iI18B+6GTkclw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.25.0.tgz", + "integrity": "sha512-qwQzprwDQvFt+Hvi7es/6Bmm7QTTxTL6+RbOnSE3m+DsGAvd8SUhzi3oOm6PslOsyJiMXZvDLIxApGqvE3jxpw==", "requires": { - "@opentelemetry/core": "^0.24.0", - "@opentelemetry/instrumentation": "^0.24.0", - "@opentelemetry/semantic-conventions": "^0.24.0", - "@opentelemetry/tracing": "^0.24.0", - "@opentelemetry/web": "^0.24.0" + "@opentelemetry/core": "^0.25.0", + "@opentelemetry/instrumentation": "^0.25.0", + "@opentelemetry/sdk-trace-base": "^0.25.0", + "@opentelemetry/sdk-trace-web": "^0.25.0", + "@opentelemetry/semantic-conventions": "^0.25.0" } }, "@opentelemetry/instrumentation-fetch": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.24.0.tgz", - "integrity": "sha512-ZxjEctn5um5R7zBMqo6wdURmP+3gCtmhkg+id4q+1CQIKbZax6/uFCHeXPWyW/svz6QY0985/FJn8f+UStOWaw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.25.0.tgz", + "integrity": "sha512-hZKQRoX6jNeCi5Sn/uo4lqd31DICYnq8uKk5PUkMsrzpnn77AcVSoFFMsIHdt7zWVLpeMfD979e/rAKxR2JSBg==", "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/web": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" } }, "@opentelemetry/instrumentation-user-interaction": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.24.0.tgz", - "integrity": "sha512-Bic5ClQQmfSfDQwmdFMiOrVhGOdSA8hlIBJUVsAv7PESaHpiZpxSkaIRB6E2ShHcVXg8EyhM84J2ufDhs6hQUA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.25.0.tgz", + "integrity": "sha512-6aFZdRD2GtRFSE7dWOaqXlzD1UkddSB8EcTdf9JDSBcbV+lGVqIFNA+D5EkXQmM+HWKI+5tS8/IFN/kdfuYrJA==", "requires": { - "@opentelemetry/core": "^0.24.0", - "@opentelemetry/instrumentation": "^0.24.0", - "@opentelemetry/web": "^0.24.0" + "@opentelemetry/core": "^0.25.0", + "@opentelemetry/instrumentation": "^0.25.0", + "@opentelemetry/sdk-trace-web": "^0.25.0" } }, "@opentelemetry/instrumentation-xml-http-request": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.24.0.tgz", - "integrity": "sha512-DB8Zy9cLAiViRj3GGM4HVU/l4hLHoJwpneHGdL6KIKhUlj5r2J18W+Ev0nDgOwkxAMDxmpF0pIsLBwXZObpIRQ==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.25.0.tgz", + "integrity": "sha512-M842qwB1j9l0KDWubJLdrKDX8tNR82ZxnYltJdwdGTdLgEKoKrdv+NPRjv+XnLKTJ8DX4PmYJmHz2Tw+ecD32A==", "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/instrumentation": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/web": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/sdk-trace-web": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" } }, "@opentelemetry/resources": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.24.0.tgz", - "integrity": "sha512-uEr2m13IRkjQAjX6fsYqJ21aONCspRvuQunaCl8LbH1NS1Gj82TuRUHF6TM82ulBPK8pU+nrrqXKuky2cMcIzw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz", + "integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==", "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" } }, - "@opentelemetry/semantic-conventions": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz", - "integrity": "sha512-a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA==" - }, - "@opentelemetry/tracing": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.24.0.tgz", - "integrity": "sha512-sTLEs1SIon3xV8vLe53PzfbU0FahoxL9NPY/CYvA1mwGbMu4zHkHAjqy1Tc8JmqRrfa+XrHkmzeSM4hrvloBaA==", - "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/resources": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", + "@opentelemetry/sdk-trace-base": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz", + "integrity": "sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==", + "requires": { + "@opentelemetry/core": "0.25.0", + "@opentelemetry/resources": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0", "lodash.merge": "^4.6.2" } }, - "@opentelemetry/web": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.24.0.tgz", - "integrity": "sha512-yxAKj7bQ3czfif9MtYXaSJrgRcrLUNltslyhEE+Oh7Ojh9XQ0Q5RhPnE9cwHdR7yp1+HjbEHE+I91QIMKMlVWA==", + "@opentelemetry/sdk-trace-web": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-0.25.0.tgz", + "integrity": "sha512-5+X89BPgNnJ3pzLNI3L7+xeoe2yt6Q//kdS3Ox2vYTTMnVEw+Ee8UummkiWki5Q4XTK6FbaIRcAOhrQtBmi+Jg==", "requires": { - "@opentelemetry/core": "0.24.0", - "@opentelemetry/semantic-conventions": "0.24.0", - "@opentelemetry/tracing": "0.24.0" + "@opentelemetry/core": "0.25.0", + "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/semantic-conventions": "0.25.0" } }, + "@opentelemetry/semantic-conventions": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz", + "integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==" + }, "@rollup/plugin-babel": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz",