diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f67b78fe0e..33a35892f4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,12 +16,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 3c519e632e..5905b86141 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -16,7 +16,7 @@ jobs: cache: 'npm' cache-dependency-path: | package-lock.json - node-version: '18' + node-version: '20' - name: Install and Build 🔧 run: | @@ -29,8 +29,10 @@ jobs: NODE_OPTIONS: --max-old-space-size=6144 - name: Deploy Documentation 🚀 - uses: JamesIves/github-pages-deploy-action@releases/v3 + uses: JamesIves/github-pages-deploy-action@releases/v4 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: docs # The folder the action should deploy. + branch: gh-pages # The branch the action should deploy to. + folder: docs # The folder the action should deploy. + # ensure we don't override benchmark data + clean-exclude: | + benchmarks/** diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a0bcc4b3a..68e203792b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,54 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) +* feat(sdk-metrics): allow single bucket histograms [#4456](https://github.com/open-telemetry/opentelemetry-js/pull/4456) @pichlermarc +* feat(instrumentation): Make `init()` method public [#4418](https://github.com/open-telemetry/opentelemetry-js/pull/4418) + +### :bug: (Bug Fix) + +* fix(sdk-metrics): handle zero bucket counts in exponential histogram merge [#4459](https://github.com/open-telemetry/opentelemetry-js/pull/4459) @mwear +* fix(sdk-metrics): ignore `NaN` value recordings in Histograms [#4455](https://github.com/open-telemetry/opentelemetry-js/pull/4455) @pichlermarc + * fixes a bug where recording `NaN` on a histogram would result in the sum of bucket count values not matching the overall count +* fix(sdk-metrics): allow single bucket histograms [#4456](https://github.com/open-telemetry/opentelemetry-js/pull/4456) @pichlermarc + * fixes a bug where `Meter.createHistogram()` with the advice `explicitBucketBoundaries: []` would throw + ### :books: (Refine Doc) +* docs: shorten readme sections [#4460](https://github.com/open-telemetry/opentelemetry-js/pull/4460) @legendecas + +### :house: (Internal) + +## 1.21.0 + +### :rocket: (Enhancement) + +* feat(sdk-metrics): add constructor option to add metric readers [#4427](https://github.com/open-telemetry/opentelemetry-js/pull/4427) @pichlermarc + * deprecates `MeterProvider.addMetricReader()` please use the constructor option `readers` instead. + +### :bug: (Bug Fix) + +* fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation [#4417](https://github.com/open-telemetry/opentelemetry-js/pull/4417) @pichlermarc +* fix(sdk-trace-base): Export processed spans while exporter failed [#4287](https://github.com/open-telemetry/opentelemetry-js/pull/4287) @Zirak + +### :house: (Internal) + +* chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320) +* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc +* test(opentelemetry-context-zone-peer-dep): transpile zone.js in tests [#4423](https://github.com/open-telemetry/opentelemetry-js/pull/4423) @legendecas + +## 1.20.0 + +### :rocket: (Enhancement) + +* perf(otlp-transformer): skip unnecessary base64 encode of span contexts [#4343](https://github.com/open-telemetry/opentelemetry-js/pull/4343) @seemk +* feat(sdk-trace-base): improve log messages when dropping span events [#4223](https://github.com/open-telemetry/opentelemetry-js/pull/4223) @mkubliniak + +## 1.19.0 + +### :rocket: (Enhancement) + +* feat: add node 20 support [#4336](https://github.com/open-telemetry/opentelemetry-js/pull/4336) @dyladan + ### :house: (Internal) * chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index c46749c01e..542d9daa38 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. ## Unreleased +* feat(api): add SugaredTracer for functions not defined in the spec +* fix(api): fix unreachable @opentelemetry/api/experimental entry [#4446](https://github.com/open-telemetry/opentelemetry-js/pull/4446) @legendecas + ## 1.7.0 ### :rocket: (Enhancement) diff --git a/api/package.json b/api/package.json index 04ac24ed9a..140365100f 100644 --- a/api/package.json +++ b/api/package.json @@ -12,6 +12,20 @@ "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, + "exports": { + ".": { + "module": "./build/esm/index.js", + "esnext": "./build/esnext/index.js", + "types": "./build/src/index.d.ts", + "default": "./build/src/index.js" + }, + "./experimental": { + "module": "./build/esm/experimental/index.js", + "esnext": "./build/esnext/experimental/index.js", + "types": "./build/src/experimental/index.d.ts", + "default": "./build/src/experimental/index.js" + } + }, "repository": "open-telemetry/opentelemetry-js", "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", @@ -69,7 +83,7 @@ "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.38", + "@types/webpack": "5.28.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -91,7 +105,7 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4", "unionfs": "4.5.1", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api", "sideEffects": false diff --git a/packages/opentelemetry-exporter-zipkin/src/version.js b/api/src/experimental/index.ts similarity index 75% rename from packages/opentelemetry-exporter-zipkin/src/version.js rename to api/src/experimental/index.ts index 2090d63abf..a05c7ba21b 100644 --- a/packages/opentelemetry-exporter-zipkin/src/version.js +++ b/api/src/experimental/index.ts @@ -1,4 +1,3 @@ -"use strict"; /* * Copyright The OpenTelemetry Authors * @@ -14,7 +13,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; +export { wrapTracer, SugaredTracer } from './trace/SugaredTracer'; +export { SugaredSpanOptions } from './trace/SugaredOptions'; diff --git a/api/src/experimental/trace/SugaredOptions.ts b/api/src/experimental/trace/SugaredOptions.ts new file mode 100644 index 0000000000..3dba14650e --- /dev/null +++ b/api/src/experimental/trace/SugaredOptions.ts @@ -0,0 +1,29 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Span, SpanOptions } from '../../'; + +/** + * Options needed for span creation + */ +export interface SugaredSpanOptions extends SpanOptions { + /** + * function to overwrite default exception behavior to record the exception. No exceptions should be thrown in the function. + * @param e Error which triggered this exception + * @param span current span from context + */ + onException?: (e: Error, span: Span) => void; +} diff --git a/api/src/experimental/trace/SugaredTracer.ts b/api/src/experimental/trace/SugaredTracer.ts new file mode 100644 index 0000000000..c4f5cdc642 --- /dev/null +++ b/api/src/experimental/trace/SugaredTracer.ts @@ -0,0 +1,215 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { SugaredSpanOptions } from './SugaredOptions'; +import { context, Context, Span, SpanStatusCode, Tracer } from '../../'; + +const defaultOnException = (e: Error, span: Span) => { + span.recordException(e); + span.setStatus({ + code: SpanStatusCode.ERROR, + }); +}; + +/** + * return a new SugaredTracer created from the supplied one + * @param tracer + */ +export function wrapTracer(tracer: Tracer): SugaredTracer { + return new SugaredTracer(tracer); +} + +export class SugaredTracer implements Tracer { + private readonly _tracer: Tracer; + + constructor(tracer: Tracer) { + this._tracer = tracer; + this.startSpan = tracer.startSpan.bind(this._tracer); + this.startActiveSpan = tracer.startActiveSpan.bind(this._tracer); + } + + startActiveSpan: Tracer['startActiveSpan']; + startSpan: Tracer['startSpan']; + + /** + * Starts a new {@link Span} and calls the given function passing it the + * created span as first argument. + * Additionally, the new span gets set in context and this context is activated + * for the duration of the function call. + * The span will be closed after the function has executed. + * If an exception occurs, it is recorded, the status is set to ERROR and the exception is rethrown. + * + * @param name The name of the span + * @param [options] SugaredSpanOptions used for span creation + * @param [context] Context to use to extract parent + * @param fn function called in the context of the span and receives the newly created span as an argument + * @returns return value of fn + * @example + * const something = tracer.withActiveSpan('op', span => { + * // do some work + * }); + * @example + * const something = await tracer.withActiveSpan('op', span => { + * // do some async work + * }); + */ + withActiveSpan ReturnType>( + name: string, + fn: F + ): ReturnType; + withActiveSpan ReturnType>( + name: string, + options: SugaredSpanOptions, + fn: F + ): ReturnType; + withActiveSpan ReturnType>( + name: string, + options: SugaredSpanOptions, + context: Context, + fn: F + ): ReturnType; + withActiveSpan ReturnType>( + name: string, + arg2: F | SugaredSpanOptions, + arg3?: F | Context, + arg4?: F + ): ReturnType { + const { opts, ctx, fn } = massageParams(arg2, arg3, arg4); + + return this._tracer.startActiveSpan(name, opts, ctx, (span: Span) => + handleFn(span, opts, fn) + ) as ReturnType; + } + + /** + * Starts a new {@link Span} and ends it after execution of fn without setting it on context. + * The span will be closed after the function has executed. + * If an exception occurs, it is recorded, the status is et to ERROR and rethrown. + * + * This method does NOT modify the current Context. + * + * @param name The name of the span + * @param [options] SugaredSpanOptions used for span creation + * @param [context] Context to use to extract parent + * @param fn function called in the context of the span and receives the newly created span as an argument + * @returns Span The newly created span + * @example + * const something = tracer.withSpan('op', span => { + * // do some work + * }); + * @example + * const something = await tracer.withSpan('op', span => { + * // do some async work + * }); + */ + withSpan ReturnType>( + name: string, + fn: F + ): ReturnType; + withSpan ReturnType>( + name: string, + options: SugaredSpanOptions, + fn: F + ): ReturnType; + withSpan ReturnType>( + name: string, + options: SugaredSpanOptions, + context: Context, + fn: F + ): ReturnType; + withSpan ReturnType>( + name: string, + options: SugaredSpanOptions, + context: Context, + fn: F + ): ReturnType; + withSpan ReturnType>( + name: string, + arg2: SugaredSpanOptions | F, + arg3?: Context | F, + arg4?: F + ): ReturnType { + const { opts, ctx, fn } = massageParams(arg2, arg3, arg4); + + const span = this._tracer.startSpan(name, opts, ctx); + return handleFn(span, opts, fn) as ReturnType; + } +} + +/** + * Massages parameters of withSpan and withActiveSpan to allow signature overwrites + * @param arg + * @param arg2 + * @param arg3 + */ +function massageParams ReturnType>( + arg: F | SugaredSpanOptions, + arg2?: F | Context, + arg3?: F +) { + let opts: SugaredSpanOptions | undefined; + let ctx: Context | undefined; + let fn: F; + + if (!arg2 && !arg3) { + fn = arg as F; + } else if (!arg3) { + opts = arg as SugaredSpanOptions; + fn = arg2 as F; + } else { + opts = arg as SugaredSpanOptions; + ctx = arg2 as Context; + fn = arg3 as F; + } + opts = opts ?? {}; + ctx = ctx ?? context.active(); + + return { opts, ctx, fn }; +} + +/** + * Executes fn, returns results and runs onException in the case of exception to allow overwriting of error handling + * @param span + * @param opts + * @param fn + */ +function handleFn ReturnType>( + span: Span, + opts: SugaredSpanOptions, + fn: F +): ReturnType { + const onException = opts.onException ?? defaultOnException; + const errorHandler = (e: Error) => { + onException(e, span); + span.end(); + throw e; + }; + + try { + const ret = fn(span) as Promise>; + // if fn is an async function, attach a recordException and spanEnd callback to the promise + if (typeof ret?.then === 'function') { + return ret.then(val => { + span.end(); + return val; + }, errorHandler) as ReturnType; + } + span.end(); + return ret as ReturnType; + } catch (e) { + // add throw to signal the compiler that this will throw in the inner scope + throw errorHandler(e); + } +} diff --git a/api/test/common/experimental/trace/SugaredTracer.test.ts b/api/test/common/experimental/trace/SugaredTracer.test.ts new file mode 100644 index 0000000000..aa0d01f3d8 --- /dev/null +++ b/api/test/common/experimental/trace/SugaredTracer.test.ts @@ -0,0 +1,157 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { wrapTracer } from '../../../../src/experimental'; +import * as assert from 'assert'; +import { NoopTracerProvider } from '../../../../src/trace/NoopTracerProvider'; +import { NoopTracer } from '../../../../src/trace/NoopTracer'; +import { Span } from '../../../../src'; +import { Context, context, SpanOptions } from '../../../../src'; + +describe('SugaredTracer', () => { + class TestTracer extends NoopTracer { + public calls: IArguments[] = []; + + override startActiveSpan ReturnType>( + name: string, + arg2?: SpanOptions, + arg3?: Context, + arg4?: F + ): ReturnType | undefined { + this.calls.push(arguments); + return super.startActiveSpan(name, arg2, arg3, arg4 as F); + } + + override startSpan( + name: string, + options?: SpanOptions, + _context: Context = context.active() + ): Span { + this.calls.push(arguments); + return super.startSpan(name, options, _context); + } + } + + class TestTracerProvider extends NoopTracerProvider { + override getTracer() { + return new TestTracer(); + } + } + + const tracer = new TestTracerProvider().getTracer(); + const sugaredTracer = wrapTracer(tracer); + + afterEach(() => { + tracer.calls = []; + }); + + describe('wrapTracer()', () => { + it('still provides standard tracer functions', () => { + assert.ok( + typeof sugaredTracer.startSpan === 'function', + 'startSpan is missing' + ); + assert.ok( + typeof sugaredTracer.startActiveSpan === 'function', + 'startActiveSpan is missing' + ); + }); + }); + + describe('withActiveSpan()', () => { + it('proxies value with minimal args', () => { + const result = sugaredTracer.withActiveSpan('test', span => { + return 'result'; + }); + + assert.strictEqual(result, 'result', 'Unexpected result'); + + assert.strictEqual(tracer.calls.length, 2); // ensure that startActiveSpan and startSpan is called + }); + + it('proxies value with context', () => { + const result = sugaredTracer.withActiveSpan( + 'test', + { onException: e => e }, + span => { + return 'result'; + } + ); + + assert.strictEqual(result, 'result', 'Unexpected result'); + + assert.strictEqual(tracer.calls.length, 2); // ensure that startActiveSpan and startSpan is called + }); + + it('proxies value with context', () => { + const result = sugaredTracer.withActiveSpan( + 'test', + { onException: e => e }, + context.active(), + span => { + return 'result'; + } + ); + + assert.strictEqual(result, 'result', 'Unexpected result'); + + assert.strictEqual(tracer.calls.length, 2); // ensure that startActiveSpan and startSpan is called + }); + + it('returns promise if wrapped function returns promise', async () => { + const result = sugaredTracer.withActiveSpan('test', span => { + return Promise.resolve('result'); + }); + + assert.ok(typeof result.then == 'function'); + assert.strictEqual(await result, 'result', 'Unexpected result'); + }); + + it('returns void', () => { + const result = sugaredTracer.withActiveSpan('test', (span: Span) => { + return; + }); + + assert.strictEqual(result, undefined); + }); + }); + + describe('withSpan()', () => { + it('proxies value', () => { + const result = sugaredTracer.withSpan('test', span => { + return 'result'; + }); + + assert.strictEqual(result, 'result', 'Unexpected result'); + }); + + it('returns promise if wrapped function returns promise', async () => { + const result = sugaredTracer.withSpan('test', span => { + return Promise.resolve('result'); + }); + + assert.ok(typeof result.then == 'function'); + assert.strictEqual(await result, 'result', 'Unexpected result'); + }); + + it('returns void', () => { + const result = sugaredTracer.withSpan('test', (span: Span) => { + return; + }); + + assert.strictEqual(result, undefined); + }); + }); +}); diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts index 7ce7111173..a1955e2bb2 100644 --- a/api/test/tree-shaking/tree-shaking.test.ts +++ b/api/test/tree-shaking/tree-shaking.test.ts @@ -24,6 +24,9 @@ import * as realFs from 'fs'; /** * Verify that tree-shaking can be properly applied on the @opentelemetry/api package. * Unused optional apis should be able to be removed from the final bundle. + * + * Webpack doesn't run in node 8 because it requires BigInt. Since we are testing + * build tooling here, we can safely skip tooling we know can't run anyway. */ describe('tree-shaking', () => { const allowedAPIs = ['ContextAPI', 'DiagAPI']; @@ -56,11 +59,14 @@ describe('tree-shaking', () => { }); for (const testAPI of testAPIs) { - it(`verify ${testAPI.name}`, async () => { + it(`verify ${testAPI.name}`, async function () { + if (parseInt(process.versions.node.split('.')[0], 10) < 10) { + this.skip(); + } const sourceCode = ` - import { ${testAPI.export} } from '../../'; - console.log(${testAPI.export}); - `; + import { ${testAPI.export} } from '../../'; + console.log(${testAPI.export}); + `; mfs.mkdirpSync(path.dirname(sourceCodePath)); mfs.writeFileSync(sourceCodePath, sourceCode, { encoding: 'utf8' }); diff --git a/maintenance/bug_triage.md b/doc/contributing/bug_triage.md similarity index 100% rename from maintenance/bug_triage.md rename to doc/contributing/bug_triage.md diff --git a/doc/GUIDELINES.md b/doc/contributing/dependencies.md similarity index 87% rename from doc/GUIDELINES.md rename to doc/contributing/dependencies.md index ea349fdde7..4e12902e8f 100644 --- a/doc/GUIDELINES.md +++ b/doc/contributing/dependencies.md @@ -1,14 +1,10 @@ -# OpenTelemetry JS Code Contribution Guide - -This document outlines the essential guidelines for contributing code to the OpenTelemetry JS repository. These guidelines are designed to ensure consistency, stability, and the highest quality of code across the project. - -## Dependencies +# OpenTelemetry Dependencies This section refers to `"dependencies"` and `"devDependencies"` entries in `package.json` file. > [!IMPORTANT] > Not all libraries follow [Semantic Versioning](https://semver.org/). Even those who do might occasionally introduce breaking changes due to human errors. Exceptions to the guidelines in this document MAY be granted by Approvers or Maintainers to work around this. -### Development Dependencies +## Development Dependencies `"devDependencies"` SHOULD be pinned to reduce the risk of autobreaking the build. Since we cannot use the `package-lock.json` file (because the libraries are distributed without it), control over the version our contributors will get is limited. By using pinned versions, we prevent potential disruptions caused by unpinned versions. @@ -17,7 +13,7 @@ This section refers to `"dependencies"` and `"devDependencies"` entries in `pack > [!NOTE] > As this approach might leave our project with outdated tooling, we adopt `renovate-bot`. This automated dependency update tool proactively opens pull requests upon the release of new patch/minor/major versions. The complete configuration for renovate-bot can be found in [renovate.json](../renovate.json) file. -### @opentelemetry/* dependencies +## @opentelemetry/* dependencies All packages from the `@opentelemetry/` namespace MUST have the same pinned version, as these dependencies are automatically updated on each release by lerna. @@ -25,7 +21,7 @@ All packages from the `@opentelemetry/` namespace MUST have the same pinned vers An exception is granted for dependencies on `@opentelemetry/api`, which, if used by the package SHOULD NOT be included as a `dependency`. `@opentelemetry/api` SHOULD be included as a `peerDependency` instead. The version range of the `peerDependency` SHOULD reflect the minimum supported, and SHOULD NOT allow versions greater than the latest released minor version. -### Third-Party Library Dependencies +## Third-Party Library Dependencies Packages categorized as third-party and listed under the `"dependencies"` section (e.g., @grpc/grpc-js, @grpc/proto-loader, shimmer, etc.) should remain unpinned and utilize the caret (`^`) symbol. This approach offers several advantages: diff --git a/maintenance/npm_workspaces.md b/doc/contributing/npm_workspaces.md similarity index 100% rename from maintenance/npm_workspaces.md rename to doc/contributing/npm_workspaces.md diff --git a/maintenance/releasing.md b/doc/contributing/releasing.md similarity index 100% rename from maintenance/releasing.md rename to doc/contributing/releasing.md diff --git a/doc/metrics.md b/doc/metrics.md index 3f48775e49..1eb873a11d 100644 --- a/doc/metrics.md +++ b/doc/metrics.md @@ -59,7 +59,7 @@ const { getNodeAutoInstrumentations, } = require("@opentelemetry/auto-instrumentations-node"); -const prometheusExporter = new PrometheusExporter({ startServer: true }); +const prometheusExporter = new PrometheusExporter(); const sdk = new opentelemetry.NodeSDK({ // Optional - If omitted, the metrics SDK will not be initialized @@ -147,7 +147,7 @@ const { getNodeAutoInstrumentations, } = require("@opentelemetry/auto-instrumentations-node"); -const prometheusExporter = new PrometheusExporter({ startServer: true }); +const prometheusExporter = new PrometheusExporter(); const sdk = new opentelemetry.NodeSDK({ // Optional - If omitted, the metrics SDK will not be initialized @@ -499,8 +499,8 @@ to use the Prometheus exporter `PrometheusExporter` which is included in the const { PrometheusExporter } = require('@opentelemetry/exporter-prometheus'); const { MeterProvider } = require('@opentelemetry/sdk-metrics'); -// Add your port and startServer to the Prometheus options -const options = { port: 9464, startServer: true }; +// Add your port to the Prometheus options +const options = { port: 9464 }; const exporter = new PrometheusExporter(options); // Creates MeterProvider and installs the exporter as a MetricReader diff --git a/doc/upgrade-guide.md b/doc/upgrade-guide.md new file mode 100644 index 0000000000..7c8ea16f7c --- /dev/null +++ b/doc/upgrade-guide.md @@ -0,0 +1,257 @@ +# Upgrade guidelines + +## 0.37.x to 0.38.0 + +- `@opentelemetry/sdk-node` `NodeSDKConfiguration.defaultAttributes` has been unused and was removed as the concept does not exist in OpenTelemetry anymore + - Please use `NodeSDKConfiguration.resource` instead. + +## 0.35.x to 0.36.0 + +- `@opentelemetry/sdk-node` changed `await start()` to now be synchronous +- `@opentelemetry/sdk-node` changed `await detectResources()` to now be synchronous + +## 0.28.x to 0.29.x + +- `@opentelemetry/exporter-trace-otlp-http` is now exporting `scopeSpans` instead of `instrumentationLibrarySpans` + - this exporter now requires collector version `0.48` and up. +- `@opentelemetry/exporter-metrics-otlp-http` is now exporting `scopeMetrics` instead of `instrumentationLibraryMetrics` + - this exporter now requires collector version `0.48` and up. + +## 0.27.x to 0.28.x + +- In `@opentelemetry/exporter-trace-otlp-http`, `OTLPExporterBase._isShutdown` is replaced with `_shutdownOnce`. + +## 0.26.x to 0.27.x + +Metric and trace exporters are split into separate packages: + +- `@opentelemetry/exporter-otlp-http` => `@opentelemetry/exporter-trace-otlp-http` and `@opentelemetry/exporter-metrics-otlp-http` +- `@opentelemetry/exporter-otlp-grpc` => `@opentelemetry/exporter-trace-otlp-grpc` and `@opentelemetry/exporter-metrics-otlp-grpc` +- `@opentelemetry/exporter-otlp-proto` => `@opentelemetry/exporter-trace-otlp-proto` and `@opentelemetry/exporter-metrics-otlp-proto` + +Metric types are renamed: + +- `@openetelemetry/api-metrics` + - `Meter` + - `createValueRecorder` => `createHistogram` + - `createValueObserver` => `createObservableGauge` + - `createSumObserver` => `createObservableCounter` + - `createUpDownSumObserver` => `createObservableUpDownCounter` + - `ValueRecorder` => `Histogram` + - `ValueObserver` => `ObservableGauge` + - `SumObserver` => `ObservableCounter` + - `UpDownSumObserver` => `ObservableUpDownCounter` + - `ObserverResult` => `ObservableResult` + - `Observation.observer` => `Observation.observable` +- `@opentelemetry/sdk-metrics-base` + - `MetricKind` + - `VALUE_RECORDER` => `HISTOGRAM` + - `SUM_OBSERVER` => `OBSERVABLE_COUNTER` + - `UP_DOWN_SUM_OBSERVER` => `OBSERVABLE_UP_DOWN_COUNTER` + - `VALUE_OBSERVER` => `OBSERVABLE_GAUGE` + +## 0.25.x to 1.x.y + +Collector exporter packages and types are renamed: + +- `@opentelemetry/exporter-collector` => `@opentelemetry/exporter-otlp-http` + - `CollectorExporterBase` => `OTLPExporterBase` + - `CollectorTraceExporter` => `OTLPTraceExporter` + - `CollectorMetricExporter` => `OTLPMetricExporter` + - `CollectorExporterBrowserBase` => `OTLPExporterBrowserBase` + - `CollectorExporterNodeBase` => `OTLPExporterNodeBase` + - `CollectorExporterConfigBase` => `OTLPExporterConfigBase` + - `CollectorExporterError` => `OTLPExporterError` + - `COLLECTOR_SPAN_KIND_MAPPING` => `OTLP_SPAN_KIND_MAPPING` + - `collectorTypes` => `otlpTypes` +- `@opentelemetry/exporter-collector-grpc` => `@opentelemetry/exporter-otlp-grpc` + - `CollectorTraceExporter` => `OTLPTraceExporter` + - `CollectorMetricExporter` => `OTLPMetricExporter` + - `CollectorExporterConfigNode` => `OTLPExporterConfigNode` +- `@opentelemetry/exporter-collector-proto` => `@opentelemetry/exporter-otlp-proto` + - `CollectorExporterNodeBase` => `OTLPExporterNodeBase` + - `CollectorMetricExporter` => `OTLPMetricExporter` + - `CollectorTraceExporter` => `OTLPTraceExporter` +- W3C propagators in @opentelemetry/core were renamed + - `HttpTraceContextPropagator` -> `W3CTraceContextPropagator` + - `HttpBaggagePropagator` -> `W3CBaggagePropagator` + +## 0.24.x to 0.25.x + +- SDKs packages for trace and metrics has been renamed to have a consistent naming schema: + - @opentelemetry/tracing -> @opentelemetry/sdk-trace-base + - @opentelemetry/node -> @opentelemetry/sdk-trace-node + - @opentelemetry/web -> @opentelemetry/sdk-trace-web + - @opentelemetry/metrics -> @opentelemetry/sdk-metrics-base + - @opentelemetry/node-sdk -> @opentelemetry/sdk-node + +## 0.23.x to 0.24.x + +- `ResourceAttributes` renamed to `SemanticResourceAttributes` in the `@opentelemetry/semantic-conventions` package + +## 0.19.x to 0.20.0 + +- `HttpBaggage` renamed to `HttpBaggagePropagator` + +- `HttpTraceContext` renamed to `HttpTraceContextPropagator` + +- `JaegerHttpTracePropagator` renamed to `JaegerPropagator` + +- `serviceName` configuration removed from Collector exporters. Use `service.name` Resource attribute instead. + +- Prometheus exporter added suffix `_total` to counter metrics. + +## 0.18.x to 0.19.0 + +- API is now a peer dependency. This means that users will need to include `@opentelemetry/api` as a dependency of their project in order to use the SDK. NPM version 7+ (Node 15+) should do this automatically. + +- All plugins have been removed in favor of instrumentations. + +- The `@opentelemetry/propagator-b3` package previously exported three propagators: `B3Propagator`,`B3SinglePropagator`, and `B3MultiPropagator`, but now only exports the `B3Propagator`. It extracts b3 context in single and multi-header encodings, and injects context using the single-header encoding by default, but can be configured to inject context using the multi-header endcoding during construction: `new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER })`. If you were previously using the `B3SinglePropagator` or `B3MultiPropagator` directly, you should update your code to use the `B3Propagator` with the appropriate configuration. See the [readme][otel-propagator-b3] for full details and usage. + +- Sampling configuration via environment variable has changed. If you were using `OTEL_SAMPLING_PROBABILITY` then you should replace it with `OTEL_TRACES_SAMPLER=parentbased_traceidratio` and `OTEL_TRACES_SAMPLER_ARG=` where `` is a number in the [0..1] range, e.g. "0.25". Default is 1.0 if unset. + +## 0.17.0 to 0.18.0 + +- `diag.setLogLevel` is removed and LogLevel can be set by an optional second parameter to `setLogger` + +[PR-1975](https://github.com/open-telemetry/opentelemetry-js/pull/1975) + +- Breaking change - The resulting resource MUST have all attributes that are on any of the two input resources. If a key exists on both the old and updating resource, the value of the updating resource MUST be picked - previously it was opposite. + +## 0.16.0 to 0.17.0 + +[PR-1880](https://github.com/open-telemetry/opentelemetry-js/pull/1880) feat(diag-logger): introduce a new global level api.diag for internal diagnostic logging + +[PR-1925](https://github.com/open-telemetry/opentelemetry-js/pull/1925) feat(diag-logger): part 2 - breaking changes - remove api.Logger, api.NoopLogger, core.LogLevel, core.ConsoleLogger + +- These PR's remove the previous `Logger` and `LogLevel` implementations and change the way you should use the replacement `DiagLogger` and `DiagLogLevel`, below are simple examples of how to change your existing usages. + +### Setting the global diagnostic logger + +The new global [`api.diag`](https://github.com/open-telemetry/opentelemetry-js/blob/main/api/src/api/diag.ts) provides the ability to set the global diagnostic logger `setLogger()` and logging level `setLogLevel()`, it is also a `DiagLogger` implementation and should be directly to log diagnostic messages. + +All included logger references have been removed in preference to using the global `api.diag` directly, so you no longer need to pass around the logger instance via function parameters or included as part of the configuration for a component. + +```javascript +import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api"; +// Setting the default Global logger to use the Console +// And optionally change the logging level (Defaults to INFO) +diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR) +``` + +### Using the logger anywhere in the code + +```typescript +import { diag } from "@opentelemetry/api"; + +// Remove or make optional the parameter and don't use it. +export function MyFunction() { + diag.debug("..."); + diag.info("..."); + diag.warn("..."); + diag.error("..."); + diag.verbose(".."); +} + +``` + +### Setting the logger back to a noop + +```typescript +import { diag } from "@opentelemetry/api"; +diag.setLogger(); + +``` + +[PR-1855](https://github.com/open-telemetry/opentelemetry-js/pull/1855) Use instrumentation loader to load plugins and instrumentations + +- Providers do no load the plugins anymore. Also PluginLoader has been removed from providers, use `registerInstrumentations` instead + +```javascript +//Previously in node +const provider = new NodeTracerProvider({ + plugins: { + '@grpc/grpc-js': { + enabled: true, + path: '@opentelemetry/plugin-grpc-js', + }, + } +}); + +// Now +const provider = new NodeTracerProvider(); +const { registerInstrumentations } = require('@opentelemetry/instrumentation'); +registerInstrumentations({ + instrumentations: [ + { + plugins: { + '@grpc/grpc-js': { + enabled: true, + path: '@opentelemetry/plugin-grpc-js', + }, + } + } + ], + tracerProvider: provider, +}); + +// or if you want to load only default instrumentations / plugins +registerInstrumentations({ + tracerProvider: provider, +}); + +//Previously in browser +const provider = new WebTracerProvider({ + plugins: [ + new DocumentLoad() + ] +}); +// Now +const { registerInstrumentations } = require('@opentelemetry/instrumentation'); +const provider = new WebTracerProvider(); +registerInstrumentations({ + instrumentations: [ + new DocumentLoad(), + ], +}); +``` + +- `registerInstrumentations` supports loading old plugins and instrumentations together. It also supports setting tracer provider and meter provider on instrumentations + +[PR-1874](https://github.com/open-telemetry/opentelemetry-js/pull/1874) More specific API type names + +Some types exported from `"@opentelemetry/api"` have been changed to be more specific. + +- `AttributeValue` renamed to `SpanAttributeValue` +- `Attributes` renamed to `SpanAttributes` +- `EntryTtl` renamed to `BaggageEntryTtl` +- `EntryValue` renamed to `BaggageEntryValue` +- `Status` renamed to `SpanStatus` +- `StatusCode` renamed to `SpanStatusCode` + +## 0.15.0 to 0.16.0 + +[PR-1863](https://github.com/open-telemetry/opentelemetry-js/pull/1863) removed public attributes `keepAlive` and `httpAgentOptions` from nodejs `CollectorTraceExporter` and `CollectorMetricExporter` + +## 0.14.0 to 0.15.0 + +[PR-1764](https://github.com/open-telemetry/opentelemetry-js/pull/1764) removed some APIs from `Tracer`: + +- `Tracer.getCurrentSpan()`: use `api.getSpan(api.context.active())` +- `Tracer.withSpan(span)`: use `api.context.with(api.setSpan(api.context.active(), span))` +- `Tracer.bind(target)`: use `api.context.bind(target)` + +[PR-1797](https://github.com/open-telemetry/opentelemetry-js/pull/1797) chore!: split metrics into its own api package: + +- Any references to `require("@opentelemetry/api").metrics` will need to be changed to `require("@opentelemetry/api-metrics").metrics` + +[PR-1725](https://github.com/open-telemetry/opentelemetry-js/pull/1725) Use new gRPC default port + +- The default port used by `@opentelemetry/exporter-collector-grpc` is changed from `55680` to `4317` + +[PR-1749](https://github.com/open-telemetry/opentelemetry-js/pull/1749) chore: improve naming of span related context APIs + +- Rename `[gs]etActiveSpan()` to `[gs]etSpan()` +- Rename `setExtractedSpanContext()` to `setSpanContext()` +- Rename `getParentSpanContext()` to `getSpanContext()` diff --git a/eslint.base.js b/eslint.base.js index 2ec8974641..b17bebcd31 100644 --- a/eslint.base.js +++ b/eslint.base.js @@ -5,10 +5,10 @@ module.exports = { "node", "prettier" ], - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], + extends: ["eslint:recommended", "plugin:prettier/recommended"], parser: "@typescript-eslint/parser", parserOptions: { - "project": "./tsconfig.json" + "project": null, }, rules: { "quotes": ["error", "single", { "avoidEscape": true }], @@ -29,6 +29,11 @@ module.exports = { overrides: [ { files: ['*.ts'], + // Enable typescript-eslint for ts files. + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], + parserOptions: { + "project": "./tsconfig.json" + }, rules: { "@typescript-eslint/no-floating-promises": "error", "@typescript-eslint/no-this-alias": "off", @@ -50,13 +55,24 @@ module.exports = { } }], "@typescript-eslint/no-shadow": ["warn"], + "prefer-rest-params": "off", } }, { files: ["test/**/*.ts"], + // Enable typescript-eslint for ts files. + extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], + parserOptions: { + "project": "./tsconfig.json" + }, rules: { "no-empty": "off", "@typescript-eslint/ban-ts-ignore": "off", + "@typescript-eslint/ban-types": ["warn", { + "types": { + "Function": null, + } + }], "@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-unused-vars": "off", @@ -64,7 +80,8 @@ module.exports = { "@typescript-eslint/no-shadow": ["off"], "@typescript-eslint/no-floating-promises": ["off"], "@typescript-eslint/no-non-null-assertion": ["off"], - "@typescript-eslint/explicit-module-boundary-types": ["off"] + "@typescript-eslint/explicit-module-boundary-types": ["off"], + "prefer-rest-params": "off", } } ] diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index 21641b17c2..64f5aa3e86 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -31,12 +31,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" } } diff --git a/examples/http/package.json b/examples/http/package.json index 12c1a82982..eab1e031c3 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/https/package.json b/examples/https/package.json index ab0ce6de45..6717734858 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -33,14 +33,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 0ce0ea213b..62c03a1f6c 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -32,31 +32,32 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "devDependencies": { - "@babel/core": "^7.6.0", + "@babel/core": "^7.23.6", + "@babel/preset-env": "^7.22.20", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", - "webpack": "^5.65.0", - "webpack-cli": "^4.10.0", + "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.5.0", - "webpack-merge": "^5.8.0" + "webpack-merge": "^5.10.0" }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index e7578b8b1e..2a511424cd 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,17 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-proto": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 0454299c68..a9bd8d8d16 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,9 +6,70 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change -* fix(exporter-metrics-otlp-grpc): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati -* fix(exporter-metrics-otlp-http): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati -* fix(exporter-metrics-otlp-proto): programatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati +### :rocket: (Enhancement) + +* feat(instrumentation): allow LoggerProvider to be specified in Instrumentations [#4314](https://github.com/open-telemetry/opentelemetry-js/pull/4314) @hectorhdzg +* feat(instrumentation): Make `init()` method public [#4418](https://github.com/open-telemetry/opentelemetry-js/pull/4418) +* feat(exporter-metrics-otlp-http): add option to set the exporter aggregation preference [#4409](https://github.com/open-telemetry/opentelemetry-js/pull/4409) @AkselAllas +* feat(node-sdk): add spanProcessors option [#4454](https://github.com/open-telemetry/opentelemetry-js/pull/4454) @naseemkullah + +### :bug: (Bug Fix) + +* fix(sdk-node): allow using samplers when the exporter is defined in the environment [#4394](https://github.com/open-telemetry/opentelemetry-js/pull/4394) @JacksonWeber + +### :books: (Refine Doc) + +### :house: (Internal) + +* refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation [#4420](https://github.com/open-telemetry/opentelemetry-js/pull/4420) @pichlermarc + +## 0.48.0 + +### :boom: Breaking Change + +* fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) + * Fixes a bug where, in some circumstances, ESM instrumentation packages would try to instrument CJS exports on ESM, causing the end-user application to crash. + * This breaking change only affects users that are using the *experimental* `@opentelemetry/instrumentation/hook.mjs` loader hook AND Node.js 18.19 or later: + * This reverts back to an older version of `import-in-the-middle` due to + * This version does not support Node.js 18.19 or later + +### :bug: (Bug Fix) + +* fix(exporter-prometheus): avoid invoking callback synchronously [#4431](https://github.com/open-telemetry/opentelemetry-js/pull/4431) @legendecas +* fix(exporter-logs-otlp-grpc): set User-Agent header [#4398](https://github.com/open-telemetry/opentelemetry-js/pull/4398) @Vunovati +* fix(exporter-logs-otlp-http): set User-Agent header [#4398](https://github.com/open-telemetry/opentelemetry-js/pull/4398) @Vunovati +* fix(exporter-logs-otlp-proto): set User-Agent header [#4398](https://github.com/open-telemetry/opentelemetry-js/pull/4398) @Vunovati +* fix(instrumentation-fetch): compatibility with Map types for fetch headers + +### :house: (Internal) + +* refactor(exporter-prometheus): promisify prometheus tests [#4431](https://github.com/open-telemetry/opentelemetry-js/pull/4431) @legendecas + +## 0.47.0 + +### :boom: Breaking Change + +* fix(exporter-logs-otlp-http)!: programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4351) @Vunovati +* fix(exporter-logs-otlp-proto)!: programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4351) @Vunovati +* fix(exporter-trace-otlp-http)!: programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4351) @Vunovati +* fix(exporter-trace-otlp-proto)!: programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4351) @Vunovati + +### :bug: (Bug Fix) + +* fix(instrumentation): use caret range on import-in-the-middle [#4380](https://github.com/open-telemetry/opentelemetry-js/pull/4380) @pichlermarc +* fix(instrumentation): do not import 'path' in browser runtimes [#4386](https://github.com/open-telemetry/opentelemetry-js/pull/4386) @pichlermarc + * Fixes a bug where bundling for web would fail due to `InstrumentationNodeModuleDefinition` importing `path` + +## 0.46.0 + +### :boom: Breaking Change + +* fix(exporter-metrics-otlp-grpc): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati +* fix(exporter-metrics-otlp-http): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati +* fix(exporter-metrics-otlp-proto): programmatic headers take precedence over environment variables [#2370](https://github.com/open-telemetry/opentelemetry-js/pull/4334) @Vunovati +* fix(otlp-exporter-base)!: decrease default concurrency limit to 30 [#4211](https://github.com/open-telemetry/opentelemetry-js/pull/4211) @pichlermarc + * fixes a memory leak on prolonged collector unavailability + * this change is marked as breaking as it changes defaults ### :rocket: (Enhancement) @@ -16,11 +77,13 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) +* fix(sdk-logs): await async resources in log processors * fix(sdk-logs): avoid map attribute set when count limit exceeded * fix(instrumentation-fetch): only access navigator if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063) * allows for experimental usage of this instrumentation with non-browser runtimes * fix(instrumentation-http): memory leak when responses are not resumed * fix(instrumentation-http): Do not mutate given headers object for outgoing http requests. Fixes aws-sdk signing error on retries. [#4346](https://github.com/open-telemetry/opentelemetry-js/pull/4346) +* fix(instrumentation): support Node.js v18.19.0 by using import-in-the-middle@1.6.0 ## 0.45.1 diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index 66ffd91b28..fc1d6103a9 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.45.1", + "version": "0.48.0", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index fdb37e7ee5..9825944191 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.45.1", + "version": "0.48.0", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json index 705a987dba..7fbb42d173 100644 --- a/experimental/examples/logs/package.json +++ b/experimental/examples/logs/package.json @@ -1,14 +1,14 @@ { "name": "logs-example", - "version": "0.45.1", + "version": "0.48.0", "private": true, "scripts": { "start": "ts-node index.ts" }, "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" }, "devDependencies": { "@types/node": "18.6.5", diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index f3eb091759..6b8f246f1a 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.45.1", + "version": "0.48.0", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -31,13 +31,13 @@ "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", - "@opentelemetry/shim-opencensus": "0.45.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "@opentelemetry/shim-opencensus": "0.48.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/experimental/examples/prometheus/README.md b/experimental/examples/prometheus/README.md index 398427baec..f82f2fc484 100644 --- a/experimental/examples/prometheus/README.md +++ b/experimental/examples/prometheus/README.md @@ -60,6 +60,7 @@ If you are using the default configurations, the prometheus client will be avail

+

## Useful links diff --git a/experimental/examples/prometheus/images/prom-gauge.png b/experimental/examples/prometheus/images/prom-gauge.png new file mode 100644 index 0000000000..1f530a1c19 Binary files /dev/null and b/experimental/examples/prometheus/images/prom-gauge.png differ diff --git a/experimental/examples/prometheus/index.js b/experimental/examples/prometheus/index.js index cd267db019..8f8dd96836 100644 --- a/experimental/examples/prometheus/index.js +++ b/experimental/examples/prometheus/index.js @@ -39,6 +39,23 @@ observableCounter.addCallback(observableResult => { observableResult.observe(counter, attributes); }); +const randomMetricPromise = async () => + new Promise(resolve => + setTimeout(resolve(Math.floor(Math.random() * 100)), 50) + ); + +const observableGauge = meter.createObservableGauge( + 'observable_gauge_requests', + { + description: 'Example of an ObservableGauge', + } +); +// Callbacks are run when metrics are scraped +observableGauge.addCallback(async observableResult => { + const value = await randomMetricPromise(); + observableResult.observe(value, attributes); +}); + // Record metrics setInterval(() => { counter++; diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index c5d1c2a1bd..c6f5c171ed 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.45.1", + "version": "0.48.0", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0" } } diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 0b2683f6d1..c228b8b769 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-events", - "version": "0.45.1", + "version": "0.48.0", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -82,7 +82,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events", "sideEffects": false diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index b96782520f..088cd21045 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-logs", - "version": "0.45.1", + "version": "0.48.0", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -82,7 +82,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 0f5a864a8d..c74612569f 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,12 +48,11 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -73,10 +72,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts index 675ce83db0..19b747fca7 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts @@ -28,6 +28,11 @@ import { createExportLogsServiceRequest, IExportLogsServiceRequest, } from '@opentelemetry/otlp-transformer'; +import { VERSION } from './version'; + +const USER_AGENT = { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, +}; /** * OTLP Logs Exporter for Node @@ -38,9 +43,12 @@ export class OTLPLogExporter { constructor(config: OTLPGRPCExporterConfigNode = {}) { super(config); - const headers = baggageUtils.parseKeyPairsIntoRecord( - getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS - ); + const headers = { + ...USER_AGENT, + ...baggageUtils.parseKeyPairsIntoRecord( + getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS + ), + }; this.metadata ||= new Metadata(); for (const [k, v] of Object.entries(headers)) { this.metadata.set(k, v); diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts index 9bda910924..bb57df4a4e 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts @@ -37,6 +37,7 @@ import { IExportLogsServiceRequest, IResourceLogs, } from '@opentelemetry/otlp-transformer'; +import { VERSION } from '../src/version'; const logsServiceProtoPath = 'opentelemetry/proto/collector/logs/v1/logs_service.proto'; @@ -333,6 +334,12 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = ''; }); + it('should include user-agent header by default', () => { + const collectorExporter = new OTLPLogExporter(); + assert.deepStrictEqual(collectorExporter.metadata?.get('User-Agent'), [ + `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + ]); + }); it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar'; const collectorExporter = new OTLPLogExporter(); diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 2045ebbac8..c26d135544 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.45.1", + "version": "0.48.0", "publishConfig": { "access": "public" }, @@ -72,8 +72,9 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -96,18 +97,18 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" } } diff --git a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts index 25a1b194ab..9181b082cf 100644 --- a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts @@ -25,6 +25,11 @@ import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base'; import { createExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; import { getDefaultUrl } from '../config'; +import { VERSION } from '../../version'; + +const USER_AGENT = { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, +}; /** * Collector Logs Exporter for Node @@ -41,9 +46,11 @@ export class OTLPLogExporter }); this.headers = { ...this.headers, + ...USER_AGENT, ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS ), + ...config.headers, }; } diff --git a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts index 6dac23b580..5920657b5b 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts @@ -31,6 +31,7 @@ import { import { PassThrough, Stream } from 'stream'; import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; import { ExportResultCode } from '@opentelemetry/core'; +import { VERSION } from '../../src/version'; let fakeRequest: PassThrough; @@ -79,6 +80,14 @@ describe('OTLPLogExporter', () => { assert.ok(exporter instanceof OTLPLogExporter); }); + it('should include user-agent header by default', () => { + const exporter = new OTLPLogExporter(); + assert.strictEqual( + exporter.headers['User-Agent'], + `OTel-OTLP-Exporter-JavaScript/${VERSION}` + ); + }); + it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS = 'foo=bar'; const exporter = new OTLPLogExporter(); @@ -94,6 +103,18 @@ describe('OTLPLogExporter', () => { delete envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS; delete envSource.OTEL_EXPORTER_OTLP_LOGS_TIMEOUT; }); + + it('should override headers defined via env with headers defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar,bar=foo'; + const collectorExporter = new OTLPLogExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual(collectorExporter.headers.foo, 'constructor'); + assert.strictEqual(collectorExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); }); describe('getDefaultUrl', () => { diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index f521f934b3..58bfd99a16 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.45.1", + "version": "0.48.0", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -85,22 +86,22 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts index 53191c0625..caec7352ff 100644 --- a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts @@ -30,6 +30,11 @@ import { } from '@opentelemetry/otlp-transformer'; import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import { VERSION } from '../../version'; + +const USER_AGENT = { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, +}; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/logs'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; @@ -46,12 +51,14 @@ export class OTLPLogExporter { constructor(config: OTLPExporterConfigBase = {}) { super(config); - this.headers = Object.assign( - this.headers, - baggageUtils.parseKeyPairsIntoRecord( + this.headers = { + ...this.headers, + ...USER_AGENT, + ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS - ) - ); + ), + ...config.headers, + }; } convert(logs: ReadableLogRecord[]): IExportLogsServiceRequest { return createExportLogsServiceRequest(logs); diff --git a/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts index 0810109e81..9778c95046 100644 --- a/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts @@ -39,6 +39,7 @@ import { } from '@opentelemetry/otlp-proto-exporter-base'; import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import { VERSION } from '../../src/version'; let fakeRequest: PassThrough; @@ -92,6 +93,15 @@ describe('OTLPLogExporter - node with proto over http', () => { envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = ''; }); + it('should override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar/'; + const constructorDefinedEndpoint = 'http://constructor/v1/logs'; + const collectorExporter = new OTLPLogExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual(collectorExporter.url, constructorDefinedEndpoint); + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; + }); it('should add root path when signal url defined in env contains no path and no root path', () => { envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = 'http://foo.bar'; const collectorExporter = new OTLPLogExporter(); @@ -128,6 +138,13 @@ describe('OTLPLogExporter - node with proto over http', () => { ); envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = ''; }); + it('should include user-agent header by default', () => { + const exporter = new OTLPLogExporter(); + assert.strictEqual( + exporter.headers['User-Agent'], + `OTel-OTLP-Exporter-JavaScript/${VERSION}` + ); + }); it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS = 'foo=bar'; const collectorExporter = new OTLPLogExporter(); @@ -143,6 +160,17 @@ describe('OTLPLogExporter - node with proto over http', () => { envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS = ''; envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; }); + it('should override headers defined via env with headers defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar,bar=foo'; + const collectorExporter = new OTLPLogExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual(collectorExporter.headers.foo, 'constructor'); + assert.strictEqual(collectorExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); }); describe('export', () => { diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index c1bf7a8701..96ac24368e 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/otlp-exporter-base": "0.48.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -70,11 +70,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 434ee6b946..5fcf8a9895 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -87,19 +88,19 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts index e4d3273239..aeb3b94ca7 100644 --- a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts @@ -49,6 +49,7 @@ export class OTLPTraceExporter ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_TRACES_HEADERS ), + ...config.headers, }; } diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts index 3de60027dc..e9af4ec37b 100644 --- a/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts @@ -118,6 +118,15 @@ describe('OTLPTraceExporter - node with json over http', () => { envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = ''; }); + it('should override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://foo.bar'; + const constructorDefinedEndpoint = 'http://constructor/v1/traces'; + const collectorExporter = new OTLPTraceExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual(collectorExporter.url, constructorDefinedEndpoint); + envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = ''; + }); it('should add root path when signal url defined in env contains no path and no root path', () => { envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://foo.bar'; const collectorExporter = new OTLPTraceExporter(); @@ -177,6 +186,17 @@ describe('OTLPTraceExporter - node with json over http', () => { envSource.OTEL_EXPORTER_OTLP_TRACES_HEADERS = ''; envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; }); + it('should override headers defined via env with headers defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar,bar=foo'; + const collectorExporter = new OTLPTraceExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual(collectorExporter.headers.foo, 'constructor'); + assert.strictEqual(collectorExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); it('should use compression defined via env', () => { envSource.OTEL_EXPORTER_OTLP_COMPRESSION = 'gzip'; const collectorExporter = new OTLPTraceExporter(); diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 3f2cf7221e..a45eca0e74 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -63,6 +63,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -84,7 +85,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", + "webpack": "5.89.0", "webpack-cli": "4.10.0", "webpack-merge": "5.9.0" }, @@ -92,12 +93,12 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts index 210a16145a..be115583cd 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts @@ -52,6 +52,7 @@ export class OTLPTraceExporter ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_TRACES_HEADERS ), + ...config.headers, }; } diff --git a/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts index c0a604ce90..b18c5a39de 100644 --- a/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts @@ -103,6 +103,15 @@ describe('OTLPTraceExporter - node with proto over http', () => { envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = ''; }); + it('should override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar/'; + const constructorDefinedEndpoint = 'http://constructor/v1/traces'; + const collectorExporter = new OTLPTraceExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual(collectorExporter.url, constructorDefinedEndpoint); + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; + }); it('should add root path when signal url defined in env contains no path and no root path', () => { envSource.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://foo.bar'; const collectorExporter = new OTLPTraceExporter(); @@ -155,6 +164,17 @@ describe('OTLPTraceExporter - node with proto over http', () => { envSource.OTEL_EXPORTER_OTLP_TRACES_HEADERS = ''; envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; }); + it('should override headers defined via env with headers defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar,bar=foo'; + const collectorExporter = new OTLPTraceExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual(collectorExporter.headers.foo, 'constructor'); + assert.strictEqual(collectorExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); }); describe('export', () => { diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 240db2e9db..73e04d8ca8 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,6 +54,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -74,16 +75,16 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 4c6bc50ded..8abca3acb6 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -47,7 +47,6 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", @@ -69,12 +68,12 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index f3756acc7e..1598876660 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -87,19 +88,19 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts index db8a4a32ed..66a5bfb596 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -21,6 +21,8 @@ import { InstrumentType, PushMetricExporter, ResourceMetrics, + Aggregation, + AggregationSelector, } from '@opentelemetry/sdk-metrics'; import { AggregationTemporalityPreference, @@ -104,6 +106,16 @@ function chooseTemporalitySelector( return chooseTemporalitySelectorFromEnvironment(); } +function chooseAggregationSelector( + config: OTLPMetricExporterOptions | undefined +) { + if (config?.aggregationPreference) { + return config.aggregationPreference; + } else { + return (_instrumentType: any) => Aggregation.Default(); + } +} + export class OTLPMetricExporterBase< T extends OTLPExporterBase< OTLPMetricExporterOptions, @@ -114,9 +126,11 @@ export class OTLPMetricExporterBase< { public _otlpExporter: T; private _aggregationTemporalitySelector: AggregationTemporalitySelector; + private _aggregationSelector: AggregationSelector; constructor(exporter: T, config?: OTLPMetricExporterOptions) { this._otlpExporter = exporter; + this._aggregationSelector = chooseAggregationSelector(config); this._aggregationTemporalitySelector = chooseTemporalitySelector( config?.temporalityPreference ); @@ -137,6 +151,10 @@ export class OTLPMetricExporterBase< return Promise.resolve(); } + selectAggregation(instrumentType: InstrumentType): Aggregation { + return this._aggregationSelector(instrumentType); + } + selectAggregationTemporality( instrumentType: InstrumentType ): AggregationTemporality { diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts index e03bde4e75..ff805e3b17 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts @@ -15,12 +15,16 @@ */ import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { AggregationTemporality } from '@opentelemetry/sdk-metrics'; +import { + AggregationTemporality, + AggregationSelector, +} from '@opentelemetry/sdk-metrics'; export interface OTLPMetricExporterOptions extends OTLPExporterConfigBase { temporalityPreference?: | AggregationTemporalityPreference | AggregationTemporality; + aggregationPreference?: AggregationSelector; } export enum AggregationTemporalityPreference { diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts index 66f6af3006..b72ed5f8cb 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts @@ -43,7 +43,9 @@ import { } from '../metricsHelper'; import { MockedResponse } from './nodeHelpers'; import { + Aggregation, AggregationTemporality, + ExplicitBucketHistogramAggregation, InstrumentType, ResourceMetrics, } from '@opentelemetry/sdk-metrics'; @@ -218,6 +220,31 @@ describe('OTLPMetricExporter - node with json over http', () => { }); }); + describe('aggregation', () => { + it('aggregationSelector calls the selector supplied to the constructor', () => { + const aggregation = new ExplicitBucketHistogramAggregation([ + 0, 100, 100000, + ]); + const exporter = new OTLPMetricExporter({ + aggregationPreference: _instrumentType => aggregation, + }); + assert.equal( + exporter.selectAggregation(InstrumentType.COUNTER), + aggregation + ); + }); + + it('aggregationSelector returns the default aggregation preference when nothing is supplied', () => { + const exporter = new OTLPMetricExporter({ + aggregationPreference: _instrumentType => Aggregation.Default(), + }); + assert.equal( + exporter.selectAggregation(InstrumentType.COUNTER), + Aggregation.Default() + ); + }); + }); + describe('when configuring via environment', () => { const envSource = process.env; it('should use url defined in env that ends with root path and append version and signal path', () => { diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 9140fe518d..964ae9e89c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,13 +75,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index ae94e09dee..88f16c6a7d 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts index 42e4fc41e8..bd763de3f0 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts @@ -44,6 +44,7 @@ export class PrometheusExporter extends MetricReader { private readonly _prefix?: string; private readonly _appendTimestamp: boolean; private _serializer: PrometheusSerializer; + private _startServerPromise: Promise | undefined; // This will be required when histogram is implemented. Leaving here so it is not forgotten // Histogram cannot have a attribute named 'le' @@ -95,7 +96,8 @@ export class PrometheusExporter extends MetricReader { callback(err); }); } else if (callback) { - callback(); + // Do not invoke callback immediately to avoid zalgo problem. + queueMicrotask(callback); } } @@ -142,7 +144,7 @@ export class PrometheusExporter extends MetricReader { * Starts the Prometheus export server */ startServer(): Promise { - return new Promise((resolve, reject) => { + this._startServerPromise ??= new Promise((resolve, reject) => { this._server.once('error', reject); this._server.listen( { @@ -157,6 +159,8 @@ export class PrometheusExporter extends MetricReader { } ); }); + + return this._startServerPromise; } /** diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts index d512240677..66bab19ef8 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts @@ -53,46 +53,37 @@ describe('PrometheusExporter', () => { }); describe('constructor', () => { - it('should construct an exporter', done => { + it('should construct an exporter', async () => { const exporter = new PrometheusExporter(); assert.ok(typeof exporter.startServer === 'function'); assert.ok(typeof exporter.shutdown === 'function'); - exporter.shutdown().then(done); + await exporter.shutdown(); }); - it('should start the server by default and call the callback', done => { + it('should start the server by default and call the callback', async () => { const port = PrometheusExporter.DEFAULT_OPTIONS.port; const endpoint = PrometheusExporter.DEFAULT_OPTIONS.endpoint; - const exporter = new PrometheusExporter({}, () => { - const url = `http://localhost:${port}${endpoint}`; - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 200); - exporter.shutdown().then(() => { - return done(); - }); - }); - }); + const exporter = new PrometheusExporter(); + await exporter.startServer(); + const url = `http://localhost:${port}${endpoint}`; + await request(url); + await exporter.shutdown(); }); - it('should pass server error to callback when port is already in use', done => { - const firstExporter = new PrometheusExporter({}, error => { - if (error) { - // This should not happen as the port should not be already in use when the test starts. - done(error); - } - }); - const secondExporter = new PrometheusExporter({}, error => { - firstExporter - .shutdown() - .then(() => secondExporter.shutdown()) - .then(() => - done( - error - ? undefined - : 'Second exporter should respond with EADDRINUSE but did not pass it to callback' - ) - ); - }); + it('should pass server error to callback when port is already in use', async () => { + const firstExporter = new PrometheusExporter(); + await firstExporter.startServer(); + + const secondExporter = new PrometheusExporter(); + await assert.rejects( + secondExporter.startServer(), + { code: 'EADDRINUSE' }, + 'Second exporter should respond with EADDRINUSE but did not pass it to callback' + ); + + await Promise.all( + [firstExporter, secondExporter].map(it => it.shutdown()) + ); }); it('should not start the server if preventServerStart is passed as an option', () => { @@ -102,51 +93,35 @@ describe('PrometheusExporter', () => { }); describe('server', () => { - it('should start on startServer() and call the callback', done => { + it('should start on startServer() and call the callback', async () => { const exporter = new PrometheusExporter({ port: 9722, preventServerStart: true, }); - exporter.startServer().then(() => { - exporter.shutdown().then(() => { - return done(); - }); - }); + await exporter.startServer(); + await exporter.shutdown(); }); - it('should listen on the default port and default endpoint', done => { + it('should listen on the default port and default endpoint', async () => { const port = PrometheusExporter.DEFAULT_OPTIONS.port; const endpoint = PrometheusExporter.DEFAULT_OPTIONS.endpoint; - const exporter = new PrometheusExporter({}, () => { - const url = `http://localhost:${port}${endpoint}`; - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 200); - exporter.shutdown().then(() => { - return done(); - }); - }); - }); + const exporter = new PrometheusExporter(); + const url = `http://localhost:${port}${endpoint}`; + await request(url); + await exporter.shutdown(); }); - it('should listen on a custom port and endpoint if provided', done => { + it('should listen on a custom port and endpoint if provided', async () => { const port = 9991; const endpoint = '/metric'; - const exporter = new PrometheusExporter( - { - port, - endpoint, - }, - () => { - const url = `http://localhost:${port}${endpoint}`; - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 200); - exporter.shutdown().then(() => { - return done(); - }); - }); - } - ); + const exporter = new PrometheusExporter({ + port, + endpoint, + }); + const url = `http://localhost:${port}${endpoint}`; + await request(url); + await exporter.shutdown(); }); it('should unref the server to allow graceful termination', () => { @@ -169,67 +144,36 @@ describe('PrometheusExporter', () => { assert.strictEqual(exporter['_port'], 1234); }); - it('should not require endpoints to start with a slash', done => { + it('should not require endpoints to start with a slash', async () => { const port = 9991; const endpoint = 'metric'; + const url = `http://localhost:${port}/metric`; - const exporter = new PrometheusExporter( - { - port, - endpoint, - }, - () => { - const url = `http://localhost:${port}/metric`; - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 200); - exporter.shutdown().then(() => { - const exporter2 = new PrometheusExporter( - { - port, - endpoint: `/${endpoint}`, - }, - () => { - const url = `http://localhost:${port}/metric`; - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 200); - exporter2.stopServer().then(() => { - return done(); - }); - }); - } - ); - }); - }); - } - ); + const exporter = new PrometheusExporter({ + port, + endpoint, + }); + await exporter.startServer(); + await request(url); + await exporter.stopServer(); }); - it('should return a HTTP status 404 if the endpoint does not match', done => { + it('should return a HTTP status 404 if the endpoint does not match', async () => { const port = 9912; const endpoint = '/metrics'; - const exporter = new PrometheusExporter( - { - port, - endpoint, - }, - () => { - const url = `http://localhost:${port}/invalid`; - - http.get(url, (res: any) => { - assert.strictEqual(res.statusCode, 404); - exporter.shutdown().then(() => { - return done(); - }); - }); - } - ); + const exporter = new PrometheusExporter({ + port, + endpoint, + }); + const url = `http://localhost:${port}/invalid`; + + await assert.rejects(request(url), { statusCode: 404 }); + await exporter.shutdown(); }); - it('should call a provided callback on shutdown regardless of if the server is running', done => { + it('should call a provided callback on shutdown regardless of if the server is running', async () => { const exporter = new PrometheusExporter({ preventServerStart: true }); - exporter.shutdown().then(() => { - return done(); - }); + await exporter.shutdown(); }); it('should able to call getMetricsRequestHandler function to generate response with metrics', async () => { @@ -259,18 +203,17 @@ describe('PrometheusExporter', () => { let meterProvider: MeterProvider; let meter: Meter; - beforeEach(done => { - exporter = new PrometheusExporter({}, () => { - meterProvider = new MeterProvider({ - readers: [exporter], - }); - meter = meterProvider.getMeter('test-prometheus', '1'); - done(); + beforeEach(async () => { + exporter = new PrometheusExporter(); + meterProvider = new MeterProvider({ + readers: [exporter], }); + meter = meterProvider.getMeter('test-prometheus', '1'); + await exporter.startServer(); }); - afterEach(done => { - exporter.shutdown().then(done); + afterEach(async () => { + await exporter.shutdown(); }); it('should export a count aggregation', async () => { @@ -347,7 +290,7 @@ describe('PrometheusExporter', () => { ]); }); - it('should export multiple attributes on manual shutdown', done => { + it('should export multiple attributes on manual shutdown', async () => { const counter = meter.createCounter('counter_total', { description: 'a test description', }); @@ -355,16 +298,10 @@ describe('PrometheusExporter', () => { counter.add(10, { counterKey1: 'attributeValue1' }); counter.add(20, { counterKey1: 'attributeValue2' }); counter.add(30, { counterKey1: 'attributeValue3' }); - meterProvider.shutdown().then(() => { - // exporter has been shut down along with meter provider. - http - .get('http://localhost:9464/metrics', res => { - errorHandler(done)(new Error('unreachable')); - }) - .on('error', (err: any) => { - assert.equal(err.code, 'ECONNREFUSED'); - done(); - }); + await meterProvider.shutdown(); + // exporter has been shut down along with meter provider. + await assert.rejects(request('http://localhost:9464/metrics'), { + code: 'ECONNREFUSED', }); }); @@ -547,124 +484,84 @@ describe('PrometheusExporter', () => { await exporter.shutdown(); }); - it('should use a configured name prefix', done => { - exporter = new PrometheusExporter( - { - prefix: 'test_prefix', - }, - async () => { - setup(exporter); - http - .get('http://localhost:9464/metrics', res => { - res.on('data', chunk => { - const body = chunk.toString(); - const lines = body.split('\n'); - - assert.deepStrictEqual(lines, [ - ...serializedDefaultResourceLines, - '# HELP test_prefix_counter_total description missing', - '# TYPE test_prefix_counter_total counter', - 'test_prefix_counter_total{key1="attributeValue1"} 10', - '', - ]); - - done(); - }); - }) - .on('error', errorHandler(done)); - } - ); + it('should use a configured name prefix', async () => { + exporter = new PrometheusExporter({ + prefix: 'test_prefix', + }); + setup(exporter); + const body = await request('http://localhost:9464/metrics'); + const lines = body.split('\n'); + + assert.deepStrictEqual(lines, [ + ...serializedDefaultResourceLines, + '# HELP test_prefix_counter_total description missing', + '# TYPE test_prefix_counter_total counter', + 'test_prefix_counter_total{key1="attributeValue1"} 10', + '', + ]); }); - it('should use a configured port', done => { - exporter = new PrometheusExporter( - { - port: 8080, - }, - async () => { - setup(exporter); - http - .get('http://localhost:8080/metrics', res => { - res.on('data', chunk => { - const body = chunk.toString(); - const lines = body.split('\n'); - - assert.deepStrictEqual(lines, [ - ...serializedDefaultResourceLines, - '# HELP counter_total description missing', - '# TYPE counter_total counter', - 'counter_total{key1="attributeValue1"} 10', - '', - ]); - - done(); - }); - }) - .on('error', errorHandler(done)); - } - ); + it('should use a configured port', async () => { + exporter = new PrometheusExporter({ + port: 8080, + }); + + setup(exporter); + const body = await request('http://localhost:8080/metrics'); + const lines = body.split('\n'); + + assert.deepStrictEqual(lines, [ + ...serializedDefaultResourceLines, + '# HELP counter_total description missing', + '# TYPE counter_total counter', + 'counter_total{key1="attributeValue1"} 10', + '', + ]); }); - it('should use a configured endpoint', done => { - exporter = new PrometheusExporter( - { - endpoint: '/test', - }, - async () => { - setup(exporter); - http - .get('http://localhost:9464/test', res => { - res.on('data', chunk => { - const body = chunk.toString(); - const lines = body.split('\n'); - - assert.deepStrictEqual(lines, [ - ...serializedDefaultResourceLines, - '# HELP counter_total description missing', - '# TYPE counter_total counter', - 'counter_total{key1="attributeValue1"} 10', - '', - ]); - - done(); - }); - }) - .on('error', errorHandler(done)); - } - ); + it('should use a configured endpoint', async () => { + exporter = new PrometheusExporter({ + endpoint: '/test', + }); + + setup(exporter); + const body = await request('http://localhost:9464/test'); + const lines = body.split('\n'); + + assert.deepStrictEqual(lines, [ + ...serializedDefaultResourceLines, + '# HELP counter_total description missing', + '# TYPE counter_total counter', + 'counter_total{key1="attributeValue1"} 10', + '', + ]); }); - it('should export a metric with timestamp', done => { - exporter = new PrometheusExporter( - { - appendTimestamp: true, - }, - async () => { - setup(exporter); - http - .get('http://localhost:9464/metrics', res => { - res.on('data', chunk => { - const body = chunk.toString(); - const lines = body.split('\n'); - - assert.deepStrictEqual(lines, [ - ...serializedDefaultResourceLines, - '# HELP counter_total description missing', - '# TYPE counter_total counter', - `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, - '', - ]); - - done(); - }); - }) - .on('error', errorHandler(done)); - } - ); + it('should export a metric with timestamp', async () => { + exporter = new PrometheusExporter({ + appendTimestamp: true, + }); + setup(exporter); + const body = await request('http://localhost:9464/metrics'); + const lines = body.split('\n'); + + assert.deepStrictEqual(lines, [ + ...serializedDefaultResourceLines, + '# HELP counter_total description missing', + '# TYPE counter_total counter', + `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + '', + ]); }); }); }); +class RequestStatusError extends Error { + constructor(public statusCode: number | undefined) { + super('request failed with non-200 code'); + } +} + function request(url: string): Promise { return new Promise((resolve, reject) => { http @@ -677,7 +574,7 @@ function request(url: string): Promise { }); res.on('end', () => { if (res.statusCode !== 200) { - reject(new Error('request failed with non-200 code')); + reject(new RequestStatusError(res.statusCode)); return; } resolve(result); @@ -686,7 +583,3 @@ function request(url: string): Promise { .on('error', reject); }); } - -function errorHandler(done: Mocha.Done): (err: Error) => void { - return err => done(err); -} diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts index b2d9e36f8f..6368cf82c3 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts @@ -622,7 +622,6 @@ describe('PrometheusSerializer', () => { it('should serialize non-finite values', async () => { const serializer = new PrometheusSerializer(); const cases = [ - [NaN, 'NaN'], [-Infinity, '-Inf'], [+Infinity, '+Inf'], ] as [number, string][]; diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index b24b189782..a3b488d3c6 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -55,10 +55,11 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -80,18 +81,18 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index 90213a8c69..7960b38535 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -168,6 +168,10 @@ export class FetchInstrumentation extends InstrumentationBase< api.propagation.inject(api.context.active(), options.headers, { set: (h, k, v) => h.set(k, typeof v === 'string' ? v : String(v)), }); + } else if (options.headers instanceof Map) { + api.propagation.inject(api.context.active(), options.headers, { + set: (h, k, v) => h.set(k, typeof v === 'string' ? v : String(v)), + }); } else { const headers: Partial> = {}; api.propagation.inject(api.context.active(), headers); diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts index 14dcec9978..832b2d8999 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts @@ -503,7 +503,7 @@ describe('fetch', () => { assert.ok(r.headers.get('foo') === 'bar'); }); - it('should keep custom headers with url, untyped request object and typed headers object', () => { + it('should keep custom headers with url, untyped request object and typed (Headers) headers object', () => { const url = 'url'; const init = { headers: new Headers({ foo: 'bar' }), @@ -521,6 +521,17 @@ describe('fetch', () => { assert.ok(init.headers['foo'] === 'bar'); }); + it('should keep custom headers with url, untyped request object and typed (Map) headers object', () => { + const url = 'url'; + const init = { + headers: new Map().set('foo', 'bar'), + }; + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore variable init not of RequestInit type + window.fetch(url, init).catch(() => {}); + assert.ok(init.headers.get('foo') === 'bar'); + }); + it('should pass request object as first parameter to the original function (#2411)', () => { const r = new Request(url); return window.fetch(r).then( diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 807efaa2ab..5435c3ac9a 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,15 +50,16 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", "@protobuf-ts/grpc-transport": "2.9.3", "@protobuf-ts/runtime": "2.9.3", "@protobuf-ts/runtime-rpc": "2.9.3", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -73,8 +74,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts similarity index 95% rename from experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts index 9e26062d1c..f4c5470d16 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts @@ -18,19 +18,22 @@ import type { EventEmitter } from 'events'; import type { Span, SpanStatus } from '@opentelemetry/api'; import type { Client, Metadata, ServiceError } from '@grpc/grpc-js'; import type * as grpcJs from '@grpc/grpc-js'; -import type { GrpcJsInstrumentation } from './'; -import type { GrpcClientFunc, SendUnaryDataCallback } from './types'; -import type { metadataCaptureType } from '../internal-types'; +import type { GrpcInstrumentation } from './'; +import type { + GrpcClientFunc, + SendUnaryDataCallback, + metadataCaptureType, +} from './internal-types'; import { propagation, context } from '@opentelemetry/api'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import { AttributeNames } from '../enums/AttributeNames'; -import { GRPC_STATUS_CODE_OK } from '../status-code'; +import { AttributeNames } from './enums/AttributeNames'; +import { GRPC_STATUS_CODE_OK } from './status-code'; import { _grpcStatusCodeToSpanStatus, _grpcStatusCodeToOpenTelemetryStatusCode, _methodIsIgnored, -} from '../utils'; +} from './utils'; import { errorMonitor } from 'events'; /** @@ -38,7 +41,7 @@ import { errorMonitor } from 'events'; * with both possible casings e.g. "TestMethod" & "testMethod" */ export function getMethodsToWrap( - this: GrpcJsInstrumentation, + this: GrpcInstrumentation, client: typeof Client, methods: { [key: string]: { originalName?: string } } ): string[] { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts deleted file mode 100644 index 36be79fd07..0000000000 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ /dev/null @@ -1,591 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import type { EventEmitter } from 'events'; - -import type { - Server, - serialize as Serialize, - deserialize as Deserialize, - Metadata, - Client, - ServiceDefinition, - loadPackageDefinition, - GrpcObject, -} from '@grpc/grpc-js'; - -import type * as grpcJs from '@grpc/grpc-js'; - -import type { - ServerCallWithMeta, - SendUnaryDataCallback, - ServerRegisterFunction, - HandleCall, - MakeClientConstructorFunction, - PackageDefinition, - GrpcClientFunc, - ClientRequestFunction, -} from './types'; -import type { GrpcInstrumentationConfig } from '../types'; -import type { metadataCaptureType } from '../internal-types'; - -import { - context, - propagation, - ROOT_CONTEXT, - SpanOptions, - SpanKind, - trace, - Span, -} from '@opentelemetry/api'; -import { - InstrumentationNodeModuleDefinition, - isWrapped, - InstrumentationBase, -} from '@opentelemetry/instrumentation'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; - -import { - shouldNotTraceServerCall, - handleServerFunction, - handleUntracedServerFunction, -} from './serverUtils'; -import { - getMethodsToWrap, - makeGrpcClientRemoteCall, - extractMetadataOrSpliceDefault, - setSpanContext, - patchedCallback, - patchResponseStreamEvents, - patchResponseMetadataEvent, - extractMetadataOrSplice, -} from './clientUtils'; -import { - _extractMethodAndService, - metadataCapture, - URI_REGEX, - _methodIsIgnored, -} from '../utils'; -import { AttributeValues } from '../enums/AttributeValues'; - -export class GrpcJsInstrumentation extends InstrumentationBase { - private _metadataCapture: metadataCaptureType; - - constructor( - name: string, - version: string, - config?: GrpcInstrumentationConfig - ) { - super(name, version, config); - this._metadataCapture = this._createMetadataCapture(); - } - - init() { - return [ - new InstrumentationNodeModuleDefinition( - '@grpc/grpc-js', - ['1.*'], - (moduleExports, version) => { - this._diag.debug(`Applying patch for @grpc/grpc-js@${version}`); - if (isWrapped(moduleExports.Server.prototype.register)) { - this._unwrap(moduleExports.Server.prototype, 'register'); - } - // Patch Server methods - this._wrap( - moduleExports.Server.prototype, - 'register', - this._patchServer() - ); - // Patch Client methods - if (isWrapped(moduleExports.makeGenericClientConstructor)) { - this._unwrap(moduleExports, 'makeGenericClientConstructor'); - } - this._wrap( - moduleExports, - 'makeGenericClientConstructor', - this._patchClient(moduleExports) - ); - if (isWrapped(moduleExports.makeClientConstructor)) { - this._unwrap(moduleExports, 'makeClientConstructor'); - } - this._wrap( - moduleExports, - 'makeClientConstructor', - this._patchClient(moduleExports) - ); - if (isWrapped(moduleExports.loadPackageDefinition)) { - this._unwrap(moduleExports, 'loadPackageDefinition'); - } - this._wrap( - moduleExports, - 'loadPackageDefinition', - this._patchLoadPackageDefinition(moduleExports) - ); - if (isWrapped(moduleExports.Client.prototype)) { - this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); - this._unwrap( - moduleExports.Client.prototype, - 'makeClientStreamRequest' - ); - this._unwrap( - moduleExports.Client.prototype, - 'makeServerStreamRequest' - ); - this._unwrap( - moduleExports.Client.prototype, - 'makeBidiStreamRequest' - ); - } - this._wrap( - moduleExports.Client.prototype, - 'makeUnaryRequest', - this._patchClientRequestMethod(moduleExports, false) as any - ); - this._wrap( - moduleExports.Client.prototype, - 'makeClientStreamRequest', - this._patchClientRequestMethod(moduleExports, false) as any - ); - this._wrap( - moduleExports.Client.prototype, - 'makeServerStreamRequest', - this._patchClientRequestMethod(moduleExports, true) as any - ); - this._wrap( - moduleExports.Client.prototype, - 'makeBidiStreamRequest', - this._patchClientRequestMethod(moduleExports, true) as any - ); - return moduleExports; - }, - (moduleExports, version) => { - if (moduleExports === undefined) return; - this._diag.debug(`Removing patch for @grpc/grpc-js@${version}`); - - this._unwrap(moduleExports.Server.prototype, 'register'); - this._unwrap(moduleExports, 'makeClientConstructor'); - this._unwrap(moduleExports, 'makeGenericClientConstructor'); - this._unwrap(moduleExports, 'loadPackageDefinition'); - this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); - this._unwrap( - moduleExports.Client.prototype, - 'makeClientStreamRequest' - ); - this._unwrap( - moduleExports.Client.prototype, - 'makeServerStreamRequest' - ); - this._unwrap(moduleExports.Client.prototype, 'makeBidiStreamRequest'); - } - ), - ]; - } - - override getConfig(): GrpcInstrumentationConfig { - return super.getConfig(); - } - - override setConfig(config?: GrpcInstrumentationConfig): void { - super.setConfig(config); - this._metadataCapture = this._createMetadataCapture(); - } - - /** - * Patch for grpc.Server.prototype.register(...) function. Provides auto-instrumentation for - * client_stream, server_stream, bidi, unary server handler calls. - */ - private _patchServer(): ( - originalRegister: ServerRegisterFunction - ) => ServerRegisterFunction { - const instrumentation = this; - return (originalRegister: ServerRegisterFunction) => { - const config = this.getConfig(); - instrumentation._diag.debug('patched gRPC server'); - return function register( - this: Server, - name: string, - handler: HandleCall, - serialize: Serialize, - deserialize: Deserialize, - type: string - ): boolean { - const originalRegisterResult = originalRegister.call( - this, - name, - handler, - serialize, - deserialize, - type - ); - const handlerSet = this['handlers'].get(name); - - instrumentation._wrap( - handlerSet, - 'func', - (originalFunc: HandleCall) => { - return function func( - this: typeof handlerSet, - call: ServerCallWithMeta, - callback: SendUnaryDataCallback - ) { - const self = this; - - if (shouldNotTraceServerCall(name, config.ignoreGrpcMethods)) { - return handleUntracedServerFunction( - type, - originalFunc, - call, - callback - ); - } - - const spanName = `grpc.${name.replace('/', '')}`; - const spanOptions: SpanOptions = { - kind: SpanKind.SERVER, - }; - - instrumentation._diag.debug( - `patch func: ${JSON.stringify(spanOptions)}` - ); - - context.with( - propagation.extract(ROOT_CONTEXT, call.metadata, { - get: (carrier, key) => carrier.get(key).map(String), - keys: carrier => Object.keys(carrier.getMap()), - }), - () => { - const { service, method } = _extractMethodAndService(name); - - const span = instrumentation.tracer - .startSpan(spanName, spanOptions) - .setAttributes({ - [SemanticAttributes.RPC_SYSTEM]: - AttributeValues.RPC_SYSTEM, - [SemanticAttributes.RPC_METHOD]: method, - [SemanticAttributes.RPC_SERVICE]: service, - }); - - instrumentation._metadataCapture.server.captureRequestMetadata( - span, - call.metadata - ); - - instrumentation._wrap( - call, - 'sendMetadata', - originalSendMetadata => (responseMetadata: Metadata) => { - instrumentation._metadataCapture.server.captureResponseMetadata( - span, - responseMetadata - ); - originalSendMetadata.call(call, responseMetadata); - } - ); - - context.with(trace.setSpan(context.active(), span), () => { - handleServerFunction.call( - self, - span, - type, - originalFunc, - call, - callback - ); - }); - } - ); - }; - } - ); - return originalRegisterResult; - } as typeof Server.prototype.register; - }; - } - - /** - * Patch for grpc.Client.make*Request(...) functions. - * Provides auto-instrumentation for client requests when using a Client without - * makeGenericClientConstructor/makeClientConstructor - */ - private _patchClientRequestMethod( - grpcLib: typeof grpcJs, - hasResponseStream: boolean - ): ( - original: ClientRequestFunction - ) => ClientRequestFunction { - const instrumentation = this; - return (original: ClientRequestFunction) => { - instrumentation._diag.debug( - 'patched makeClientStreamRequest on grpc client' - ); - - return function makeClientStreamRequest(this: grpcJs.Client) { - // method must always be at first position - const method = arguments[0]; - const { name, service, methodAttributeValue } = - instrumentation._splitMethodString(method); - - // Do not attempt to trace/inject context if method is ignored - if ( - method != null && - _methodIsIgnored( - methodAttributeValue, - instrumentation.getConfig().ignoreGrpcMethods - ) - ) { - return original.apply(this, [...arguments]); - } - - const modifiedArgs = [...arguments]; - const metadata = extractMetadataOrSplice(grpcLib, modifiedArgs, 4); - - const span = instrumentation.createClientSpan( - name, - methodAttributeValue, - service, - metadata - ); - instrumentation.extractNetMetadata(this, span); - - // Callback is only present when there is no responseStream - if (!hasResponseStream) { - // Replace the callback with the patched one if it is there. - // If the callback arg is not a function on the last position then the client will throw - // and never call the callback -> so there's nothing to patch - const lastArgIndex = modifiedArgs.length - 1; - const callback = modifiedArgs[lastArgIndex]; - if (typeof callback === 'function') { - modifiedArgs[lastArgIndex] = patchedCallback(span, callback); - } - } - - return context.with(trace.setSpan(context.active(), span), () => { - setSpanContext(metadata); - - const call = original.apply(this, [...modifiedArgs]); - patchResponseMetadataEvent( - span, - call, - instrumentation._metadataCapture - ); - - // Subscribe to response stream events when there's a response stream. - if (hasResponseStream) { - patchResponseStreamEvents(span, call); - } - - return call; - }); - }; - }; - } - - /** - * Entry point for applying client patches to `grpc.makeClientConstructor(...)` equivalents - * @param this GrpcJsPlugin - */ - private _patchClient( - grpcClient: typeof grpcJs - ): ( - original: MakeClientConstructorFunction - ) => MakeClientConstructorFunction { - const instrumentation = this; - return (original: MakeClientConstructorFunction) => { - instrumentation._diag.debug('patching client'); - return function makeClientConstructor( - this: typeof Client, - methods: ServiceDefinition, - serviceName: string, - options?: object - ) { - const client = original.call(this, methods, serviceName, options); - instrumentation._massWrap( - client.prototype, - getMethodsToWrap.call(instrumentation, client, methods), - instrumentation._getPatchedClientMethods(grpcClient) - ); - return client; - }; - }; - } - - /** - * Entry point for client patching for grpc.loadPackageDefinition(...) - * @param this - GrpcJsPlugin - */ - private _patchLoadPackageDefinition(grpcClient: typeof grpcJs) { - const instrumentation = this; - instrumentation._diag.debug('patching loadPackageDefinition'); - return (original: typeof loadPackageDefinition) => { - return function patchedLoadPackageDefinition( - this: null, - packageDef: PackageDefinition - ) { - const result: GrpcObject = original.call( - this, - packageDef - ) as GrpcObject; - instrumentation._patchLoadedPackage(grpcClient, result); - return result; - } as typeof loadPackageDefinition; - }; - } - - /** - * Parse initial client call properties and start a span to trace its execution - */ - private _getPatchedClientMethods( - grpcClient: typeof grpcJs - ): (original: GrpcClientFunc) => () => EventEmitter { - const instrumentation = this; - return (original: GrpcClientFunc) => { - instrumentation._diag.debug('patch all client methods'); - function clientMethodTrace(this: Client) { - const name = `grpc.${original.path.replace('/', '')}`; - const args = [...arguments]; - const metadata = extractMetadataOrSpliceDefault.call( - instrumentation, - grpcClient, - original, - args - ); - const { service, method } = _extractMethodAndService(original.path); - - const span = instrumentation.tracer - .startSpan(name, { kind: SpanKind.CLIENT }) - .setAttributes({ - [SemanticAttributes.RPC_SYSTEM]: 'grpc', - [SemanticAttributes.RPC_METHOD]: method, - [SemanticAttributes.RPC_SERVICE]: service, - }); - instrumentation.extractNetMetadata(this, span); - - instrumentation._metadataCapture.client.captureRequestMetadata( - span, - metadata - ); - - return context.with(trace.setSpan(context.active(), span), () => - makeGrpcClientRemoteCall( - instrumentation._metadataCapture, - original, - args, - metadata, - this - )(span) - ); - } - Object.assign(clientMethodTrace, original); - return clientMethodTrace; - }; - } - - private _splitMethodString(method: string) { - if (method == null) { - return { name: '', service: '', methodAttributeValue: '' }; - } - const name = `grpc.${method.replace('/', '')}`; - const { service, method: methodAttributeValue } = - _extractMethodAndService(method); - return { name, service, methodAttributeValue }; - } - - private createClientSpan( - name: string, - methodAttributeValue: string, - service: string, - metadata?: grpcJs.Metadata - ) { - const span = this.tracer - .startSpan(name, { kind: SpanKind.CLIENT }) - .setAttributes({ - [SemanticAttributes.RPC_SYSTEM]: 'grpc', - [SemanticAttributes.RPC_METHOD]: methodAttributeValue, - [SemanticAttributes.RPC_SERVICE]: service, - }); - - if (metadata != null) { - this._metadataCapture.client.captureRequestMetadata(span, metadata); - } - return span; - } - - private extractNetMetadata(client: grpcJs.Client, span: Span) { - // set net.peer.* from target (e.g., "dns:otel-productcatalogservice:8080") as a hint to APMs - const parsedUri = URI_REGEX.exec(client.getChannel().getTarget()); - if (parsedUri != null && parsedUri.groups != null) { - span.setAttribute( - SemanticAttributes.NET_PEER_NAME, - parsedUri.groups['name'] - ); - span.setAttribute( - SemanticAttributes.NET_PEER_PORT, - parseInt(parsedUri.groups['port']) - ); - } - } - - /** - * Utility function to patch *all* functions loaded through a proto file. - * Recursively searches for Client classes and patches all methods, reversing the - * parsing done by grpc.loadPackageDefinition - * https://github.com/grpc/grpc-node/blob/1d14203c382509c3f36132bd0244c99792cb6601/packages/grpc-js/src/make-client.ts#L200-L217 - */ - private _patchLoadedPackage( - grpcClient: typeof grpcJs, - result: GrpcObject - ): void { - Object.values(result).forEach(service => { - if (typeof service === 'function') { - this._massWrap( - service.prototype, - getMethodsToWrap.call(this, service, service.service), - this._getPatchedClientMethods.call(this, grpcClient) - ); - } else if (typeof service.format !== 'string') { - // GrpcObject - this._patchLoadedPackage.call(this, grpcClient, service as GrpcObject); - } - }); - } - - private _createMetadataCapture(): metadataCaptureType { - const config = this.getConfig(); - - return { - client: { - captureRequestMetadata: metadataCapture( - 'request', - config.metadataToSpanAttributes?.client?.requestMetadata ?? [] - ), - captureResponseMetadata: metadataCapture( - 'response', - config.metadataToSpanAttributes?.client?.responseMetadata ?? [] - ), - }, - server: { - captureRequestMetadata: metadataCapture( - 'request', - config.metadataToSpanAttributes?.server?.requestMetadata ?? [] - ), - captureResponseMetadata: metadataCapture( - 'response', - config.metadataToSpanAttributes?.server?.responseMetadata ?? [] - ), - }, - }; - } -} diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts deleted file mode 100644 index 06ca7c0b61..0000000000 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import type { EventEmitter } from 'events'; -import type { CALL_SPAN_ENDED } from './serverUtils'; -import type { - requestCallback, - ServerUnaryCall, - ServerReadableStream, - ServerWritableStream, - ServerDuplexStream, - Metadata, - Server, - makeGenericClientConstructor, -} from '@grpc/grpc-js'; - -/** - * Server Unary callback type - */ -export type SendUnaryDataCallback = requestCallback; - -/** - * Intersection type of all grpc server call types - */ -export type ServerCall = - | ServerUnaryCall - | ServerReadableStream - | ServerWritableStream - | ServerDuplexStream; - -/** - * {@link ServerCall} ServerCall extended with misc. missing utility types - */ -export type ServerCallWithMeta = ServerCall & { - metadata: Metadata; -}; - -/** - * EventEmitter with span ended symbol indicator - */ -export type GrpcEmitter = EventEmitter & { [CALL_SPAN_ENDED]?: boolean }; - -/** - * Grpc client callback function extended with missing utility types - */ -export type GrpcClientFunc = ((...args: unknown[]) => GrpcEmitter) & { - path: string; - requestStream: boolean; - responseStream: boolean; -}; - -export type ServerRegisterFunction = typeof Server.prototype.register; - -export type ClientRequestFunction = ( - ...args: unknown[] -) => ReturnType; - -export type MakeClientConstructorFunction = typeof makeGenericClientConstructor; - -export type { HandleCall } from '@grpc/grpc-js/build/src/server-call'; -export type { PackageDefinition } from '@grpc/grpc-js/build/src/make-client'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts index 5e1bb947d1..3e02b5fc9c 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts @@ -14,5 +14,5 @@ * limitations under the License. */ -export * from './instrumentation'; +export { GrpcInstrumentation } from './instrumentation'; export type { GrpcInstrumentationConfig } from './types'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts index bb6e095cf7..3a04c24e1f 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts @@ -14,32 +14,181 @@ * limitations under the License. */ -import type { GrpcInstrumentationConfig } from './types'; -import type { MeterProvider, TracerProvider } from '@opentelemetry/api'; +import type { EventEmitter } from 'events'; -import { VERSION } from './version'; -import { GrpcJsInstrumentation } from './grpc-js'; +import type { + Server, + serialize as Serialize, + deserialize as Deserialize, + Metadata, + Client, + ServiceDefinition, + loadPackageDefinition, + GrpcObject, +} from '@grpc/grpc-js'; -/** The metadata key under which span context is stored as a binary value. */ -export const GRPC_TRACE_KEY = 'grpc-trace-bin'; +import type * as grpcJs from '@grpc/grpc-js'; -export class GrpcInstrumentation { - private _grpcJsInstrumentation: GrpcJsInstrumentation; +import type { + ServerCallWithMeta, + SendUnaryDataCallback, + ServerRegisterFunction, + HandleCall, + MakeClientConstructorFunction, + PackageDefinition, + GrpcClientFunc, + ClientRequestFunction, + metadataCaptureType, +} from './internal-types'; +import type { GrpcInstrumentationConfig } from './types'; - public readonly instrumentationName: string = - '@opentelemetry/instrumentation-grpc'; - public readonly instrumentationVersion: string = VERSION; +import { + context, + propagation, + ROOT_CONTEXT, + SpanOptions, + SpanKind, + trace, + Span, +} from '@opentelemetry/api'; +import { + InstrumentationNodeModuleDefinition, + isWrapped, + InstrumentationBase, +} from '@opentelemetry/instrumentation'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + +import { + shouldNotTraceServerCall, + handleServerFunction, + handleUntracedServerFunction, +} from './serverUtils'; +import { + getMethodsToWrap, + makeGrpcClientRemoteCall, + extractMetadataOrSpliceDefault, + setSpanContext, + patchedCallback, + patchResponseStreamEvents, + patchResponseMetadataEvent, + extractMetadataOrSplice, +} from './clientUtils'; +import { + _extractMethodAndService, + metadataCapture, + URI_REGEX, + _methodIsIgnored, +} from './utils'; +import { AttributeValues } from './enums/AttributeValues'; +import { VERSION } from './version'; + +export class GrpcInstrumentation extends InstrumentationBase { + private _metadataCapture: metadataCaptureType; constructor(config?: GrpcInstrumentationConfig) { - this._grpcJsInstrumentation = new GrpcJsInstrumentation( - this.instrumentationName, - this.instrumentationVersion, - config - ); + super('@opentelemetry/instrumentation-grpc', VERSION, config); + this._metadataCapture = this._createMetadataCapture(); } - public setConfig(config?: GrpcInstrumentationConfig) { - this._grpcJsInstrumentation.setConfig(config); + init() { + return [ + new InstrumentationNodeModuleDefinition( + '@grpc/grpc-js', + ['1.*'], + (moduleExports, version) => { + this._diag.debug(`Applying patch for @grpc/grpc-js@${version}`); + if (isWrapped(moduleExports.Server.prototype.register)) { + this._unwrap(moduleExports.Server.prototype, 'register'); + } + // Patch Server methods + this._wrap( + moduleExports.Server.prototype, + 'register', + this._patchServer() + ); + // Patch Client methods + if (isWrapped(moduleExports.makeGenericClientConstructor)) { + this._unwrap(moduleExports, 'makeGenericClientConstructor'); + } + this._wrap( + moduleExports, + 'makeGenericClientConstructor', + this._patchClient(moduleExports) + ); + if (isWrapped(moduleExports.makeClientConstructor)) { + this._unwrap(moduleExports, 'makeClientConstructor'); + } + this._wrap( + moduleExports, + 'makeClientConstructor', + this._patchClient(moduleExports) + ); + if (isWrapped(moduleExports.loadPackageDefinition)) { + this._unwrap(moduleExports, 'loadPackageDefinition'); + } + this._wrap( + moduleExports, + 'loadPackageDefinition', + this._patchLoadPackageDefinition(moduleExports) + ); + if (isWrapped(moduleExports.Client.prototype)) { + this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); + this._unwrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeBidiStreamRequest' + ); + } + this._wrap( + moduleExports.Client.prototype, + 'makeUnaryRequest', + this._patchClientRequestMethod(moduleExports, false) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest', + this._patchClientRequestMethod(moduleExports, false) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest', + this._patchClientRequestMethod(moduleExports, true) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeBidiStreamRequest', + this._patchClientRequestMethod(moduleExports, true) as any + ); + return moduleExports; + }, + (moduleExports, version) => { + if (moduleExports === undefined) return; + this._diag.debug(`Removing patch for @grpc/grpc-js@${version}`); + + this._unwrap(moduleExports.Server.prototype, 'register'); + this._unwrap(moduleExports, 'makeClientConstructor'); + this._unwrap(moduleExports, 'makeGenericClientConstructor'); + this._unwrap(moduleExports, 'loadPackageDefinition'); + this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); + this._unwrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest' + ); + this._unwrap(moduleExports.Client.prototype, 'makeBidiStreamRequest'); + } + ), + ]; } /** @@ -47,37 +196,398 @@ export class GrpcInstrumentation { * Public reference to the protected BaseInstrumentation `_config` instance to be used by this * plugin's external helper functions */ - public getConfig(): GrpcInstrumentationConfig { - // grpcNative and grpcJs have their own config copy which should be identical so just pick one - return this._grpcJsInstrumentation.getConfig(); + override getConfig(): GrpcInstrumentationConfig { + return super.getConfig(); } - init() { - // sub instrumentations will already be init when constructing them - return; + override setConfig(config?: GrpcInstrumentationConfig): void { + super.setConfig(config); + this._metadataCapture = this._createMetadataCapture(); + } + + /** + * Patch for grpc.Server.prototype.register(...) function. Provides auto-instrumentation for + * client_stream, server_stream, bidi, unary server handler calls. + */ + private _patchServer(): ( + originalRegister: ServerRegisterFunction + ) => ServerRegisterFunction { + const instrumentation = this; + return (originalRegister: ServerRegisterFunction) => { + const config = this.getConfig(); + instrumentation._diag.debug('patched gRPC server'); + return function register( + this: Server, + name: string, + handler: HandleCall, + serialize: Serialize, + deserialize: Deserialize, + type: string + ): boolean { + const originalRegisterResult = originalRegister.call( + this, + name, + handler, + serialize, + deserialize, + type + ); + const handlerSet = this['handlers'].get(name); + + instrumentation._wrap( + handlerSet, + 'func', + (originalFunc: HandleCall) => { + return function func( + this: typeof handlerSet, + call: ServerCallWithMeta, + callback: SendUnaryDataCallback + ) { + const self = this; + + if (shouldNotTraceServerCall(name, config.ignoreGrpcMethods)) { + return handleUntracedServerFunction( + type, + originalFunc, + call, + callback + ); + } + + const spanName = `grpc.${name.replace('/', '')}`; + const spanOptions: SpanOptions = { + kind: SpanKind.SERVER, + }; + + instrumentation._diag.debug( + `patch func: ${JSON.stringify(spanOptions)}` + ); + + context.with( + propagation.extract(ROOT_CONTEXT, call.metadata, { + get: (carrier, key) => carrier.get(key).map(String), + keys: carrier => Object.keys(carrier.getMap()), + }), + () => { + const { service, method } = _extractMethodAndService(name); + + const span = instrumentation.tracer + .startSpan(spanName, spanOptions) + .setAttributes({ + [SemanticAttributes.RPC_SYSTEM]: + AttributeValues.RPC_SYSTEM, + [SemanticAttributes.RPC_METHOD]: method, + [SemanticAttributes.RPC_SERVICE]: service, + }); + + instrumentation._metadataCapture.server.captureRequestMetadata( + span, + call.metadata + ); + + instrumentation._wrap( + call, + 'sendMetadata', + originalSendMetadata => (responseMetadata: Metadata) => { + instrumentation._metadataCapture.server.captureResponseMetadata( + span, + responseMetadata + ); + originalSendMetadata.call(call, responseMetadata); + } + ); + + context.with(trace.setSpan(context.active(), span), () => { + handleServerFunction.call( + self, + span, + type, + originalFunc, + call, + callback + ); + }); + } + ); + }; + } + ); + return originalRegisterResult; + } as typeof Server.prototype.register; + }; + } + + /** + * Patch for grpc.Client.make*Request(...) functions. + * Provides auto-instrumentation for client requests when using a Client without + * makeGenericClientConstructor/makeClientConstructor + */ + private _patchClientRequestMethod( + grpcLib: typeof grpcJs, + hasResponseStream: boolean + ): ( + original: ClientRequestFunction + ) => ClientRequestFunction { + const instrumentation = this; + return (original: ClientRequestFunction) => { + instrumentation._diag.debug( + 'patched makeClientStreamRequest on grpc client' + ); + + return function makeClientStreamRequest(this: grpcJs.Client) { + // method must always be at first position + const method = arguments[0]; + const { name, service, methodAttributeValue } = + instrumentation._splitMethodString(method); + + // Do not attempt to trace/inject context if method is ignored + if ( + method != null && + _methodIsIgnored( + methodAttributeValue, + instrumentation.getConfig().ignoreGrpcMethods + ) + ) { + return original.apply(this, [...arguments]); + } + + const modifiedArgs = [...arguments]; + const metadata = extractMetadataOrSplice(grpcLib, modifiedArgs, 4); + + const span = instrumentation.createClientSpan( + name, + methodAttributeValue, + service, + metadata + ); + instrumentation.extractNetMetadata(this, span); + + // Callback is only present when there is no responseStream + if (!hasResponseStream) { + // Replace the callback with the patched one if it is there. + // If the callback arg is not a function on the last position then the client will throw + // and never call the callback -> so there's nothing to patch + const lastArgIndex = modifiedArgs.length - 1; + const callback = modifiedArgs[lastArgIndex]; + if (typeof callback === 'function') { + modifiedArgs[lastArgIndex] = patchedCallback(span, callback); + } + } + + return context.with(trace.setSpan(context.active(), span), () => { + setSpanContext(metadata); + + const call = original.apply(this, [...modifiedArgs]); + patchResponseMetadataEvent( + span, + call, + instrumentation._metadataCapture + ); + + // Subscribe to response stream events when there's a response stream. + if (hasResponseStream) { + patchResponseStreamEvents(span, call); + } + + return call; + }); + }; + }; } - enable() { - this._grpcJsInstrumentation.enable(); + /** + * Entry point for applying client patches to `grpc.makeClientConstructor(...)` equivalents + * @param this GrpcJsPlugin + */ + private _patchClient( + grpcClient: typeof grpcJs + ): ( + original: MakeClientConstructorFunction + ) => MakeClientConstructorFunction { + const instrumentation = this; + return (original: MakeClientConstructorFunction) => { + instrumentation._diag.debug('patching client'); + return function makeClientConstructor( + this: typeof Client, + methods: ServiceDefinition, + serviceName: string, + options?: object + ) { + const client = original.call(this, methods, serviceName, options); + instrumentation._massWrap( + client.prototype, + getMethodsToWrap.call(instrumentation, client, methods), + instrumentation._getPatchedClientMethods(grpcClient) + ); + return client; + }; + }; } - disable() { - this._grpcJsInstrumentation.disable(); + /** + * Entry point for client patching for grpc.loadPackageDefinition(...) + * @param this - GrpcJsPlugin + */ + private _patchLoadPackageDefinition(grpcClient: typeof grpcJs) { + const instrumentation = this; + instrumentation._diag.debug('patching loadPackageDefinition'); + return (original: typeof loadPackageDefinition) => { + return function patchedLoadPackageDefinition( + this: null, + packageDef: PackageDefinition + ) { + const result: GrpcObject = original.call( + this, + packageDef + ) as GrpcObject; + instrumentation._patchLoadedPackage(grpcClient, result); + return result; + } as typeof loadPackageDefinition; + }; } /** - * Sets MeterProvider to this plugin - * @param meterProvider + * Parse initial client call properties and start a span to trace its execution */ - public setMeterProvider(meterProvider: MeterProvider) { - this._grpcJsInstrumentation.setMeterProvider(meterProvider); + private _getPatchedClientMethods( + grpcClient: typeof grpcJs + ): (original: GrpcClientFunc) => () => EventEmitter { + const instrumentation = this; + return (original: GrpcClientFunc) => { + instrumentation._diag.debug('patch all client methods'); + function clientMethodTrace(this: Client) { + const name = `grpc.${original.path.replace('/', '')}`; + const args = [...arguments]; + const metadata = extractMetadataOrSpliceDefault.call( + instrumentation, + grpcClient, + original, + args + ); + const { service, method } = _extractMethodAndService(original.path); + + const span = instrumentation.tracer + .startSpan(name, { kind: SpanKind.CLIENT }) + .setAttributes({ + [SemanticAttributes.RPC_SYSTEM]: 'grpc', + [SemanticAttributes.RPC_METHOD]: method, + [SemanticAttributes.RPC_SERVICE]: service, + }); + instrumentation.extractNetMetadata(this, span); + + instrumentation._metadataCapture.client.captureRequestMetadata( + span, + metadata + ); + + return context.with(trace.setSpan(context.active(), span), () => + makeGrpcClientRemoteCall( + instrumentation._metadataCapture, + original, + args, + metadata, + this + )(span) + ); + } + Object.assign(clientMethodTrace, original); + return clientMethodTrace; + }; + } + + private _splitMethodString(method: string) { + if (method == null) { + return { name: '', service: '', methodAttributeValue: '' }; + } + const name = `grpc.${method.replace('/', '')}`; + const { service, method: methodAttributeValue } = + _extractMethodAndService(method); + return { name, service, methodAttributeValue }; + } + + private createClientSpan( + name: string, + methodAttributeValue: string, + service: string, + metadata?: grpcJs.Metadata + ) { + const span = this.tracer + .startSpan(name, { kind: SpanKind.CLIENT }) + .setAttributes({ + [SemanticAttributes.RPC_SYSTEM]: 'grpc', + [SemanticAttributes.RPC_METHOD]: methodAttributeValue, + [SemanticAttributes.RPC_SERVICE]: service, + }); + + if (metadata != null) { + this._metadataCapture.client.captureRequestMetadata(span, metadata); + } + return span; + } + + private extractNetMetadata(client: grpcJs.Client, span: Span) { + // set net.peer.* from target (e.g., "dns:otel-productcatalogservice:8080") as a hint to APMs + const parsedUri = URI_REGEX.exec(client.getChannel().getTarget()); + if (parsedUri != null && parsedUri.groups != null) { + span.setAttribute( + SemanticAttributes.NET_PEER_NAME, + parsedUri.groups['name'] + ); + span.setAttribute( + SemanticAttributes.NET_PEER_PORT, + parseInt(parsedUri.groups['port']) + ); + } } /** - * Sets TraceProvider to this plugin - * @param tracerProvider + * Utility function to patch *all* functions loaded through a proto file. + * Recursively searches for Client classes and patches all methods, reversing the + * parsing done by grpc.loadPackageDefinition + * https://github.com/grpc/grpc-node/blob/1d14203c382509c3f36132bd0244c99792cb6601/packages/grpc-js/src/make-client.ts#L200-L217 */ - public setTracerProvider(tracerProvider: TracerProvider) { - this._grpcJsInstrumentation.setTracerProvider(tracerProvider); + private _patchLoadedPackage( + grpcClient: typeof grpcJs, + result: GrpcObject + ): void { + Object.values(result).forEach(service => { + if (typeof service === 'function') { + this._massWrap( + service.prototype, + getMethodsToWrap.call(this, service, service.service), + this._getPatchedClientMethods.call(this, grpcClient) + ); + } else if (typeof service.format !== 'string') { + // GrpcObject + this._patchLoadedPackage.call(this, grpcClient, service as GrpcObject); + } + }); + } + + private _createMetadataCapture(): metadataCaptureType { + const config = this.getConfig(); + + return { + client: { + captureRequestMetadata: metadataCapture( + 'request', + config.metadataToSpanAttributes?.client?.requestMetadata ?? [] + ), + captureResponseMetadata: metadataCapture( + 'response', + config.metadataToSpanAttributes?.client?.responseMetadata ?? [] + ), + }, + server: { + captureRequestMetadata: metadataCapture( + 'request', + config.metadataToSpanAttributes?.server?.requestMetadata ?? [] + ), + captureResponseMetadata: metadataCapture( + 'response', + config.metadataToSpanAttributes?.server?.responseMetadata ?? [] + ), + }, + }; } } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts index 50d337b636..9e87e57a7c 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts @@ -15,7 +15,18 @@ */ import type { Span } from '@opentelemetry/api'; -import type { Metadata } from '@grpc/grpc-js'; +import type { EventEmitter } from 'events'; +import type { CALL_SPAN_ENDED } from './serverUtils'; +import type { + requestCallback, + ServerUnaryCall, + ServerReadableStream, + ServerWritableStream, + ServerDuplexStream, + Server, + Metadata, + makeGenericClientConstructor, +} from '@grpc/grpc-js'; export type metadataCaptureType = { client: { @@ -27,3 +38,49 @@ export type metadataCaptureType = { captureResponseMetadata: (span: Span, metadata: Metadata) => void; }; }; + +/** + * Server Unary callback type + */ +export type SendUnaryDataCallback = requestCallback; + +/** + * Intersection type of all grpc server call types + */ +export type ServerCall = + | ServerUnaryCall + | ServerReadableStream + | ServerWritableStream + | ServerDuplexStream; + +/** + * {@link ServerCall} ServerCall extended with misc. missing utility types + */ +export type ServerCallWithMeta = ServerCall & { + metadata: Metadata; +}; + +/** + * EventEmitter with span ended symbol indicator + */ +export type GrpcEmitter = EventEmitter & { [CALL_SPAN_ENDED]?: boolean }; + +/** + * Grpc client callback function extended with missing utility types + */ +export type GrpcClientFunc = ((...args: unknown[]) => GrpcEmitter) & { + path: string; + requestStream: boolean; + responseStream: boolean; +}; + +export type ServerRegisterFunction = typeof Server.prototype.register; + +export type ClientRequestFunction = ( + ...args: unknown[] +) => ReturnType; + +export type MakeClientConstructorFunction = typeof makeGenericClientConstructor; + +export type { HandleCall } from '@grpc/grpc-js/build/src/server-call'; +export type { PackageDefinition } from '@grpc/grpc-js/build/src/make-client'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/serverUtils.ts similarity index 96% rename from experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/serverUtils.ts index ad07828e68..142c65f3ce 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/serverUtils.ts @@ -34,8 +34,8 @@ import type { SendUnaryDataCallback, GrpcEmitter, HandleCall, -} from './types'; -import type { IgnoreMatcher } from '../types'; +} from './internal-types'; +import type { IgnoreMatcher } from './types'; import { context, SpanStatusCode } from '@opentelemetry/api'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; @@ -43,9 +43,9 @@ import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { _grpcStatusCodeToOpenTelemetryStatusCode, _methodIsIgnored, -} from '../utils'; -import { AttributeNames } from '../enums/AttributeNames'; -import { GRPC_STATUS_CODE_OK } from '../status-code'; +} from './utils'; +import { AttributeNames } from './enums/AttributeNames'; +import { GRPC_STATUS_CODE_OK } from './status-code'; export const CALL_SPAN_ENDED = Symbol('opentelemetry call span ended'); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts index b7e2210298..dc2918d874 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts @@ -15,7 +15,7 @@ */ import { runTests } from './helper'; -import { GrpcInstrumentation } from '../src/instrumentation'; +import { GrpcInstrumentation } from '../src'; const instrumentation = new GrpcInstrumentation(); instrumentation.enable(); diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index c3ea3de7e8..167b1a2f23 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,13 +46,14 @@ }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "@types/superagent": "4.1.24", "axios": "1.5.1", @@ -73,9 +74,10 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 85c073e5e4..539aa2f67c 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -55,10 +55,11 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -80,18 +81,18 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index f9c9dafdb5..836953ecb2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.45.1", + "version": "0.48.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -72,18 +72,21 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.6.0", + "import-in-the-middle": "1.7.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/api-logs": "^0.46.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/sdk-metrics": "1.18.1", + "@opentelemetry/api-logs": "0.47.0", + "@opentelemetry/sdk-metrics": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/semver": "7.5.6", @@ -107,9 +110,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" diff --git a/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts index c6a052c6c9..266648bcf6 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts @@ -15,6 +15,7 @@ */ import { trace, metrics } from '@opentelemetry/api'; +import { logs } from '@opentelemetry/api-logs'; import { disableInstrumentations, enableInstrumentations, @@ -36,8 +37,14 @@ export function registerInstrumentations( ); const tracerProvider = options.tracerProvider || trace.getTracerProvider(); const meterProvider = options.meterProvider || metrics.getMeterProvider(); + const loggerProvider = options.loggerProvider || logs.getLoggerProvider(); - enableInstrumentations(instrumentations, tracerProvider, meterProvider); + enableInstrumentations( + instrumentations, + tracerProvider, + meterProvider, + loggerProvider + ); return () => { disableInstrumentations(instrumentations); diff --git a/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts index 3dc1927214..91ef7a653d 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts @@ -17,6 +17,7 @@ import { TracerProvider, MeterProvider } from '@opentelemetry/api'; import { Instrumentation } from './types'; import { AutoLoaderResult, InstrumentationOption } from './types_internal'; +import { LoggerProvider } from '@opentelemetry/api-logs'; /** * Parses the options and returns instrumentations, node plugins and @@ -52,7 +53,8 @@ export function parseInstrumentationOptions( export function enableInstrumentations( instrumentations: Instrumentation[], tracerProvider?: TracerProvider, - meterProvider?: MeterProvider + meterProvider?: MeterProvider, + loggerProvider?: LoggerProvider ): void { for (let i = 0, j = instrumentations.length; i < j; i++) { const instrumentation = instrumentations[i]; @@ -62,6 +64,9 @@ export function enableInstrumentations( if (meterProvider) { instrumentation.setMeterProvider(meterProvider); } + if (loggerProvider && instrumentation.setLoggerProvider) { + instrumentation.setLoggerProvider(loggerProvider); + } // instrumentations have been already enabled during creation // so enable only if user prevented that by setting enabled to false // this is to prevent double enabling but when calling register all diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts index 4552f6dfab..88a6b03887 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts @@ -24,6 +24,7 @@ import { Tracer, TracerProvider, } from '@opentelemetry/api'; +import { Logger, LoggerProvider, logs } from '@opentelemetry/api-logs'; import * as shimmer from 'shimmer'; import { InstrumentationModuleDefinition, @@ -41,6 +42,7 @@ export abstract class InstrumentationAbstract private _tracer: Tracer; private _meter: Meter; + private _logger: Logger; protected _diag: DiagLogger; constructor( @@ -58,8 +60,8 @@ export abstract class InstrumentationAbstract }); this._tracer = trace.getTracer(instrumentationName, instrumentationVersion); - this._meter = metrics.getMeter(instrumentationName, instrumentationVersion); + this._logger = logs.getLogger(instrumentationName, instrumentationVersion); this._updateMetricInstruments(); } @@ -90,6 +92,22 @@ export abstract class InstrumentationAbstract this._updateMetricInstruments(); } + /* Returns logger */ + protected get logger(): Logger { + return this._logger; + } + + /** + * Sets LoggerProvider to this plugin + * @param loggerProvider + */ + public setLoggerProvider(loggerProvider: LoggerProvider): void { + this._logger = loggerProvider.getLogger( + this.instrumentationName, + this.instrumentationVersion + ); + } + /** * Sets the new metric instruments with the current Meter. */ @@ -134,9 +152,12 @@ export abstract class InstrumentationAbstract /** * Init method in which plugin should define _modules and patches for - * methods + * methods. + * Use `enable()` if you are trying to turn on this plugin. This method + * will return objects to patch specific modules with the appropriate + * instrumentation (or not return anything). */ - protected abstract init(): + abstract init(): | InstrumentationModuleDefinition | InstrumentationModuleDefinition[] | void; diff --git a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts index 574f17257e..edbe8ba72e 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts @@ -15,7 +15,7 @@ */ import { InstrumentationModuleFile } from './types'; -import { normalize } from 'path'; +import { normalize } from './platform/index'; export class InstrumentationNodeModuleFile implements InstrumentationModuleFile diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts index 0b238b42b8..4ad5c8f063 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts @@ -15,3 +15,4 @@ */ export { InstrumentationBase } from './instrumentation'; +export { normalize } from './noop-normalize'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts new file mode 100644 index 0000000000..7b8aa40000 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts @@ -0,0 +1,35 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { diag } from '@opentelemetry/api'; + +/** + * Placeholder normalize function to replace the node variant in browser runtimes, + * this should never be called and will perform a no-op and warn if it is called regardless. + * + * This is a workaround to fix https://github.com/open-telemetry/opentelemetry-js/issues/4373 until the instrumentation + * package can be made node-only. + * + * @param path input path + * @return unmodified path + * @internal + */ +export function normalize(path: string): string { + diag.warn( + 'Path normalization is not implemented for this platform. To silence this warning, ensure no node-specific instrumentations are loaded, and node-specific types (e.g. InstrumentationNodeModuleFile), are not used in a browser context)' + ); + return path; +} diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts index 81d3096252..f24b70eac5 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export { InstrumentationBase } from './node'; +export { InstrumentationBase, normalize } from './node'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts index 1e81931b2a..94f517dfa3 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts @@ -14,3 +14,4 @@ * limitations under the License. */ export { InstrumentationBase } from './instrumentation'; +export { normalize } from './normalize'; diff --git a/packages/opentelemetry-propagator-b3/src/version.js b/experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts similarity index 75% rename from packages/opentelemetry-propagator-b3/src/version.js rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts index 2090d63abf..83b83aaef2 100644 --- a/packages/opentelemetry-propagator-b3/src/version.js +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts @@ -1,4 +1,3 @@ -"use strict"; /* * Copyright The OpenTelemetry Authors * @@ -14,7 +13,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; + +export { normalize } from 'path'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/types.ts b/experimental/packages/opentelemetry-instrumentation/src/types.ts index 760e31165f..3ef070f829 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/types.ts @@ -15,6 +15,7 @@ */ import { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import { LoggerProvider } from '@opentelemetry/api-logs'; /** Interface Instrumentation to apply patch. */ export interface Instrumentation { @@ -43,6 +44,9 @@ export interface Instrumentation { /** Method to set meter provider */ setMeterProvider(meterProvider: MeterProvider): void; + /** Method to set logger provider */ + setLoggerProvider?(loggerProvider: LoggerProvider): void; + /** Method to set instrumentation config */ setConfig(config: InstrumentationConfig): void; diff --git a/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts b/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts index 2cff387711..ad71821fc3 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts @@ -17,6 +17,7 @@ import { TracerProvider, MeterProvider } from '@opentelemetry/api'; import { InstrumentationBase } from './platform'; import { Instrumentation } from './types'; +import { LoggerProvider } from '@opentelemetry/api-logs'; export type InstrumentationOption = | typeof InstrumentationBase @@ -32,4 +33,5 @@ export interface AutoLoaderOptions { instrumentations?: InstrumentationOption[]; tracerProvider?: TracerProvider; meterProvider?: MeterProvider; + loggerProvider?: LoggerProvider; } diff --git a/packages/opentelemetry-exporter-jaeger/src/version.js b/experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts similarity index 69% rename from packages/opentelemetry-exporter-jaeger/src/version.js rename to experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts index 2090d63abf..aedcb975e7 100644 --- a/packages/opentelemetry-exporter-jaeger/src/version.js +++ b/experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts @@ -1,4 +1,3 @@ -"use strict"; /* * Copyright The OpenTelemetry Authors * @@ -14,7 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; + +import * as assert from 'assert'; +import { normalize } from '../../src/platform/browser'; + +describe('noop-normalize', function () { + it('should not normalize input', function () { + assert.strictEqual(normalize('/tmp/foo/../bar'), '/tmp/foo/../bar'); + }); +}); diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts index be53d1ca59..126f4c0944 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts @@ -22,6 +22,7 @@ import { } from '../../src'; import { MeterProvider } from '@opentelemetry/sdk-metrics'; +import { LoggerProvider } from '@opentelemetry/sdk-logs'; interface TestInstrumentationConfig extends InstrumentationConfig { isActive?: boolean; @@ -90,6 +91,23 @@ describe('BaseInstrumentation', () => { }); }); + describe('setLoggerProvider', () => { + it('should get a logger from provider', () => { + let called = true; + class TestLoggerProvider extends LoggerProvider { + override getLogger(name: any, version?: any, options?: any) { + called = true; + return super.getLogger(name, version, options); + } + } + instrumentation = new TestInstrumentation(); + if (instrumentation.setLoggerProvider) { + instrumentation.setLoggerProvider(new TestLoggerProvider()); + } + assert.strictEqual(called, true); + }); + }); + describe('getConfig', () => { it('should return instrumentation config', () => { const instrumentation: Instrumentation = new TestInstrumentation({ diff --git a/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts index aa8c5582a3..e5532f2e5f 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts @@ -24,6 +24,7 @@ import { import * as assert from 'assert'; import * as sinon from 'sinon'; import { InstrumentationBase, registerInstrumentations } from '../../src'; +import { Logger, LoggerOptions, LoggerProvider } from '@opentelemetry/api-logs'; class DummyTracerProvider implements TracerProvider { getTracer(name: string, version?: string): Tracer { @@ -37,6 +38,12 @@ class DummyMeterProvider implements MeterProvider { } } +class DummyLoggerProvider implements LoggerProvider { + getLogger(name: string, version?: string, options?: LoggerOptions): Logger { + throw new Error('not implemented'); + } +} + class FooInstrumentation extends InstrumentationBase { init() { return []; @@ -63,17 +70,21 @@ describe('autoLoader', () => { let enableSpy: sinon.SinonSpy; let setTracerProviderSpy: sinon.SinonSpy; let setMeterProviderSpy: sinon.SinonSpy; + let setLoggerProviderSpy: sinon.SinonSpy; const tracerProvider = new DummyTracerProvider(); const meterProvider = new DummyMeterProvider(); + const loggerProvider = new DummyLoggerProvider(); beforeEach(() => { instrumentation = new FooInstrumentation('foo', '1', {}); enableSpy = sinon.spy(instrumentation, 'enable'); setTracerProviderSpy = sinon.stub(instrumentation, 'setTracerProvider'); setMeterProviderSpy = sinon.stub(instrumentation, 'setMeterProvider'); + setLoggerProviderSpy = sinon.stub(instrumentation, 'setLoggerProvider'); unload = registerInstrumentations({ instrumentations: [instrumentation], tracerProvider, meterProvider, + loggerProvider, }); }); @@ -96,10 +107,12 @@ describe('autoLoader', () => { enableSpy = sinon.spy(instrumentation, 'enable'); setTracerProviderSpy = sinon.stub(instrumentation, 'setTracerProvider'); setMeterProviderSpy = sinon.stub(instrumentation, 'setMeterProvider'); + setLoggerProviderSpy = sinon.stub(instrumentation, 'setLoggerProvider'); unload = registerInstrumentations({ instrumentations: [instrumentation], tracerProvider, meterProvider, + loggerProvider, }); assert.strictEqual(enableSpy.callCount, 1); }); @@ -119,6 +132,12 @@ describe('autoLoader', () => { assert.ok(setMeterProviderSpy.lastCall.args[0] === meterProvider); assert.strictEqual(setMeterProviderSpy.lastCall.args.length, 1); }); + + it('should set LoggerProvider', () => { + assert.strictEqual(setLoggerProviderSpy.callCount, 1); + assert.ok(setLoggerProviderSpy.lastCall.args[0] === loggerProvider); + assert.strictEqual(setLoggerProviderSpy.lastCall.args.length, 1); + }); }); }); }); diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json index a673b46483..5affe32c2b 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json @@ -14,6 +14,9 @@ }, { "path": "../../../packages/sdk-metrics" + }, + { + "path": "../api-logs" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json index f70e767a6e..dae4bfa399 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json @@ -14,6 +14,9 @@ }, { "path": "../../../packages/sdk-metrics" + }, + { + "path": "../api-logs" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.json index 668bce7426..5da185276f 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.json @@ -15,6 +15,9 @@ }, { "path": "../../../packages/sdk-metrics" + }, + { + "path": "../api-logs" } ] } diff --git a/experimental/packages/opentelemetry-sdk-node/README.md b/experimental/packages/opentelemetry-sdk-node/README.md index a7da74dece..0afe166c71 100644 --- a/experimental/packages/opentelemetry-sdk-node/README.md +++ b/experimental/packages/opentelemetry-sdk-node/README.md @@ -47,7 +47,7 @@ const { } = require("@opentelemetry/auto-instrumentations-node"); const jaegerExporter = new JaegerExporter(); -const prometheusExporter = new PrometheusExporter({ startServer: true }); +const prometheusExporter = new PrometheusExporter(); const sdk = new opentelemetry.NodeSDK({ // Optional - if omitted, the tracing SDK will be initialized from environment variables @@ -124,6 +124,12 @@ Configure a custom sampler. By default, all traces will be sampled. ### spanProcessor +Deprecated, please use [spanProcessors](#spanprocessors) instead. + +### spanProcessors + +An array of span processors to register to the tracer provider. + ### traceExporter Configure a trace exporter. If an exporter is configured, it will be used with a [BatchSpanProcessor](../../../packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts). If an exporter OR span processor is not configured programatically, this package will auto setup the default `otlp` exporter with `http/protobuf` protocol with a `BatchSpanProcessor`. diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index eeabe76225..6c99a4484e 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,29 +44,30 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.8.0" }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/exporter-jaeger": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/exporter-jaeger": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts index 6c8cedb296..c8ebfb48a7 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts @@ -75,7 +75,7 @@ export type LoggerProviderConfig = { export class NodeSDK { private _tracerProviderConfig?: { tracerConfig: NodeTracerConfig; - spanProcessor: SpanProcessor; + spanProcessors: SpanProcessor[]; contextManager?: ContextManager; textMapPropagator?: TextMapPropagator; }; @@ -92,6 +92,7 @@ export class NodeSDK { private _loggerProvider?: LoggerProvider; private _meterProvider?: MeterProvider; private _serviceName?: string; + private _configuration?: Partial; private _disabled?: boolean; @@ -116,6 +117,8 @@ export class NodeSDK { }); } + this._configuration = configuration; + this._resource = configuration.resource ?? new Resource({}); this._resourceDetectors = configuration.resourceDetectors ?? [ envDetector, @@ -126,7 +129,12 @@ export class NodeSDK { this._autoDetectResources = configuration.autoDetectResources ?? true; - if (configuration.spanProcessor || configuration.traceExporter) { + // If a tracer provider can be created from manual configuration, create it + if ( + configuration.traceExporter || + configuration.spanProcessor || + configuration.spanProcessors + ) { const tracerProviderConfig: NodeTracerConfig = {}; if (configuration.sampler) { @@ -139,13 +147,21 @@ export class NodeSDK { tracerProviderConfig.idGenerator = configuration.idGenerator; } + if (configuration.spanProcessor) { + diag.warn( + "The 'spanProcessor' option is deprecated. Please use 'spanProcessors' instead." + ); + } + const spanProcessor = configuration.spanProcessor ?? new BatchSpanProcessor(configuration.traceExporter!); + const spanProcessors = configuration.spanProcessors ?? [spanProcessor]; + this.configureTracerProvider( tracerProviderConfig, - spanProcessor, + spanProcessors, configuration.contextManager, configuration.textMapPropagator ); @@ -188,13 +204,13 @@ export class NodeSDK { */ public configureTracerProvider( tracerConfig: NodeTracerConfig, - spanProcessor: SpanProcessor, + spanProcessors: SpanProcessor[], contextManager?: ContextManager, textMapPropagator?: TextMapPropagator ): void { this._tracerProviderConfig = { tracerConfig, - spanProcessor, + spanProcessors, contextManager, textMapPropagator, }; @@ -316,19 +332,23 @@ export class NodeSDK { }) ); + // if there is a tracerProviderConfig (traceExporter/spanProcessor was set manually) or the traceExporter is set manually, use NodeTracerProvider const Provider = this._tracerProviderConfig ? NodeTracerProvider : TracerProviderWithEnvExporters; + // If the Provider is configured with Env Exporters, we need to check if the SDK had any manual configurations and set them here const tracerProvider = new Provider({ - ...this._tracerProviderConfig?.tracerConfig, + ...this._configuration, resource: this._resource, }); this._tracerProvider = tracerProvider; if (this._tracerProviderConfig) { - tracerProvider.addSpanProcessor(this._tracerProviderConfig.spanProcessor); + for (const spanProcessor of this._tracerProviderConfig.spanProcessors) { + tracerProvider.addSpanProcessor(spanProcessor); + } } tracerProvider.register({ diff --git a/experimental/packages/opentelemetry-sdk-node/src/types.ts b/experimental/packages/opentelemetry-sdk-node/src/types.ts index 9292e0ae70..2ed7cae48d 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/types.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/types.ts @@ -40,7 +40,9 @@ export interface NodeSDKConfiguration { resourceDetectors: Array; sampler: Sampler; serviceName?: string; - spanProcessor: SpanProcessor; + /** @deprecated use spanProcessors instead*/ + spanProcessor?: SpanProcessor; + spanProcessors?: SpanProcessor[]; traceExporter: SpanExporter; spanLimits: SpanLimits; idGenerator: IdGenerator; diff --git a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts index 512d65bc65..95ab97b7ce 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts @@ -24,7 +24,10 @@ import { metrics, DiagConsoleLogger, } from '@opentelemetry/api'; -import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'; +import { + AsyncHooksContextManager, + AsyncLocalStorageContextManager, +} from '@opentelemetry/context-async-hooks'; import { CompositePropagator } from '@opentelemetry/core'; import { AggregationTemporality, @@ -43,8 +46,10 @@ import { BatchSpanProcessor, NoopSpanProcessor, IdGenerator, + AlwaysOffSampler, } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; +import * as semver from 'semver'; import * as Sinon from 'sinon'; import { NodeSDK } from '../src'; import { env } from 'process'; @@ -62,6 +67,10 @@ import { LoggerProvider, } from '@opentelemetry/sdk-logs'; +const DefaultContextManager = semver.gte(process.version, '14.8.0') + ? AsyncLocalStorageContextManager + : AsyncHooksContextManager; + describe('Node SDK', () => { let ctxManager: any; let propagator: any; @@ -168,12 +177,38 @@ describe('Node SDK', () => { assert.ok(apiTracerProvider.getDelegate() instanceof NodeTracerProvider); }); - it('should register a tracer provider if a span processor is provided', async () => { + it('should register a tracer provider if an exporter is provided via env', async () => { + env.OTEL_TRACES_EXPORTER = 'console'; + const sdk = new NodeSDK({ + autoDetectResources: false, + }); + + sdk.start(); + + assert.ok(!(metrics.getMeterProvider() instanceof MeterProvider)); + + assert.ok( + context['_getContextManager']().constructor.name === + AsyncLocalStorageContextManager.name + ); + assert.ok( + propagation['_getGlobalPropagator']() instanceof CompositePropagator + ); + const apiTracerProvider = + trace.getTracerProvider() as ProxyTracerProvider; + assert.ok(apiTracerProvider.getDelegate() instanceof NodeTracerProvider); + delete env.OTEL_TRACES_EXPORTER; + }); + + it('should register a tracer provider if span processors are provided', async () => { const exporter = new ConsoleSpanExporter(); - const spanProcessor = new SimpleSpanProcessor(exporter); const sdk = new NodeSDK({ - spanProcessor, + spanProcessors: [ + new NoopSpanProcessor(), + new SimpleSpanProcessor(exporter), + new BatchSpanProcessor(exporter), + ], autoDetectResources: false, }); @@ -183,7 +218,7 @@ describe('Node SDK', () => { assert.ok( context['_getContextManager']().constructor.name === - AsyncLocalStorageContextManager.name + DefaultContextManager.name ); assert.ok( propagation['_getGlobalPropagator']() instanceof CompositePropagator @@ -191,6 +226,15 @@ describe('Node SDK', () => { const apiTracerProvider = trace.getTracerProvider() as ProxyTracerProvider; assert.ok(apiTracerProvider.getDelegate() instanceof NodeTracerProvider); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(sdk['_tracerProvider'] instanceof NodeTracerProvider); + assert(listOfProcessors.length === 3); + assert(listOfProcessors[0] instanceof NoopSpanProcessor); + assert(listOfProcessors[1] instanceof SimpleSpanProcessor); + assert(listOfProcessors[2] instanceof BatchSpanProcessor); }); it('should register a meter provider if a reader is provided', async () => { @@ -865,6 +909,21 @@ describe('setup exporter from env', () => { assert(listOfProcessors[0] instanceof BatchSpanProcessor); delete env.OTEL_TRACES_EXPORTER; }); + it('should only create one span processor when configured using env vars and config', async () => { + env.OTEL_TRACES_EXPORTER = 'console'; + const sdk = new NodeSDK({ + sampler: new AlwaysOffSampler(), + }); + sdk.start(); + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + assert.ok(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert.ok( + sdk['_tracerProvider']!['_config']?.sampler instanceof AlwaysOffSampler + ); + assert.strictEqual(listOfProcessors.length, 1); + delete env.OTEL_TRACES_EXPORTER; + }); it('use otlp exporter and defined exporter protocol env value', async () => { env.OTEL_TRACES_EXPORTER = 'otlp'; env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index ebf1d7fab8..6da8d8f6c6 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,10 +61,11 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -85,9 +86,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index ef2180f112..a1cc469338 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,11 +48,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -73,8 +72,8 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index e53fd35fe2..6cccb8fed8 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -60,6 +60,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -79,8 +80,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index fc4f2ef03d..d3ee1cda5b 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.45.1", + "version": "0.48.0", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -76,15 +76,15 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", "sideEffects": false diff --git a/experimental/packages/otlp-transformer/src/common/index.ts b/experimental/packages/otlp-transformer/src/common/index.ts index c759fafc4b..00dcccfb05 100644 --- a/experimental/packages/otlp-transformer/src/common/index.ts +++ b/experimental/packages/otlp-transformer/src/common/index.ts @@ -16,7 +16,7 @@ import type { OtlpEncodingOptions, Fixed64, LongBits } from './types'; import { HrTime } from '@opentelemetry/api'; -import { hexToBase64, hrTimeToNanoseconds } from '@opentelemetry/core'; +import { hexToBinary, hrTimeToNanoseconds } from '@opentelemetry/core'; const NANOSECONDS = BigInt(1_000_000_000); @@ -44,10 +44,12 @@ const encodeTimestamp = typeof BigInt !== 'undefined' ? encodeAsString : hrTimeToNanoseconds; export type HrTimeEncodeFunction = (hrTime: HrTime) => Fixed64; -export type SpanContextEncodeFunction = (spanContext: string) => string; +export type SpanContextEncodeFunction = ( + spanContext: string +) => string | Uint8Array; export type OptionalSpanContextEncodeFunction = ( spanContext: string | undefined -) => string | undefined; +) => string | Uint8Array | undefined; export interface Encoder { encodeHrTime: HrTimeEncodeFunction; @@ -59,15 +61,15 @@ function identity(value: T): T { return value; } -function optionalHexToBase64(str: string | undefined): string | undefined { +function optionalHexToBinary(str: string | undefined): Uint8Array | undefined { if (str === undefined) return undefined; - return hexToBase64(str); + return hexToBinary(str); } const DEFAULT_ENCODER: Encoder = { encodeHrTime: encodeAsLongBits, - encodeSpanContext: hexToBase64, - encodeOptionalSpanContext: optionalHexToBase64, + encodeSpanContext: hexToBinary, + encodeOptionalSpanContext: optionalHexToBinary, }; export function getOtlpEncoder(options?: OtlpEncodingOptions): Encoder { @@ -79,7 +81,7 @@ export function getOtlpEncoder(options?: OtlpEncodingOptions): Encoder { const useHex = options.useHex ?? false; return { encodeHrTime: useLongBits ? encodeAsLongBits : encodeTimestamp, - encodeSpanContext: useHex ? identity : hexToBase64, - encodeOptionalSpanContext: useHex ? identity : optionalHexToBase64, + encodeSpanContext: useHex ? identity : hexToBinary, + encodeOptionalSpanContext: useHex ? identity : optionalHexToBinary, }; } diff --git a/experimental/packages/otlp-transformer/src/logs/types.ts b/experimental/packages/otlp-transformer/src/logs/types.ts index 2af77ad7c8..57c5422cbb 100644 --- a/experimental/packages/otlp-transformer/src/logs/types.ts +++ b/experimental/packages/otlp-transformer/src/logs/types.ts @@ -92,10 +92,10 @@ export interface ILogRecord { flags?: number; /** LogRecord traceId */ - traceId?: string; + traceId?: string | Uint8Array; /** LogRecord spanId */ - spanId?: string; + spanId?: string | Uint8Array; } /** diff --git a/experimental/packages/otlp-transformer/src/metrics/types.ts b/experimental/packages/otlp-transformer/src/metrics/types.ts index 96a3dda798..208c6aa678 100644 --- a/experimental/packages/otlp-transformer/src/metrics/types.ts +++ b/experimental/packages/otlp-transformer/src/metrics/types.ts @@ -287,10 +287,10 @@ export interface IExemplar { asInt?: number; /** Exemplar spanId */ - spanId?: string; + spanId?: string | Uint8Array; /** Exemplar traceId */ - traceId?: string; + traceId?: string | Uint8Array; } /** diff --git a/experimental/packages/otlp-transformer/src/trace/types.ts b/experimental/packages/otlp-transformer/src/trace/types.ts index b9618dd75f..d32c85eb5a 100644 --- a/experimental/packages/otlp-transformer/src/trace/types.ts +++ b/experimental/packages/otlp-transformer/src/trace/types.ts @@ -63,16 +63,16 @@ export interface IScopeSpans { /** Properties of a Span. */ export interface ISpan { /** Span traceId */ - traceId: string; + traceId: string | Uint8Array; /** Span spanId */ - spanId: string; + spanId: string | Uint8Array; /** Span traceState */ traceState?: string | null; /** Span parentSpanId */ - parentSpanId?: string; + parentSpanId?: string | Uint8Array; /** Span name */ name: string; @@ -181,10 +181,10 @@ export interface IEvent { /** Properties of a Link. */ export interface ILink { /** Link traceId */ - traceId: string; + traceId: string | Uint8Array; /** Link spanId */ - spanId: string; + spanId: string | Uint8Array; /** Link traceState */ traceState?: string; diff --git a/experimental/packages/otlp-transformer/test/common.test.ts b/experimental/packages/otlp-transformer/test/common.test.ts index d31267406c..1925ee1283 100644 --- a/experimental/packages/otlp-transformer/test/common.test.ts +++ b/experimental/packages/otlp-transformer/test/common.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { hexToBase64 } from '@opentelemetry/core'; +import { hexToBinary } from '@opentelemetry/core'; import { getOtlpEncoder } from '../src'; import { toAnyValue } from '../src/common/internal'; import * as assert from 'assert'; @@ -70,7 +70,7 @@ describe('common', () => { }); describe('otlp encoder', () => { - it('defaults to long timestamps and base64 encoding given no options', () => { + it('defaults to long timestamps and binary encoding given no options', () => { const encoder = getOtlpEncoder(); assert.deepStrictEqual(encoder.encodeHrTime([1697978649, 99870675]), { low: 3352011219, @@ -78,11 +78,11 @@ describe('common', () => { }); assert.deepStrictEqual( encoder.encodeSpanContext(traceId), - hexToBase64(traceId) + hexToBinary(traceId) ); assert.deepStrictEqual( encoder.encodeOptionalSpanContext(spanId), - hexToBase64(spanId) + hexToBinary(spanId) ); assert.deepStrictEqual( encoder.encodeOptionalSpanContext(undefined), @@ -98,11 +98,11 @@ describe('common', () => { }); assert.deepStrictEqual( encoder.encodeSpanContext(traceId), - hexToBase64(traceId) + hexToBinary(traceId) ); assert.deepStrictEqual( encoder.encodeOptionalSpanContext(spanId), - hexToBase64(spanId) + hexToBinary(spanId) ); assert.deepStrictEqual( encoder.encodeOptionalSpanContext(undefined), diff --git a/experimental/packages/otlp-transformer/test/logs.test.ts b/experimental/packages/otlp-transformer/test/logs.test.ts index 18dfbdabe4..ea8dd7e82b 100644 --- a/experimental/packages/otlp-transformer/test/logs.test.ts +++ b/experimental/packages/otlp-transformer/test/logs.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { InstrumentationScope, hexToBase64 } from '@opentelemetry/core'; +import { InstrumentationScope, hexToBinary } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; import * as assert from 'assert'; import { @@ -28,8 +28,8 @@ import { SeverityNumber } from '@opentelemetry/api-logs'; function createExpectedLogJson(useHex: boolean): IExportLogsServiceRequest { const traceId = useHex ? '00000000000000000000000000000001' - : hexToBase64('00000000000000000000000000000001'); - const spanId = useHex ? '0000000000000002' : hexToBase64('0000000000000002'); + : hexToBinary('00000000000000000000000000000001'); + const spanId = useHex ? '0000000000000002' : hexToBinary('0000000000000002'); return { resourceLogs: [ diff --git a/experimental/packages/otlp-transformer/test/trace.test.ts b/experimental/packages/otlp-transformer/test/trace.test.ts index 1eb786b30f..65b23ddc2d 100644 --- a/experimental/packages/otlp-transformer/test/trace.test.ts +++ b/experimental/packages/otlp-transformer/test/trace.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { SpanKind, SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { TraceState, hexToBase64 } from '@opentelemetry/core'; +import { TraceState, hexToBinary } from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; @@ -41,17 +41,17 @@ function createExpectedSpanJson(options: OtlpEncodingOptions) { const traceId = useHex ? '00000000000000000000000000000001' - : hexToBase64('00000000000000000000000000000001'); - const spanId = useHex ? '0000000000000002' : hexToBase64('0000000000000002'); + : hexToBinary('00000000000000000000000000000001'); + const spanId = useHex ? '0000000000000002' : hexToBinary('0000000000000002'); const parentSpanId = useHex ? '0000000000000001' - : hexToBase64('0000000000000001'); + : hexToBinary('0000000000000001'); const linkSpanId = useHex ? '0000000000000003' - : hexToBase64('0000000000000003'); + : hexToBinary('0000000000000003'); const linkTraceId = useHex ? '00000000000000000000000000000002' - : hexToBase64('00000000000000000000000000000002'); + : hexToBinary('00000000000000000000000000000002'); return { resourceSpans: [ diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index d14138ab4f..b379a4febe 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-logs", - "version": "0.45.1", + "version": "0.48.0", "publishConfig": { "access": "public" }, @@ -73,8 +73,10 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.4.0 <1.8.0", - "@opentelemetry/api-logs": "0.45.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -94,12 +96,12 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0" } } diff --git a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts index 027f103c07..bfe6367cf2 100644 --- a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts +++ b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts @@ -21,8 +21,9 @@ import { getEnv, globalErrorHandler, unrefTimer, - callWithTimeout, BindOnceFuture, + internal, + callWithTimeout, } from '@opentelemetry/core'; import type { BufferConfig } from '../types'; @@ -163,21 +164,34 @@ export abstract class BatchLogRecordProcessorBase } } - private _export(logRecords: LogRecord[]): Promise { - return new Promise((resolve, reject) => { - this._exporter.export(logRecords, (res: ExportResult) => { - if (res.code !== ExportResultCode.SUCCESS) { - reject( - res.error ?? - new Error( - `BatchLogRecordProcessorBase: log record export failed (status ${res})` - ) - ); - return; - } - resolve(res); - }); - }); + private _export(logRecords: LogRecord[]): Promise { + const doExport = () => + internal + ._export(this._exporter, logRecords) + .then((result: ExportResult) => { + if (result.code !== ExportResultCode.SUCCESS) { + globalErrorHandler( + result.error ?? + new Error( + `BatchLogRecordProcessor: log record export failed (status ${result})` + ) + ); + } + }) + .catch(globalErrorHandler); + + const pendingResources = logRecords + .map(logRecord => logRecord.resource) + .filter(resource => resource.asyncAttributesPending); + + // Avoid scheduling a promise to make the behavior more predictable and easier to test + if (pendingResources.length === 0) { + return doExport(); + } else { + return Promise.all( + pendingResources.map(resource => resource.waitForAsyncAttributes?.()) + ).then(doExport, globalErrorHandler); + } } protected abstract onShutdown(): void; diff --git a/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts b/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts index b516d55fc7..97134c886b 100644 --- a/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts +++ b/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts @@ -19,17 +19,19 @@ import { BindOnceFuture, ExportResultCode, globalErrorHandler, + internal, } from '@opentelemetry/core'; - import type { LogRecordExporter } from './LogRecordExporter'; import type { LogRecordProcessor } from '../LogRecordProcessor'; import type { LogRecord } from './../LogRecord'; export class SimpleLogRecordProcessor implements LogRecordProcessor { private _shutdownOnce: BindOnceFuture; + private _unresolvedExports: Set>; constructor(private readonly _exporter: LogRecordExporter) { this._shutdownOnce = new BindOnceFuture(this._shutdown, this); + this._unresolvedExports = new Set>(); } public onEmit(logRecord: LogRecord): void { @@ -37,22 +39,45 @@ export class SimpleLogRecordProcessor implements LogRecordProcessor { return; } - this._exporter.export([logRecord], (res: ExportResult) => { - if (res.code !== ExportResultCode.SUCCESS) { - globalErrorHandler( - res.error ?? - new Error( - `SimpleLogRecordProcessor: log record export failed (status ${res})` - ) - ); - return; + const doExport = () => + internal + ._export(this._exporter, [logRecord]) + .then((result: ExportResult) => { + if (result.code !== ExportResultCode.SUCCESS) { + globalErrorHandler( + result.error ?? + new Error( + `SimpleLogRecordProcessor: log record export failed (status ${result})` + ) + ); + } + }) + .catch(globalErrorHandler); + + // Avoid scheduling a promise to make the behavior more predictable and easier to test + if (logRecord.resource.asyncAttributesPending) { + const exportPromise = logRecord.resource + .waitForAsyncAttributes?.() + .then(() => { + // Using TS Non-null assertion operator because exportPromise could not be null in here + // if waitForAsyncAttributes is not present this code will never be reached + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this._unresolvedExports.delete(exportPromise!); + return doExport(); + }, globalErrorHandler); + + // store the unresolved exports + if (exportPromise != null) { + this._unresolvedExports.add(exportPromise); } - }); + } else { + void doExport(); + } } - public forceFlush(): Promise { - // do nothing as all log records are being exported without waiting - return Promise.resolve(); + public async forceFlush(): Promise { + // await unresolved resources before resolving + await Promise.all(Array.from(this._unresolvedExports)); } public shutdown(): Promise { diff --git a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts index 70859a314c..f6a8e77611 100644 --- a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts @@ -32,16 +32,19 @@ import { import { BatchLogRecordProcessorBase } from '../../../src/export/BatchLogRecordProcessorBase'; import { reconfigureLimits } from '../../../src/config'; import { LoggerProviderSharedState } from '../../../src/internal/LoggerProviderSharedState'; -import { Resource } from '@opentelemetry/resources'; +import { Resource, ResourceAttributes } from '@opentelemetry/resources'; class BatchLogRecordProcessor extends BatchLogRecordProcessorBase { onInit() {} onShutdown() {} } -const createLogRecord = (limits?: LogRecordLimits): LogRecord => { +const createLogRecord = ( + limits?: LogRecordLimits, + resource?: Resource +): LogRecord => { const sharedState = new LoggerProviderSharedState( - Resource.default(), + resource || Resource.default(), Infinity, reconfigureLimits(limits ?? {}) ); @@ -308,6 +311,25 @@ describe('BatchLogRecordProcessorBase', () => { await processor.forceFlush(); assert.strictEqual(exporter.getFinishedLogRecords().length, 1); }); + + it('should wait for pending resource on flush', async () => { + const processor = new BatchLogRecordProcessor(exporter); + const asyncResource = new Resource( + {}, + new Promise(resolve => { + setTimeout(() => resolve({ async: 'fromasync' }), 1); + }) + ); + const logRecord = createLogRecord(undefined, asyncResource); + processor.onEmit(logRecord); + await processor.forceFlush(); + const exportedLogs = exporter.getFinishedLogRecords(); + assert.strictEqual(exportedLogs.length, 1); + assert.strictEqual( + exportedLogs[0].resource.attributes['async'], + 'fromasync' + ); + }); }); describe('shutdown', () => { diff --git a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts index 27eacc9195..a19723f4cc 100644 --- a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts @@ -21,6 +21,8 @@ import { loggingErrorHandler, setGlobalErrorHandler, } from '@opentelemetry/core'; +import { Resource, ResourceAttributes } from '@opentelemetry/resources'; +import { Resource as Resource190 } from '@opentelemetry/resources_1.9.0'; import { InMemoryLogRecordExporter, @@ -29,12 +31,12 @@ import { LogRecord, } from './../../../src'; import { LoggerProviderSharedState } from '../../../src/internal/LoggerProviderSharedState'; -import { Resource } from '@opentelemetry/resources'; import { reconfigureLimits } from '../../../src/config'; +import { TestExporterWithDelay } from './TestExporterWithDelay'; -const setup = (exporter: LogRecordExporter) => { +const setup = (exporter: LogRecordExporter, resource?: Resource) => { const sharedState = new LoggerProviderSharedState( - Resource.default(), + resource || Resource.default(), Infinity, reconfigureLimits({}) ); @@ -113,4 +115,65 @@ describe('SimpleLogRecordProcessor', () => { assert.ok(shutdownSpy.callCount === 1); }); }); + + describe('force flush', () => { + it('should await unresolved resources', async () => { + const exporter = new InMemoryLogRecordExporter(); + const asyncResource = new Resource( + {}, + new Promise(resolve => { + setTimeout(() => resolve({ async: 'fromasync' }), 1); + }) + ); + const { processor, logRecord } = setup(exporter, asyncResource); + assert.strictEqual(exporter.getFinishedLogRecords().length, 0); + processor.onEmit(logRecord); + + await processor.forceFlush(); + + const exportedLogs = exporter.getFinishedLogRecords(); + assert.strictEqual(exportedLogs.length, 1); + assert.strictEqual( + exportedLogs[0].resource.attributes['async'], + 'fromasync' + ); + }); + + it('should await doExport() and delete from _unresolvedExports', async () => { + const testExporterWithDelay = new TestExporterWithDelay(); + const asyncResource = new Resource( + {}, + new Promise(resolve => { + setTimeout(() => resolve({ async: 'fromasync' }), 1); + }) + ); + const processor = new SimpleLogRecordProcessor(testExporterWithDelay); + const { logRecord } = setup(testExporterWithDelay, asyncResource); + + processor.onEmit(logRecord); + assert.strictEqual(processor['_unresolvedExports'].size, 1); + await processor.forceFlush(); + assert.strictEqual(processor['_unresolvedExports'].size, 0); + const exportedLogRecords = testExporterWithDelay.getFinishedLogRecords(); + assert.strictEqual(exportedLogRecords.length, 1); + }); + }); + + describe('compatibility', () => { + it('should export when using old resource implementation', async () => { + const exporter = new InMemoryLogRecordExporter(); + const { processor, logRecord } = setup( + exporter, + new Resource190({ fromold: 'fromold' }) + ); + assert.strictEqual(exporter.getFinishedLogRecords().length, 0); + processor.onEmit(logRecord); + const exportedLogs = exporter.getFinishedLogRecords(); + assert.strictEqual(exportedLogs.length, 1); + assert.strictEqual( + exportedLogs[0].resource.attributes['fromold'], + 'fromold' + ); + }); + }); }); diff --git a/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts b/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts new file mode 100644 index 0000000000..1ce3a20ba0 --- /dev/null +++ b/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts @@ -0,0 +1,51 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ExportResult } from '@opentelemetry/core'; +import { InMemoryLogRecordExporter, ReadableLogRecord } from '../../../src'; + +/** + * A test-only exporter that delays during export to mimic a real exporter. + */ +export class TestExporterWithDelay extends InMemoryLogRecordExporter { + private _exporterCreatedLogRecords: ReadableLogRecord[] = []; + + constructor() { + super(); + } + + override export( + logRecords: ReadableLogRecord[], + resultCallback: (result: ExportResult) => void + ): void { + super.export(logRecords, () => setTimeout(resultCallback, 1)); + } + + override shutdown(): Promise { + return super.shutdown().then(() => { + this._exporterCreatedLogRecords = []; + }); + } + + override reset() { + super.reset(); + this._exporterCreatedLogRecords = []; + } + + getExporterCreatedLogRecords(): ReadableLogRecord[] { + return this._exporterCreatedLogRecords; + } +} diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 26836364c3..7314b50bda 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.45.1", + "version": "0.48.0", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,8 +50,8 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -69,10 +69,11 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "require-in-the-middle": "^7.1.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus", "sideEffects": false diff --git a/packages/opentelemetry-propagator-jaeger/src/version.js b/integration-tests/api/.eslintrc.js similarity index 75% rename from packages/opentelemetry-propagator-jaeger/src/version.js rename to integration-tests/api/.eslintrc.js index 2090d63abf..6966956e67 100644 --- a/packages/opentelemetry-propagator-jaeger/src/version.js +++ b/integration-tests/api/.eslintrc.js @@ -1,4 +1,3 @@ -"use strict"; /* * Copyright The OpenTelemetry Authors * @@ -14,7 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; +module.exports = { + env: { + mocha: true, + commonjs: true, + node: true, + browser: true, + }, + ...require('../../eslint.base.js'), +}; diff --git a/integration-tests/api/README.md b/integration-tests/api/README.md new file mode 100644 index 0000000000..1ad5f339d5 --- /dev/null +++ b/integration-tests/api/README.md @@ -0,0 +1,10 @@ +# `opentelemetry/integration-tests-api` + +This is an integration test suite for `@opentelemetry/api` that verifies the +api package works as expected when being imported. + +## Test + +```sh +npm run test +``` diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json new file mode 100644 index 0000000000..5a0b745d7b --- /dev/null +++ b/integration-tests/api/package.json @@ -0,0 +1,40 @@ +{ + "name": "@opentelemetry/integration-tests-api", + "version": "1.21.0", + "private": true, + "publishConfig": { + "access": "restricted" + }, + "description": "Verifies @opentelemetry/api in integration tests", + "author": "OpenTelemetry Authors", + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/integration-tests/api", + "license": "Apache-2.0", + "repository": { + "type": "git", + "url": "git+https://github.com/open-telemetry/opentelemetry-js.git" + }, + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js/issues" + }, + "engines": { + "node": ">=14" + }, + "scripts": { + "compile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", + "pretest": "npm run compile", + "test": "nyc mocha test/**/*.test.js", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "lint": "eslint . --ext .js", + "lint:fix": "eslint . --ext .js --fix" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "9.1.1", + "@types/node": "18.6.5", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.0.0", + "nyc": "15.1.0" + } +} diff --git a/integration-tests/api/test/api-entries.test.js b/integration-tests/api/test/api-entries.test.js new file mode 100644 index 0000000000..7f7635a086 --- /dev/null +++ b/integration-tests/api/test/api-entries.test.js @@ -0,0 +1,48 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const assert = require('assert'); + +// TypeScript v4.4.4 doesn't support `node16` or `nodenext` in +// [Module Resolution](https://www.typescriptlang.org/tsconfig#moduleResolution) +// which is required for typescript to resolve the `package.json#exports` +// entries. +// Additionally, using `node16` or `nodenext` in `tsconfig.json#moduleResolution` +// requires the TypeScript to generate ESModule outputs. This is a breaking +// change for CJS users. +// So we have to use plain JavaScript to verity the `package.json#exports` here. + +describe('@opentelemetry/api entries', () => { + it('should import root entry', async () => { + const mod = await import('@opentelemetry/api'); + assert.ok(mod.trace != null); + }); + + it('should require root entry', () => { + const mod = require('@opentelemetry/api'); + assert.ok(mod.trace != null); + }); + + it('should import experimental entry', async () => { + const mod = await import('@opentelemetry/api/experimental'); + assert.ok(mod.wrapTracer != null); + }); + + it('should require experimental entry', () => { + const mod = require('@opentelemetry/api/experimental'); + assert.ok(mod.wrapTracer != null); + }); +}); diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 0d9b204796..27b9e83c3e 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.19.1", + "version": "1.22.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "axios": "1.5.1", "body-parser": "1.19.0", "express": "4.17.3" diff --git a/karma.webpack.js b/karma.webpack.js index b7fa7acb97..d15c15384a 100644 --- a/karma.webpack.js +++ b/karma.webpack.js @@ -26,6 +26,22 @@ module.exports = { module: { rules: [ { test: /\.ts$/, use: 'ts-loader' }, + { + test: /\.js$/, + exclude: { + and: [/node_modules/], // Exclude libraries in node_modules ... + not: [ + // Except for a few of them that needs to be transpiled because they use modern syntax + /zone.js/, + ], + }, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'], + } + }, + }, { enforce: 'post', exclude: /(node_modules|\.test\.[tj]sx?$)/, diff --git a/package-lock.json b/package-lock.json index 7800ff33d6..74d9e2e1bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.38", + "@types/webpack": "5.28.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -81,68 +81,100 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4", "unionfs": "4.5.1", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=8.0.0" } }, + "api/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "api/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "api/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "api/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -151,24 +183,29 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, + "api/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "examples/esm-http-ts": { - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "engines": { "node": ">=18" @@ -176,18 +213,18 @@ }, "examples/http": { "name": "http-example", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -198,18 +235,18 @@ }, "examples/https": { "name": "https-example", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -220,93 +257,100 @@ }, "examples/opentelemetry-web": { "name": "web-opentelemetry-example", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { - "@babel/core": "^7.6.0", + "@babel/core": "^7.23.6", + "@babel/preset-env": "^7.22.20", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", - "webpack": "^5.65.0", - "webpack-cli": "^4.10.0", + "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.5.0", - "webpack-merge": "^5.8.0" + "webpack-merge": "^5.10.0" }, "engines": { "node": ">=18" } }, - "examples/opentelemetry-web/node_modules/@webassemblyjs/ast": { - "version": "1.11.6", + "examples/opentelemetry-web/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "examples/opentelemetry-web/node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", + "examples/opentelemetry-web/node_modules/@webpack-cli/info": { + "version": "2.0.2", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "examples/opentelemetry-web/node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", + "examples/opentelemetry-web/node_modules/@webpack-cli/serve": { + "version": "2.0.5", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } } }, - "examples/opentelemetry-web/node_modules/acorn": { - "version": "8.11.2", + "examples/opentelemetry-web/node_modules/commander": { + "version": "10.0.1", "dev": true, "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, "engines": { - "node": ">=0.4.0" + "node": ">=14" } }, - "examples/opentelemetry-web/node_modules/acorn-import-assertions": { - "version": "1.9.0", + "examples/opentelemetry-web/node_modules/cross-spawn": { + "version": "7.0.3", "dev": true, "license": "MIT", - "peerDependencies": { - "acorn": "^8" + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" } }, "examples/opentelemetry-web/node_modules/enhanced-resolve": { @@ -321,24 +365,12 @@ "node": ">=10.13.0" } }, - "examples/opentelemetry-web/node_modules/eslint-scope": { - "version": "5.1.1", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "examples/opentelemetry-web/node_modules/loader-runner": { - "version": "4.3.0", + "examples/opentelemetry-web/node_modules/interpret": { + "version": "3.1.1", "dev": true, "license": "MIT", "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" } }, "examples/opentelemetry-web/node_modules/micromatch": { @@ -353,29 +385,34 @@ "node": ">=8.6" } }, - "examples/opentelemetry-web/node_modules/schema-utils": { - "version": "3.3.0", + "examples/opentelemetry-web/node_modules/rechoir": { + "version": "0.8.0", "dev": true, "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "resolve": "^1.20.0" }, "engines": { "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" } }, - "examples/opentelemetry-web/node_modules/serialize-javascript": { - "version": "6.0.1", + "examples/opentelemetry-web/node_modules/shebang-command": { + "version": "2.0.0", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "randombytes": "^2.1.0" + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "examples/opentelemetry-web/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" } }, "examples/opentelemetry-web/node_modules/source-map": { @@ -394,23 +431,6 @@ "node": ">=6" } }, - "examples/opentelemetry-web/node_modules/terser": { - "version": "5.24.0", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, "examples/opentelemetry-web/node_modules/terser-webpack-plugin": { "version": "5.3.9", "dev": true, @@ -475,18 +495,6 @@ "node": ">=4.2.0" } }, - "examples/opentelemetry-web/node_modules/watchpack": { - "version": "2.4.0", - "dev": true, - "license": "MIT", - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, "examples/opentelemetry-web/node_modules/webpack": { "version": "5.89.0", "dev": true, @@ -533,6 +541,50 @@ } } }, + "examples/opentelemetry-web/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, "examples/opentelemetry-web/node_modules/webpack-sources": { "version": "3.2.3", "dev": true, @@ -541,23 +593,37 @@ "node": ">=10.13.0" } }, + "examples/opentelemetry-web/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "examples/otlp-exporter-node": { "name": "example-otlp-exporter-node", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-proto": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "engines": { "node": ">=18" @@ -565,11 +631,11 @@ }, "experimental/backwards-compatibility/node14": { "name": "backcompat-node14", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@types/node": "14.18.25", @@ -586,11 +652,11 @@ }, "experimental/backwards-compatibility/node16": { "name": "backcompat-node16", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@types/node": "16.11.52", @@ -607,28 +673,17 @@ }, "experimental/examples/logs": { "name": "logs-example", - "version": "0.45.1", + "version": "0.48.0", "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" }, "devDependencies": { "@types/node": "18.6.5", "ts-node": "^10.9.1" } }, - "experimental/examples/logs/node_modules/acorn": { - "version": "8.11.2", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "experimental/examples/logs/node_modules/acorn-walk": { "version": "8.3.0", "dev": true, @@ -688,20 +743,20 @@ } }, "experimental/examples/opencensus-shim": { - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opencensus/core": "0.1.0", "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", - "@opentelemetry/shim-opencensus": "0.45.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "@opentelemetry/shim-opencensus": "0.48.0" }, "engines": { "node": ">=18" @@ -709,17 +764,17 @@ }, "experimental/examples/prometheus": { "name": "prometheus-example", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0" } }, "experimental/packages/api-events": { "name": "@opentelemetry/api-events", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.0.0" @@ -743,68 +798,100 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" } }, + "experimental/packages/api-events/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/api-events/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/api-events/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/api-events/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -813,15 +900,20 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, + "experimental/packages/api-events/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "experimental/packages/api-logs": { "name": "@opentelemetry/api-logs", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.0.0" @@ -845,68 +937,100 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" } }, + "experimental/packages/api-logs/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/api-logs/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/api-logs/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/api-logs/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -915,30 +1039,34 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, - "experimental/packages/exporter-logs-otlp-grpc": { - "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.45.1", + "experimental/packages/api-logs/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-grpc": { + "name": "@opentelemetry/exporter-logs-otlp-grpc", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" }, "devDependencies": { - "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -962,19 +1090,20 @@ }, "experimental/packages/exporter-logs-otlp-http": { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -997,9 +1126,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -1008,62 +1137,194 @@ "@opentelemetry/api": "^1.0.0" } }, + "experimental/packages/exporter-logs-otlp-http/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/exporter-logs-otlp-http/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/exporter-logs-otlp-http/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -1072,40 +1333,92 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/exporter-logs-otlp-http/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/exporter-logs-otlp-http/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-http/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/exporter-logs-otlp-proto": { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -1127,9 +1440,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -1138,62 +1451,194 @@ "@opentelemetry/api": "^1.0.0" } }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/exporter-logs-otlp-proto/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/exporter-logs-otlp-proto/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -1202,41 +1647,92 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/exporter-logs-otlp-proto/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/exporter-logs-otlp-proto/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-logs-otlp-proto/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/exporter-trace-otlp-grpc": { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/otlp-exporter-base": "0.48.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -1260,17 +1756,18 @@ }, "experimental/packages/exporter-trace-otlp-http": { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -1294,9 +1791,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -1305,62 +1802,194 @@ "@opentelemetry/api": "^1.0.0" } }, - "experimental/packages/exporter-trace-otlp-http/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "experimental/packages/exporter-trace-otlp-http/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", "dev": true, "license": "MIT", - "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - }, "engines": { - "node": ">= 6.9.0" + "node": ">=14.15.0" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "experimental/packages/exporter-trace-otlp-http/node_modules/webpack": { - "version": "4.46.0", + "experimental/packages/exporter-trace-otlp-http/node_modules/@webpack-cli/info": { + "version": "2.0.2", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -1369,38 +1998,90 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/exporter-trace-otlp-http/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/exporter-trace-otlp-http/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-http/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/exporter-trace-otlp-proto": { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -1422,7 +2103,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", + "webpack": "5.89.0", "webpack-cli": "4.10.0", "webpack-merge": "5.9.0" }, @@ -1433,239 +2114,1448 @@ "@opentelemetry/api": "^1.0.0" } }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/exporter-trace-otlp-proto/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/exporter-trace-otlp-proto/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/webpack-merge": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", + "dev": true, + "dependencies": { + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/exporter-trace-otlp-proto/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-browser-detector": { + "name": "@opentelemetry/opentelemetry-browser-detector", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" + }, + "devDependencies": { + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": "1.7.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "babel-plugin-istanbul": "6.1.1", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-browser-detector/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc": { + "name": "@opentelemetry/exporter-metrics-otlp-grpc", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@grpc/grpc-js": "^1.7.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" + }, + "devDependencies": { + "@grpc/proto-loader": "^0.7.10", + "@opentelemetry/api": "1.7.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "codecov": "3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http": { + "name": "@opentelemetry/exporter-metrics-otlp-http", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" + }, + "devDependencies": { + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": "1.7.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "codecov": "3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-proto": { + "name": "@opentelemetry/exporter-metrics-otlp-proto", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" + }, + "devDependencies": { + "@babel/core": "7.23.6", + "@opentelemetry/api": "1.7.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "codecov": "3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "experimental/packages/opentelemetry-exporter-prometheus": { + "name": "@opentelemetry/exporter-prometheus", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0" + }, + "devDependencies": { + "@opentelemetry/api": "1.7.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "experimental/packages/opentelemetry-instrumentation": { + "name": "@opentelemetry/instrumentation", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "1.7.1", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1" + }, + "devDependencies": { + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": "1.7.0", + "@opentelemetry/api-logs": "0.47.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/semver": "7.5.6", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "codecov": "3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/api-logs": "^0.46.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch": { + "name": "@opentelemetry/instrumentation-fetch", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" + }, + "devDependencies": { + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": "1.7.0", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, + "peerDependencies": { + "webpack": "5.x.x" + }, "peerDependenciesMeta": { - "webpack-cli": { + "@webpack-cli/generators": { "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/exporter-trace-otlp-proto/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, - "experimental/packages/opentelemetry-browser-detector": { - "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.45.1", + "experimental/packages/opentelemetry-instrumentation-grpc": { + "name": "@opentelemetry/instrumentation-grpc", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { - "@babel/core": "7.23.6", + "@bufbuild/buf": "1.21.0-1", + "@grpc/grpc-js": "^1.7.1", + "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@protobuf-ts/grpc-transport": "2.9.3", + "@protobuf-ts/runtime": "2.9.3", + "@protobuf-ts/runtime-rpc": "2.9.3", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", - "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", "lerna": "6.6.2", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", - "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "typescript": "4.4.4" }, "engines": { "node": ">=18" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "experimental/packages/opentelemetry-browser-detector/node_modules/terser-webpack-plugin": { - "version": "1.4.5", - "dev": true, - "license": "MIT", - "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - }, - "engines": { - "node": ">= 6.9.0" - }, - "peerDependencies": { - "webpack": "^4.0.0" - } - }, - "experimental/packages/opentelemetry-browser-detector/node_modules/webpack": { - "version": "4.46.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=6.11.5" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - }, - "webpack-command": { - "optional": true - } - } - }, - "experimental/packages/opentelemetry-browser-detector/node_modules/webpack-merge": { - "version": "5.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" - }, - "engines": { - "node": ">=10.0.0" + "@opentelemetry/api": "^1.3.0" } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc": { - "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.45.1", + "experimental/packages/opentelemetry-instrumentation-http": { + "name": "@opentelemetry/instrumentation-http", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "semver": "^7.5.2" }, "devDependencies": { - "@babel/core": "7.23.6", - "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/request-promise-native": "1.0.21", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", + "@types/superagent": "4.1.24", + "axios": "1.5.1", "codecov": "3.8.3", - "cpx": "1.5.0", "cross-var": "1.1.0", "lerna": "6.6.2", "mocha": "10.2.0", + "nock": "13.3.8", "nyc": "15.1.0", + "request": "2.88.2", + "request-promise-native": "1.0.9", "sinon": "15.1.2", - "ts-loader": "8.4.0", + "superagent": "8.0.9", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, @@ -1676,20 +3566,33 @@ "@opentelemetry/api": "^1.3.0" } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-http": { - "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.45.1", + "experimental/packages/opentelemetry-instrumentation-http/node_modules/axios": { + "version": "1.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request": { + "name": "@opentelemetry/instrumentation-xml-http-request", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -1697,7 +3600,6 @@ "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", - "cpx": "1.5.0", "cross-var": "1.1.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", @@ -1712,673 +3614,595 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "@opentelemetry/api": "^1.0.0" } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", "dev": true, "license": "MIT", - "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - }, "engines": { - "node": ">= 6.9.0" + "node": ">=14.15.0" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/webpack": { - "version": "4.46.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/@webpack-cli/info": { + "version": "2.0.2", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - }, - "bin": { - "webpack": "bin/webpack.js" + "engines": { + "node": ">=14.15.0" }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", "engines": { - "node": ">=6.11.5" + "node": ">=14.15.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" }, "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - }, - "webpack-command": { + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-http/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/cross-spawn": { + "version": "7.0.3", "dev": true, "license": "MIT", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, - "experimental/packages/opentelemetry-exporter-metrics-otlp-proto": { - "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.45.1", - "license": "Apache-2.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" - }, - "devDependencies": { - "@babel/core": "7.23.6", - "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">=10.13.0" } }, - "experimental/packages/opentelemetry-exporter-prometheus": { - "name": "@opentelemetry/exporter-prometheus", - "version": "0.45.1", - "license": "Apache-2.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1" - }, - "devDependencies": { - "@opentelemetry/api": "1.7.0", - "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "resolve": "^1.20.0" }, "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">= 10.13.0" } }, - "experimental/packages/opentelemetry-instrumentation": { - "name": "@opentelemetry/instrumentation", - "version": "0.45.1", - "license": "Apache-2.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", "dependencies": { - "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.6.0", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1" - }, - "devDependencies": { - "@babel/core": "7.23.6", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/semver": "7.5.6", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "shebang-regex": "^3.0.0" }, "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">=8" } }, - "experimental/packages/opentelemetry-instrumentation-fetch": { - "name": "@opentelemetry/instrumentation-fetch", - "version": "0.45.1", - "license": "Apache-2.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "devDependencies": { - "@babel/core": "7.23.6", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">=18" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/webpack": { + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" }, "engines": { - "node": ">= 6.9.0" + "node": ">=10.13.0" }, - "peerDependencies": { - "webpack": "^4.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, - "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/webpack": { - "version": "4.46.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/webpack-cli": { + "version": "5.1.4", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" }, "bin": { - "webpack": "bin/webpack.js" + "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, + "peerDependencies": { + "webpack": "5.x.x" + }, "peerDependenciesMeta": { - "webpack-cli": { + "@webpack-cli/generators": { "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/opentelemetry-instrumentation-fetch/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, - "experimental/packages/opentelemetry-instrumentation-grpc": { - "name": "@opentelemetry/instrumentation-grpc", - "version": "0.45.1", - "license": "Apache-2.0", + "experimental/packages/opentelemetry-instrumentation/node_modules/@opentelemetry/api-logs": { + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.47.0.tgz", + "integrity": "sha512-AR6UOVcWZkuibLR/7/OecYJasncAf6VstNV/KT5qHq1HShVFmJetcgim0KMog/ON23yHZQjT9GPVTwB0FEhPQA==", + "dev": true, "dependencies": { - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/api": "^1.0.0" }, - "devDependencies": { - "@bufbuild/buf": "1.21.0-1", - "@grpc/grpc-js": "^1.7.1", - "@grpc/proto-loader": "^0.7.10", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@protobuf-ts/grpc-transport": "2.9.3", - "@protobuf-ts/runtime": "2.9.3", - "@protobuf-ts/runtime-rpc": "2.9.3", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "engines": { + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", "engines": { - "node": ">=18" + "node": ">=14.15.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "experimental/packages/opentelemetry-instrumentation-http": { - "name": "@opentelemetry/instrumentation-http", - "version": "0.45.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "experimental/packages/opentelemetry-instrumentation/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" }, - "devDependencies": { - "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/request-promise-native": "1.0.21", - "@types/sinon": "10.0.20", - "@types/superagent": "4.1.24", - "axios": "1.5.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nock": "13.3.8", - "nyc": "15.1.0", - "request": "2.88.2", - "request-promise-native": "1.0.9", - "sinon": "15.1.2", - "superagent": "8.0.9", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", "engines": { - "node": ">=18" + "node": ">=14" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "engines": { + "node": ">= 8" } }, - "experimental/packages/opentelemetry-instrumentation-http/node_modules/axios": { - "version": "1.5.1", + "experimental/packages/opentelemetry-instrumentation/node_modules/enhanced-resolve": { + "version": "5.15.0", "dev": true, "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" } }, - "experimental/packages/opentelemetry-instrumentation-xml-http-request": { - "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.45.1", + "experimental/packages/opentelemetry-instrumentation/node_modules/import-in-the-middle": { + "version": "1.7.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "devDependencies": { - "@babel/core": "7.23.6", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "node": ">=10.13.0" } }, - "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "experimental/packages/opentelemetry-instrumentation/node_modules/rechoir": { + "version": "0.8.0", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "resolve": "^1.20.0" }, "engines": { - "node": ">= 6.9.0" - }, - "peerDependencies": { - "webpack": "^4.0.0" + "node": ">= 10.13.0" } }, - "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/webpack": { - "version": "4.46.0", + "experimental/packages/opentelemetry-instrumentation/node_modules/shebang-command": { + "version": "2.0.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "shebang-regex": "^3.0.0" }, - "bin": { - "webpack": "bin/webpack.js" + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">=6.11.5" + "node": ">= 10.13.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, + "peerDependencies": { + "webpack": "^5.1.0" + }, "peerDependenciesMeta": { - "webpack-cli": { + "@swc/core": { "optional": true }, - "webpack-command": { + "esbuild": { + "optional": true + }, + "uglify-js": { "optional": true } } }, - "experimental/packages/opentelemetry-instrumentation-xml-http-request/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/opentelemetry-instrumentation/node_modules/webpack": { + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, - "engines": { - "node": ">=10.0.0" - } - }, - "experimental/packages/opentelemetry-instrumentation/node_modules/terser-webpack-plugin": { - "version": "1.4.5", - "dev": true, - "license": "MIT", - "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "bin": { + "webpack": "bin/webpack.js" }, "engines": { - "node": ">= 6.9.0" + "node": ">=10.13.0" }, - "peerDependencies": { - "webpack": "^4.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, - "experimental/packages/opentelemetry-instrumentation/node_modules/webpack": { - "version": "4.46.0", + "experimental/packages/opentelemetry-instrumentation/node_modules/webpack-cli": { + "version": "5.1.4", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" }, "bin": { - "webpack": "bin/webpack.js" + "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, + "peerDependencies": { + "webpack": "5.x.x" + }, "peerDependenciesMeta": { - "webpack-cli": { + "@webpack-cli/generators": { "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/opentelemetry-instrumentation/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/opentelemetry-instrumentation/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/opentelemetry-instrumentation/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/opentelemetry-sdk-node": { "name": "@opentelemetry/sdk-node", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/exporter-jaeger": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/exporter-jaeger": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -2399,13 +4223,14 @@ }, "experimental/packages/otlp-exporter-base": { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -2426,9 +4251,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -2437,62 +4262,194 @@ "@opentelemetry/api": "^1.0.0" } }, + "experimental/packages/otlp-exporter-base/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/otlp-exporter-base/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/otlp-exporter-base/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/otlp-exporter-base/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -2501,40 +4458,90 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "experimental/packages/otlp-exporter-base/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/otlp-exporter-base/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/otlp-exporter-base/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/otlp-exporter-base/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/otlp-grpc-exporter-base": { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", "protobufjs": "^7.2.3" }, "devDependencies": { - "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -2559,15 +4566,16 @@ }, "experimental/packages/otlp-proto-exporter-base": { "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", "protobufjs": "^7.2.3" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -2592,15 +4600,15 @@ }, "experimental/packages/otlp-transformer": { "name": "@opentelemetry/otlp-transformer", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "devDependencies": { "@opentelemetry/api": "1.7.0", @@ -2621,7 +4629,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" @@ -2630,62 +4638,94 @@ "@opentelemetry/api": ">=1.3.0 <1.8.0" } }, + "experimental/packages/otlp-transformer/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/otlp-transformer/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/otlp-transformer/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/otlp-transformer/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -2694,24 +4734,31 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, + "experimental/packages/otlp-transformer/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "experimental/packages/sdk-logs": { "name": "@opentelemetry/sdk-logs", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.4.0 <1.8.0", - "@opentelemetry/api-logs": "0.45.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -2731,9 +4778,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -2743,62 +4790,240 @@ "@opentelemetry/api-logs": ">=0.39.1" } }, + "experimental/packages/sdk-logs/node_modules/@opentelemetry/api": { + "version": "1.4.1", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, + "experimental/packages/sdk-logs/node_modules/@opentelemetry/resources_1.9.0": { + "name": "@opentelemetry/resources", + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.9.0", + "@opentelemetry/semantic-conventions": "1.9.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "experimental/packages/sdk-logs/node_modules/@opentelemetry/resources_1.9.0/node_modules/@opentelemetry/core": { + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.9.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "experimental/packages/sdk-logs/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/sdk-logs/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/sdk-logs/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "experimental/packages/sdk-logs/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "experimental/packages/sdk-logs/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "experimental/packages/sdk-logs/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "experimental/packages/sdk-logs/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/sdk-logs/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/sdk-logs/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "experimental/packages/sdk-logs/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "experimental/packages/sdk-logs/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "experimental/packages/sdk-logs/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "experimental/packages/sdk-logs/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "experimental/packages/sdk-logs/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -2807,39 +5032,91 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "experimental/packages/sdk-logs/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "experimental/packages/sdk-logs/node_modules/webpack-merge": { - "version": "5.9.0", + "experimental/packages/sdk-logs/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "experimental/packages/sdk-logs/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "experimental/packages/shim-opencensus": { "name": "@opentelemetry/shim-opencensus", - "version": "0.45.1", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "require-in-the-middle": "^7.1.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2" }, "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -2860,14 +5137,328 @@ "@opentelemetry/api": "^1.0.0" } }, + "integration-tests/api": { + "name": "@opentelemetry/integration-tests-api", + "version": "1.21.0", + "license": "Apache-2.0", + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "9.1.1", + "@types/node": "18.6.5", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.0.0", + "nyc": "15.1.0" + }, + "engines": { + "node": ">=14" + } + }, + "integration-tests/api/node_modules/@types/mocha": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "dev": true + }, + "integration-tests/api/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "integration-tests/api/node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "integration-tests/api/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "integration-tests/api/node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "integration-tests/api/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "integration-tests/api/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "integration-tests/api/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "integration-tests/api/node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "integration-tests/api/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "integration-tests/api/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "integration-tests/api/node_modules/mocha": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", + "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "integration-tests/api/node_modules/mocha/node_modules/minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "integration-tests/api/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "integration-tests/api/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "integration-tests/api/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "integration-tests/api/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "integration-tests/api/node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "integration-tests/api/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "integration-tests/api/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "integration-tests/api/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, "integration-tests/propagation-validation-server": { - "version": "1.19.1", + "version": "1.22.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "axios": "1.5.1", "body-parser": "1.19.0", "express": "4.17.3" @@ -2915,9 +5506,8 @@ }, "node_modules/@babel/code-frame": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", - "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" @@ -2992,18 +5582,16 @@ }, "node_modules/@babel/compat-data": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", - "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz", - "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -3044,9 +5632,8 @@ }, "node_modules/@babel/generator": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", - "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", @@ -3081,9 +5668,8 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", @@ -3227,9 +5813,8 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", - "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -3330,9 +5915,8 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", - "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -3347,9 +5931,8 @@ }, "node_modules/@babel/helper-validator-option": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -3369,9 +5952,8 @@ }, "node_modules/@babel/helpers": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz", - "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.6", @@ -3383,9 +5965,8 @@ }, "node_modules/@babel/highlight": { "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", - "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -3461,9 +6042,8 @@ }, "node_modules/@babel/parser": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", - "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "dev": true, + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -4677,9 +7257,8 @@ }, "node_modules/@babel/traverse": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz", - "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -4698,9 +7277,8 @@ }, "node_modules/@babel/types": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", - "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", @@ -4732,21 +7310,6 @@ "@bufbuild/buf-win32-x64": "1.21.0-1" } }, - "node_modules/@bufbuild/buf-darwin-x64": { - "version": "1.21.0-1", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@colors/colors": { "version": "1.5.0", "dev": true, @@ -7056,20 +9619,6 @@ "nx": ">= 14.1 <= 16" } }, - "node_modules/@nrwl/nx-darwin-x64": { - "version": "15.9.7", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/@nrwl/tao": { "version": "15.9.7", "dev": true, @@ -7415,6 +9964,10 @@ "resolved": "experimental/packages/opentelemetry-instrumentation-xml-http-request", "link": true }, + "node_modules/@opentelemetry/integration-tests-api": { + "resolved": "integration-tests/api", + "link": true + }, "node_modules/@opentelemetry/opentelemetry-browser-detector": { "resolved": "experimental/packages/opentelemetry-browser-detector", "link": true @@ -7623,9 +10176,8 @@ }, "node_modules/@protobuf-ts/grpc-transport": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/grpc-transport/-/grpc-transport-2.9.3.tgz", - "integrity": "sha512-2TarJgLrvhHVBpxgJonPeZzEtqlbQJeSTpFZjkNI5Ye+18r8SUIcvZhl4LLS1q4zjIQl/O7lZt/x27PTNglLpg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@protobuf-ts/runtime": "^2.9.3", "@protobuf-ts/runtime-rpc": "^2.9.3" @@ -7636,15 +10188,13 @@ }, "node_modules/@protobuf-ts/runtime": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.3.tgz", - "integrity": "sha512-nivzCpg/qYD0RX2OmHOahJALb8ndjGmUhNBcTJ0BbXoqKwCSM6vYA+vegzS3rhuaPgbyC7Ec8idlnizzUfIRuw==", - "dev": true + "dev": true, + "license": "(Apache-2.0 AND BSD-3-Clause)" }, "node_modules/@protobuf-ts/runtime-rpc": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.3.tgz", - "integrity": "sha512-WelHpctvZeG8yhbb7tnsrLzotq9xjMCXuGuhJ8qMyEdNoBBEodbXseofAYFTebo2/PN2LzyEq3X6vwr5f8jqTA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@protobuf-ts/runtime": "^2.9.3" } @@ -8240,7 +10790,7 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.6", + "version": "3.7.7", "dev": true, "license": "MIT", "dependencies": { @@ -8295,9 +10845,8 @@ }, "node_modules/@types/jquery": { "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", - "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", "dev": true, + "license": "MIT", "dependencies": { "@types/sizzle": "*" } @@ -8333,9 +10882,8 @@ }, "node_modules/@types/lodash.merge": { "version": "4.6.9", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", - "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/lodash": "*" } @@ -8371,9 +10919,8 @@ }, "node_modules/@types/mocha": { "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node": { "version": "18.6.5", @@ -8420,9 +10967,8 @@ }, "node_modules/@types/request-promise-native": { "version": "1.0.21", - "resolved": "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.21.tgz", - "integrity": "sha512-NJ1M6iqWTEUT+qdP+OmXsRZ6tSdkoBdblHKatIWTVP1HdYpHU3IkfpLPf4MWb0+CC4Nl3TtLpYhDlhjZxytDIA==", "dev": true, + "license": "MIT", "dependencies": { "@types/request": "*" } @@ -8463,9 +11009,8 @@ }, "node_modules/@types/semver": { "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/send": { "version": "0.17.3", @@ -8524,51 +11069,28 @@ "@types/node": "*" } }, - "node_modules/@types/source-list-map": { - "version": "0.1.4", - "dev": true, - "license": "MIT" - }, "node_modules/@types/superagent": { "version": "4.1.24", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.24.tgz", - "integrity": "sha512-mEafCgyKiMFin24SDzWN7yAADt4gt6YawFiNMp0QS5ZPboORfyxFt0s3VzJKhTaKg9py/4FUmrHLTNfJKt9Rbw==", "dev": true, + "license": "MIT", "dependencies": { "@types/cookiejar": "*", "@types/node": "*" } }, - "node_modules/@types/tapable": { - "version": "1.0.10", - "dev": true, - "license": "MIT" - }, "node_modules/@types/tough-cookie": { "version": "4.0.4", "dev": true, "license": "MIT" }, - "node_modules/@types/uglify-js": { - "version": "3.17.3", - "dev": true, - "license": "MIT", - "dependencies": { - "source-map": "^0.6.1" - } - }, "node_modules/@types/webpack": { - "version": "4.41.38", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz", - "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==", + "version": "5.28.5", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", - "@types/tapable": "^1", - "@types/uglify-js": "*", - "@types/webpack-sources": "*", - "anymatch": "^3.0.0", - "source-map": "^0.6.0" + "tapable": "^2.2.0", + "webpack": "^5" } }, "node_modules/@types/webpack-env": { @@ -8576,22 +11098,111 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/webpack-sources": { - "version": "3.2.2", + "node_modules/@types/webpack/node_modules/enhanced-resolve": { + "version": "5.15.0", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.7.3" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" } }, - "node_modules/@types/webpack-sources/node_modules/source-map": { - "version": "0.7.4", + "node_modules/@types/webpack/node_modules/tapable": { + "version": "2.2.1", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "engines": { - "node": ">= 8" + "node": ">=6" + } + }, + "node_modules/@types/webpack/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/@types/webpack/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/@types/webpack/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" } }, "node_modules/@types/ws": { @@ -8783,18 +11394,6 @@ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { - "version": "5.1.1", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@typescript-eslint/visitor-keys": { "version": "5.59.11", "dev": true, @@ -8817,20 +11416,14 @@ "license": "ISC" }, "node_modules/@webassemblyjs/ast": { - "version": "1.9.0", + "version": "1.11.6", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, - "node_modules/@webassemblyjs/ast/node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.6", "dev": true, @@ -8850,14 +11443,33 @@ "version": "1.9.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@webassemblyjs/wast-printer": "1.9.0" } }, + "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@webassemblyjs/helper-code-frame/node_modules/@webassemblyjs/wast-printer": { "version": "1.9.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/wast-parser": "1.9.0", @@ -8867,16 +11479,35 @@ "node_modules/@webassemblyjs/helper-fsm": { "version": "1.9.0", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/@webassemblyjs/helper-module-context": { "version": "1.9.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@webassemblyjs/ast": "1.9.0" } }, + "node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "dev": true, @@ -8903,15 +11534,6 @@ "@webassemblyjs/wasm-gen": "1.11.6" } }, - "node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, "node_modules/@webassemblyjs/ieee754": { "version": "1.11.6", "dev": true, @@ -8934,93 +11556,18 @@ "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/helper-wasm-section": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-opt": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "@webassemblyjs/wast-printer": "1.9.0" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-buffer": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ieee754": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/leb128": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/utf8": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wasm-gen": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wasm-opt": { - "version": "1.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0" - } - }, - "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wast-printer": { - "version": "1.9.0", + "version": "1.11.6", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0", - "@xtuc/long": "4.2.2" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { @@ -9035,15 +11582,6 @@ "@webassemblyjs/utf8": "1.11.6" } }, - "node_modules/@webassemblyjs/wasm-gen/node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, "node_modules/@webassemblyjs/wasm-opt": { "version": "1.11.6", "dev": true, @@ -9055,16 +11593,7 @@ "@webassemblyjs/wasm-parser": "1.11.6" } }, - "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/wasm-parser": { + "node_modules/@webassemblyjs/wasm-parser": { "version": "1.11.6", "dev": true, "license": "MIT", @@ -9077,72 +11606,48 @@ "@webassemblyjs/utf8": "1.11.6" } }, - "node_modules/@webassemblyjs/wasm-parser": { + "node_modules/@webassemblyjs/wast-parser": { "version": "1.9.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/floating-point-hex-parser": "1.9.0", "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" + "@webassemblyjs/helper-code-frame": "1.9.0", + "@webassemblyjs/helper-fsm": "1.9.0", + "@xtuc/long": "4.2.2" } }, - "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-api-error": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ieee754": { + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast": { "version": "1.9.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "@xtuc/ieee754": "^1.2.0" + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" } }, - "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/leb128": { + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.9.0", "dev": true, "license": "MIT", - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/utf8": { - "version": "1.9.0", - "dev": true, - "license": "MIT" + "peer": true }, - "node_modules/@webassemblyjs/wast-parser": { + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-api-error": { "version": "1.9.0", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/floating-point-hex-parser": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-code-frame": "1.9.0", - "@webassemblyjs/helper-fsm": "1.9.0", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.9.0", - "dev": true, - "license": "MIT" + "peer": true }, - "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-api-error": { + "node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.9.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@webassemblyjs/wast-printer": { "version": "1.11.6", @@ -9153,48 +11658,6 @@ "@xtuc/long": "4.2.2" } }, - "node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webpack-cli/configtest": { - "version": "1.2.0", - "dev": true, - "license": "MIT", - "peerDependencies": { - "webpack": "4.x.x || 5.x.x", - "webpack-cli": "4.x.x" - } - }, - "node_modules/@webpack-cli/info": { - "version": "1.5.0", - "dev": true, - "license": "MIT", - "dependencies": { - "envinfo": "^7.7.3" - }, - "peerDependencies": { - "webpack-cli": "4.x.x" - } - }, - "node_modules/@webpack-cli/serve": { - "version": "1.7.0", - "dev": true, - "license": "MIT", - "peerDependencies": { - "webpack-cli": "4.x.x" - }, - "peerDependenciesMeta": { - "webpack-dev-server": { - "optional": true - } - } - }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "dev": true, @@ -9274,8 +11737,7 @@ } }, "node_modules/acorn": { - "version": "6.4.2", - "dev": true, + "version": "8.11.2", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -9304,6 +11766,13 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "license": "MIT", + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "dev": true, @@ -9743,6 +12212,7 @@ "version": "5.4.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -9753,12 +12223,14 @@ "node_modules/asn1.js/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/assert": { "version": "1.5.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "object.assign": "^4.1.4", "util": "^0.10.4" @@ -9775,12 +12247,14 @@ "node_modules/assert/node_modules/inherits": { "version": "2.0.3", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/assert/node_modules/util": { "version": "0.10.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "2.0.3" } @@ -11148,8 +13622,9 @@ }, "node_modules/bindings": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "dev": true, - "license": "MIT", "optional": true, "dependencies": { "file-uri-to-path": "1.0.0" @@ -11209,7 +13684,8 @@ "node_modules/bn.js": { "version": "5.2.1", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/body-parser": { "version": "1.19.0", @@ -11394,7 +13870,8 @@ "node_modules/brorand": { "version": "1.1.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/browser-process-hrtime": { "version": "1.0.0", @@ -11410,6 +13887,7 @@ "version": "1.2.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", @@ -11423,6 +13901,7 @@ "version": "1.0.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -11433,6 +13912,7 @@ "version": "1.0.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -11444,6 +13924,7 @@ "version": "4.1.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -11453,6 +13934,7 @@ "version": "4.2.2", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "bn.js": "^5.2.1", "browserify-rsa": "^4.1.0", @@ -11472,6 +13954,7 @@ "version": "3.6.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -11485,14 +13968,13 @@ "version": "0.2.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "pako": "~1.0.5" } }, "node_modules/browserslist": { "version": "4.22.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "dev": true, "funding": [ { @@ -11508,6 +13990,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001565", "electron-to-chromium": "^1.4.601", @@ -11536,6 +14019,7 @@ "version": "4.9.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -11563,7 +14047,8 @@ "node_modules/buffer-xor": { "version": "1.0.3", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/bufrw": { "version": "1.4.0", @@ -11580,7 +14065,8 @@ "node_modules/builtin-status-codes": { "version": "3.0.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/builtins": { "version": "5.0.1", @@ -11623,6 +14109,7 @@ "version": "12.0.4", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "bluebird": "^3.5.5", "chownr": "^1.1.1", @@ -11764,9 +14251,7 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001570", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", - "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", + "version": "1.0.30001568", "dev": true, "funding": [ { @@ -11781,7 +14266,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/caseless": { "version": "0.12.0", @@ -11919,6 +14405,25 @@ "node": ">=0.10.0" } }, + "node_modules/chokidar/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/chokidar/node_modules/is-extglob": { "version": "1.0.0", "dev": true, @@ -11986,7 +14491,8 @@ "node_modules/chownr": { "version": "1.1.4", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/chrome-trace-event": { "version": "1.0.3", @@ -11997,7 +14503,7 @@ } }, "node_modules/chromedriver": { - "version": "119.0.1", + "version": "120.0.0", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", @@ -12049,6 +14555,7 @@ "version": "1.0.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -12517,7 +15024,8 @@ }, "node_modules/console-browserify": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true }, "node_modules/console-control-strings": { "version": "1.1.0", @@ -12527,7 +15035,8 @@ "node_modules/constants-browserify": { "version": "1.0.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/content-disposition": { "version": "0.5.4", @@ -12746,6 +15255,7 @@ "version": "1.0.5", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", @@ -12758,7 +15268,8 @@ "node_modules/copy-concurrently/node_modules/aproba": { "version": "1.2.0", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/copy-descriptor": { "version": "0.1.1", @@ -12879,6 +15390,7 @@ "version": "4.0.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -12887,12 +15399,14 @@ "node_modules/create-ecdh/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/create-hash": { "version": "1.2.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", @@ -12905,6 +15419,7 @@ "version": "1.1.7", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", @@ -13023,6 +15538,7 @@ "version": "3.12.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -13088,7 +15604,8 @@ "node_modules/cyclist": { "version": "1.0.2", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/dargs": { "version": "7.0.0", @@ -13642,6 +16159,7 @@ "version": "1.1.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -13703,6 +16221,7 @@ "version": "5.0.3", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -13712,7 +16231,8 @@ "node_modules/diffie-hellman/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/dir-glob": { "version": "3.0.1", @@ -13788,6 +16308,7 @@ "version": "1.2.0", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.4", "npm": ">=1.2" @@ -13949,6 +16470,7 @@ "version": "3.7.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", @@ -13990,14 +16512,14 @@ }, "node_modules/electron-to-chromium": { "version": "1.4.611", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz", - "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/elliptic": { "version": "6.5.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -14011,7 +16533,8 @@ "node_modules/elliptic/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/email-addresses": { "version": "5.0.0", @@ -14223,7 +16746,7 @@ } }, "node_modules/es-module-lexer": { - "version": "1.3.1", + "version": "1.4.1", "dev": true, "license": "MIT" }, @@ -14430,15 +16953,15 @@ } }, "node_modules/eslint-scope": { - "version": "4.0.3", + "version": "5.1.1", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" }, "engines": { - "node": ">=4.0.0" + "node": ">=8.0.0" } }, "node_modules/eslint-utils": { @@ -14672,17 +17195,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/espree/node_modules/acorn": { - "version": "8.11.2", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/esprima": { "version": "4.0.1", "dev": true, @@ -14811,6 +17323,7 @@ "version": "1.0.3", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" @@ -15386,7 +17899,8 @@ "node_modules/figgy-pudding": { "version": "3.5.2", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/figures": { "version": "3.2.0", @@ -15423,8 +17937,9 @@ }, "node_modules/file-uri-to-path": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "dev": true, - "license": "MIT", "optional": true }, "node_modules/file-url": { @@ -15536,6 +18051,7 @@ "version": "2.1.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "commondir": "^1.0.1", "make-dir": "^2.0.0", @@ -15549,6 +18065,7 @@ "version": "2.1.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -15561,6 +18078,7 @@ "version": "4.0.1", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=6" } @@ -15569,6 +18087,7 @@ "version": "5.7.2", "dev": true, "license": "ISC", + "peer": true, "bin": { "semver": "bin/semver" } @@ -15634,13 +18153,14 @@ "version": "1.1.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.3", "readable-stream": "^2.3.6" } }, "node_modules/follow-redirects": { - "version": "1.15.3", + "version": "1.15.4", "funding": [ { "type": "individual", @@ -15816,6 +18336,7 @@ "version": "2.3.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.1", "readable-stream": "^2.0.0" @@ -15886,6 +18407,7 @@ "version": "1.0.10", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "iferr": "^0.1.5", @@ -15899,20 +18421,17 @@ "license": "ISC" }, "node_modules/fsevents": { - "version": "1.2.13", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, - "license": "MIT", "optional": true, "os": [ "darwin" ], - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - }, "engines": { - "node": ">= 4.0" + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, "node_modules/function-bind": { @@ -15950,9 +18469,8 @@ }, "node_modules/gaxios": { "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.1.1.tgz", - "integrity": "sha512-bw8smrX+XlAoo9o1JAksBwX+hi/RG15J+NTSxmNPIclKC3ZVK6C2afwY8OSdRvOK0+ZLecUJYtj2MmjOt3Dm0w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", @@ -15965,9 +18483,8 @@ }, "node_modules/gaxios/node_modules/agent-base": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -15977,9 +18494,8 @@ }, "node_modules/gaxios/node_modules/https-proxy-agent": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -15990,9 +18506,8 @@ }, "node_modules/gaxios/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -16010,21 +18525,18 @@ }, "node_modules/gaxios/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/gaxios/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/gaxios/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dev": true, + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -16780,6 +19292,7 @@ "version": "3.1.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.4", "readable-stream": "^3.6.0", @@ -16793,6 +19306,7 @@ "version": "3.6.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -16806,6 +19320,7 @@ "version": "1.1.7", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" @@ -16900,6 +19415,7 @@ "version": "1.0.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -17150,7 +19666,8 @@ "node_modules/https-browserify": { "version": "1.0.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/https-example": { "resolved": "examples/https", @@ -17216,7 +19733,8 @@ "node_modules/iferr": { "version": "0.1.5", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/ignore": { "version": "5.2.4", @@ -17262,34 +19780,6 @@ "node": ">=4" } }, - "node_modules/import-in-the-middle": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.6.0.tgz", - "integrity": "sha512-ENmVXh2AC5PV5xmtPK0QCV6nyde5Y8dXhMZFGDSYhlLcdBPJofge1bf6PnWzs7fnzyuesh/q/CPwO7/6HOTWqQ==", - "dependencies": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, - "node_modules/import-in-the-middle/node_modules/acorn": { - "version": "8.11.2", - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/import-in-the-middle/node_modules/acorn-import-assertions": { - "version": "1.9.0", - "license": "MIT", - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/import-local": { "version": "3.1.0", "dev": true, @@ -17458,14 +19948,6 @@ "url": "https://github.com/sindresorhus/internal-ip?sponsor=1" } }, - "node_modules/interpret": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, "node_modules/invariant": { "version": "2.2.4", "dev": true, @@ -17901,6 +20383,7 @@ "version": "1.1.0", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=4" } @@ -18377,17 +20860,6 @@ } } }, - "node_modules/jsdom/node_modules/acorn": { - "version": "8.11.2", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/jsdom/node_modules/agent-base": { "version": "6.0.2", "dev": true, @@ -18684,6 +21156,19 @@ "webpack": "^4.0.0" } }, + "node_modules/karma-webpack/node_modules/schema-utils": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + }, + "engines": { + "node": ">= 4" + } + }, "node_modules/karma-webpack/node_modules/source-map": { "version": "0.7.4", "dev": true, @@ -18726,18 +21211,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/karma/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/karma/node_modules/glob-parent": { "version": "5.1.2", "dev": true, @@ -19320,9 +21793,8 @@ }, "node_modules/linkinator": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.0.2.tgz", - "integrity": "sha512-28eiQVzGwaCvVUb/cxii5jraWZYUv5n2Q5CaSRUH9oGDo1Jr8GcREnpw/0IfJ5YTRoIt9/ihra2lG8yqCN292g==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^5.0.0", "escape-html": "^1.0.3", @@ -19344,9 +21816,8 @@ }, "node_modules/linkinator/node_modules/brace-expansion": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -19364,9 +21835,8 @@ }, "node_modules/linkinator/node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -19378,9 +21848,8 @@ }, "node_modules/linkinator/node_modules/foreground-child": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -19394,9 +21863,8 @@ }, "node_modules/linkinator/node_modules/glob": { "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.5", @@ -19438,9 +21906,8 @@ }, "node_modules/linkinator/node_modules/minimatch": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -19453,18 +21920,16 @@ }, "node_modules/linkinator/node_modules/minipass": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/linkinator/node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -19474,18 +21939,16 @@ }, "node_modules/linkinator/node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/linkinator/node_modules/signal-exit": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, + "license": "ISC", "engines": { "node": ">=14" }, @@ -19495,9 +21958,8 @@ }, "node_modules/linkinator/node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -19531,11 +21993,11 @@ } }, "node_modules/loader-runner": { - "version": "2.4.0", + "version": "4.3.0", "dev": true, "license": "MIT", "engines": { - "node": ">=4.3.0 <5.0.0 || >=5.10" + "node": ">=6.11.5" } }, "node_modules/loader-utils": { @@ -20360,9 +22822,8 @@ }, "node_modules/marked": { "version": "10.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-10.0.0.tgz", - "integrity": "sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==", "dev": true, + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -20379,6 +22840,7 @@ "version": "1.3.5", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1", @@ -20690,6 +23152,7 @@ "version": "4.0.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -20701,7 +23164,8 @@ "node_modules/miller-rabin/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/mime": { "version": "2.6.0", @@ -20763,7 +23227,8 @@ "node_modules/minimalistic-crypto-utils": { "version": "1.0.1", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/minimatch": { "version": "3.1.2", @@ -20902,6 +23367,7 @@ "version": "3.0.0", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "concat-stream": "^1.5.0", "duplexify": "^3.4.2", @@ -20925,6 +23391,7 @@ "node >= 0.8" ], "license": "MIT", + "peer": true, "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -20936,6 +23403,7 @@ "version": "2.0.5", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -21089,19 +23557,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mocha/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/mocha/node_modules/glob": { "version": "7.2.0", "dev": true, @@ -21305,6 +23760,7 @@ "version": "1.0.1", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", @@ -21317,7 +23773,8 @@ "node_modules/move-concurrently/node_modules/aproba": { "version": "1.2.0", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/ms": { "version": "2.1.2", @@ -21373,8 +23830,9 @@ }, "node_modules/nan": { "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, - "license": "MIT", "optional": true }, "node_modules/nanoid": { @@ -21639,18 +24097,6 @@ "node": ">=12" } }, - "node_modules/nightwatch/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/nightwatch/node_modules/glob-parent": { "version": "5.1.2", "dev": true, @@ -22123,6 +24569,7 @@ "version": "2.2.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.2.0", @@ -22162,9 +24609,8 @@ }, "node_modules/node-releases": { "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nopt": { "version": "7.2.0", @@ -23188,12 +25634,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.4", + "version": "4.1.5", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -23359,7 +25806,8 @@ "node_modules/os-browserify": { "version": "0.3.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/os-homedir": { "version": "1.0.2", @@ -23903,6 +26351,7 @@ "version": "1.2.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cyclist": "^1.0.1", "inherits": "^2.0.3", @@ -23924,6 +26373,7 @@ "version": "5.1.6", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", @@ -24047,7 +26497,8 @@ "node_modules/path-browserify": { "version": "0.0.1", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/path-dirname": { "version": "1.0.2", @@ -24150,6 +26601,7 @@ "version": "3.1.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -24234,6 +26686,7 @@ "version": "3.0.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "find-up": "^3.0.0" }, @@ -24245,6 +26698,7 @@ "version": "3.0.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "locate-path": "^3.0.0" }, @@ -24256,6 +26710,7 @@ "version": "3.0.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -24268,6 +26723,7 @@ "version": "3.0.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "p-limit": "^2.0.0" }, @@ -24279,6 +26735,7 @@ "version": "3.0.0", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=4" } @@ -24726,6 +27183,7 @@ "version": "4.0.3", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -24738,7 +27196,8 @@ "node_modules/public-encrypt/node_modules/bn.js": { "version": "4.12.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/pump": { "version": "3.0.0", @@ -24753,6 +27212,7 @@ "version": "1.5.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "duplexify": "^3.6.0", "inherits": "^2.0.3", @@ -24763,6 +27223,7 @@ "version": "2.0.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -24800,6 +27261,7 @@ "node_modules/querystring-es3": { "version": "0.2.1", "dev": true, + "peer": true, "engines": { "node": ">=0.4.x" } @@ -24872,6 +27334,7 @@ "version": "1.0.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -25260,17 +27723,6 @@ "node": ">=0.10" } }, - "node_modules/rechoir": { - "version": "0.7.1", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve": "^1.9.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/redent": { "version": "3.0.0", "dev": true, @@ -25719,6 +28171,7 @@ "version": "2.7.1", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "glob": "^7.1.3" }, @@ -25730,6 +28183,7 @@ "version": "2.0.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1" @@ -25805,6 +28259,7 @@ "version": "1.0.3", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "aproba": "^1.1.1" } @@ -25812,7 +28267,8 @@ "node_modules/run-queue/node_modules/aproba": { "version": "1.2.0", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/rxjs": { "version": "7.8.1", @@ -25864,16 +28320,20 @@ } }, "node_modules/schema-utils": { - "version": "1.0.0", + "version": "3.3.0", "dev": true, "license": "MIT", "dependencies": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" }, "engines": { - "node": ">= 4" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, "node_modules/select-hose": { @@ -26010,7 +28470,7 @@ } }, "node_modules/serialize-javascript": { - "version": "4.0.0", + "version": "6.0.1", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -26167,6 +28627,7 @@ "version": "2.4.11", "dev": true, "license": "(MIT AND BSD-3-Clause)", + "peer": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -27073,6 +29534,7 @@ "version": "6.0.2", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "figgy-pudding": "^3.5.1" } @@ -27150,6 +29612,7 @@ "version": "2.0.2", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -27167,6 +29630,7 @@ "version": "1.2.3", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "end-of-stream": "^1.1.0", "stream-shift": "^1.0.0" @@ -27184,6 +29648,7 @@ "version": "2.8.3", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -27195,7 +29660,8 @@ "node_modules/stream-shift": { "version": "1.0.1", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/streamroller": { "version": "3.1.5", @@ -27698,19 +30164,20 @@ } }, "node_modules/terser": { - "version": "4.8.1", + "version": "5.24.0", "dev": true, "license": "BSD-2-Clause", "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" }, "engines": { - "node": ">=6.0.0" + "node": ">=10" } }, "node_modules/terser-webpack-plugin": { @@ -27760,17 +30227,6 @@ "node": ">=10" } }, - "node_modules/terser-webpack-plugin/node_modules/acorn": { - "version": "8.11.2", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/terser-webpack-plugin/node_modules/cacache": { "version": "15.3.0", "dev": true, @@ -27908,23 +30364,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": { "version": "5.0.1", "dev": true, @@ -27944,23 +30383,6 @@ "node": ">= 8" } }, - "node_modules/terser-webpack-plugin/node_modules/terser": { - "version": "5.24.0", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/terser-webpack-plugin/node_modules/yallist": { "version": "4.0.0", "dev": true, @@ -28048,6 +30470,7 @@ "version": "2.0.12", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -28094,7 +30517,8 @@ "node_modules/to-arraybuffer": { "version": "1.0.1", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/to-fast-properties": { "version": "2.0.0", @@ -28439,7 +30863,8 @@ "node_modules/tty-browserify": { "version": "0.0.0", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/tuf-js": { "version": "1.1.7", @@ -29219,6 +31644,7 @@ "version": "0.11.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "inherits": "2.0.3" } @@ -29231,7 +31657,8 @@ "node_modules/util/node_modules/inherits": { "version": "2.0.3", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/utils-merge": { "version": "1.0.1", @@ -29305,7 +31732,8 @@ "node_modules/vm-browserify": { "version": "1.1.2", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/void-elements": { "version": "2.0.1", @@ -29350,16 +31778,15 @@ "license": "ISC" }, "node_modules/watchpack": { - "version": "1.7.5", + "version": "2.4.0", "dev": true, "license": "MIT", "dependencies": { - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" }, - "optionalDependencies": { - "chokidar": "^3.4.1", - "watchpack-chokidar2": "^2.0.1" + "engines": { + "node": ">=10.13.0" } }, "node_modules/watchpack-chokidar2": { @@ -29470,6 +31897,26 @@ "node": ">=0.10.0" } }, + "node_modules/watchpack-chokidar2/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/watchpack-chokidar2/node_modules/glob-parent": { "version": "3.1.0", "dev": true, @@ -29529,96 +31976,6 @@ "yarn": "*" } }, - "node_modules/watchpack/node_modules/binary-extensions": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/watchpack/node_modules/chokidar": { - "version": "3.5.3", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/watchpack/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/watchpack/node_modules/glob-parent": { - "version": "5.1.2", - "dev": true, - "license": "ISC", - "optional": true, - "peer": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/watchpack/node_modules/is-binary-path": { - "version": "2.1.0", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/watchpack/node_modules/readdirp": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, "node_modules/wbuf": { "version": "1.7.3", "dev": true, @@ -29696,106 +32053,6 @@ } } }, - "node_modules/webpack-cli": { - "version": "4.10.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", - "colorette": "^2.0.14", - "commander": "^7.0.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.12", - "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", - "webpack-merge": "^5.7.3" - }, - "bin": { - "webpack-cli": "bin/cli.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "4.x.x || 5.x.x" - }, - "peerDependenciesMeta": { - "@webpack-cli/generators": { - "optional": true - }, - "@webpack-cli/migrate": { - "optional": true - }, - "webpack-bundle-analyzer": { - "optional": true - }, - "webpack-dev-server": { - "optional": true - } - } - }, - "node_modules/webpack-cli/node_modules/commander": { - "version": "7.2.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/webpack-cli/node_modules/cross-spawn": { - "version": "7.0.3", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/webpack-cli/node_modules/shebang-command": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/shebang-regex": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/which": { - "version": "2.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/webpack-dev-middleware": { "version": "3.7.3", "dev": true, @@ -29932,18 +32189,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/webpack-dev-server/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/webpack-dev-server/node_modules/glob-parent": { "version": "5.1.2", "dev": true, @@ -30094,6 +32339,288 @@ "source-map": "~0.6.1" } }, + "node_modules/webpack/node_modules/@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/helper-api-error": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/webpack/node_modules/@webassemblyjs/helper-buffer": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/ieee754": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/leb128": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/utf8": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/webpack/node_modules/@webassemblyjs/wasm-edit": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/helper-wasm-section": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-opt": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "@webassemblyjs/wast-printer": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/wasm-gen": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/wasm-opt": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/wasm-parser": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" + } + }, + "node_modules/webpack/node_modules/@webassemblyjs/wast-printer": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/webpack/node_modules/acorn": { + "version": "6.4.2", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/webpack/node_modules/binary-extensions": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack/node_modules/chokidar": { + "version": "3.5.3", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "4.0.3", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/webpack/node_modules/glob-parent": { + "version": "5.1.2", + "dev": true, + "license": "ISC", + "optional": true, + "peer": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/webpack/node_modules/is-binary-path": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/webpack/node_modules/loader-runner": { + "version": "2.4.0", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4.3.0 <5.0.0 || >=5.10" + } + }, + "node_modules/webpack/node_modules/readdirp": { + "version": "3.6.0", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/webpack/node_modules/schema-utils": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/webpack/node_modules/serialize-javascript": { + "version": "4.0.0", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/webpack/node_modules/terser": { + "version": "4.8.1", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/webpack/node_modules/terser-webpack-plugin": { "version": "1.4.5", "dev": true, @@ -30117,6 +32644,20 @@ "webpack": "^4.0.0" } }, + "node_modules/webpack/node_modules/watchpack": { + "version": "1.7.5", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" + }, + "optionalDependencies": { + "chokidar": "^3.4.1", + "watchpack-chokidar2": "^2.0.1" + } + }, "node_modules/websocket-driver": { "version": "0.7.4", "dev": true, @@ -30237,6 +32778,7 @@ "version": "1.7.0", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "errno": "~0.1.7" } @@ -30627,7 +33169,8 @@ } }, "node_modules/zone.js": { - "version": "0.11.8", + "version": "0.14.3", + "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -30635,7 +33178,7 @@ }, "packages/opentelemetry-context-async-hooks": { "name": "@opentelemetry/context-async-hooks", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", @@ -30658,36 +33201,16 @@ }, "packages/opentelemetry-context-zone": { "name": "@opentelemetry/context-zone", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.18.1", + "@opentelemetry/context-zone-peer-dep": "1.21.0", "zone.js": "^0.11.0" }, "devDependencies": { - "@babel/core": "7.23.6", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "codecov": "3.8.3", "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "typescript": "4.4.4" }, "engines": { "node": ">=18" @@ -30695,10 +33218,11 @@ }, "packages/opentelemetry-context-zone-peer-dep": { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -30722,152 +33246,206 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "zone.js": "0.11.4" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "zone.js": "0.13.3" }, "engines": { "node": ">=18" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "zone.js": "^0.10.2 || ^0.11.0" + "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0" } }, - "packages/opentelemetry-context-zone-peer-dep/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "packages/opentelemetry-context-zone-peer-dep/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", "dev": true, "license": "MIT", - "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - }, "engines": { - "node": ">= 6.9.0" + "node": ">=14.15.0" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, - "packages/opentelemetry-context-zone-peer-dep/node_modules/webpack": { - "version": "4.46.0", + "packages/opentelemetry-context-zone-peer-dep/node_modules/@webpack-cli/info": { + "version": "2.0.2", "dev": true, "license": "MIT", - "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - }, - "bin": { - "webpack": "bin/webpack.js" + "engines": { + "node": ">=14.15.0" }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", "engines": { - "node": ">=6.11.5" + "node": ">=14.15.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" }, "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - }, - "webpack-command": { + "webpack-dev-server": { "optional": true } } }, - "packages/opentelemetry-context-zone-peer-dep/node_modules/zone.js": { - "version": "0.11.4", + "packages/opentelemetry-context-zone-peer-dep/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/cross-spawn": { + "version": "7.0.3", "dev": true, "license": "MIT", "dependencies": { - "tslib": "^2.0.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" } }, - "packages/opentelemetry-context-zone/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "packages/opentelemetry-context-zone-peer-dep/node_modules/enhanced-resolve": { + "version": "5.15.0", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">= 6.9.0" + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "packages/opentelemetry-context-zone/node_modules/webpack": { - "version": "4.46.0", + "packages/opentelemetry-context-zone-peer-dep/node_modules/webpack": { + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -30876,33 +33454,100 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "packages/opentelemetry-context-zone/node_modules/webpack-merge": { - "version": "5.9.0", + "packages/opentelemetry-context-zone-peer-dep/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" + } + }, + "packages/opentelemetry-context-zone-peer-dep/node_modules/zone.js": { + "version": "0.13.3", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + } + }, + "packages/opentelemetry-context-zone/node_modules/zone.js": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz", + "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==", + "dependencies": { + "tslib": "^2.3.0" } }, "packages/opentelemetry-core": { "name": "@opentelemetry/core", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", + "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -30923,7 +33568,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" @@ -30932,62 +33577,94 @@ "@opentelemetry/api": ">=1.1.0 <1.8.0" } }, + "packages/opentelemetry-core/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-core/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/opentelemetry-core/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/opentelemetry-core/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -30996,25 +33673,30 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, + "packages/opentelemetry-core/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "packages/opentelemetry-exporter-jaeger": { "name": "@opentelemetry/exporter-jaeger", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "jaeger-client": "^3.15.0" }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -31037,16 +33719,17 @@ }, "packages/opentelemetry-exporter-zipkin": { "name": "@opentelemetry/exporter-zipkin", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -31070,9 +33753,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -31081,62 +33764,194 @@ "@opentelemetry/api": "^1.0.0" } }, + "packages/opentelemetry-exporter-zipkin/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/opentelemetry-exporter-zipkin/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/opentelemetry-exporter-zipkin/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -31145,30 +33960,81 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "packages/opentelemetry-exporter-zipkin/node_modules/webpack-merge": { - "version": "5.9.0", + "packages/opentelemetry-exporter-zipkin/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-exporter-zipkin/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "packages/opentelemetry-propagator-b3": { "name": "@opentelemetry/propagator-b3", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", @@ -31192,10 +34058,10 @@ }, "packages/opentelemetry-propagator-jaeger": { "name": "@opentelemetry/propagator-jaeger", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", @@ -31219,7 +34085,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" @@ -31228,212 +34094,381 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" } }, + "packages/opentelemetry-propagator-jaeger/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-propagator-jaeger/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/opentelemetry-propagator-jaeger/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/opentelemetry-propagator-jaeger/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - }, - "webpack-command": { - "optional": true - } + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "packages/opentelemetry-propagator-jaeger/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-resources": { + "name": "@opentelemetry/resources", + "version": "1.21.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" + }, + "devDependencies": { + "@opentelemetry/api": ">=1.1.0 <1.8.0", + "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nock": "13.3.8", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.8.0" + } + }, + "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0": { + "name": "@opentelemetry/resources", + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.9.0", + "@opentelemetry/semantic-conventions": "1.9.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0/node_modules/@opentelemetry/core": { + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.9.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.9.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=14" + } + }, + "packages/opentelemetry-resources/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-resources/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-resources/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "packages/opentelemetry-resources/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "packages/opentelemetry-resources/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" } }, - "packages/opentelemetry-resources": { - "name": "@opentelemetry/resources", - "version": "1.18.1", - "license": "Apache-2.0", + "packages/opentelemetry-resources/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-mocha-webworker": "1.3.0", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nock": "13.3.8", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" + "node": ">=10.13.0" } }, - "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0": { - "name": "@opentelemetry/resources", - "version": "1.9.0", + "packages/opentelemetry-resources/node_modules/interpret": { + "version": "3.1.1", "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-resources/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", "dependencies": { - "@opentelemetry/core": "1.9.0", - "@opentelemetry/semantic-conventions": "1.9.0" + "resolve": "^1.20.0" }, "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" + "node": ">= 10.13.0" } }, - "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0/node_modules/@opentelemetry/core": { - "version": "1.9.0", + "packages/opentelemetry-resources/node_modules/shebang-command": { + "version": "2.0.0", "dev": true, - "license": "Apache-2.0", + "license": "MIT", "dependencies": { - "@opentelemetry/semantic-conventions": "1.9.0" + "shebang-regex": "^3.0.0" }, "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" + "node": ">=8" } }, - "packages/opentelemetry-resources/node_modules/@opentelemetry/resources_1.9.0/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.9.0", + "packages/opentelemetry-resources/node_modules/shebang-regex": { + "version": "3.0.0", "dev": true, - "license": "Apache-2.0", + "license": "MIT", "engines": { - "node": ">=14" + "node": ">=8" + } + }, + "packages/opentelemetry-resources/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" } }, "packages/opentelemetry-resources/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/opentelemetry-resources/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -31442,32 +34477,83 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "packages/opentelemetry-resources/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "packages/opentelemetry-resources/node_modules/webpack-merge": { - "version": "5.9.0", + "packages/opentelemetry-resources/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-resources/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "packages/opentelemetry-sdk-trace-base": { "name": "@opentelemetry/sdk-trace-base", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", @@ -31492,7 +34578,7 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "engines": { "node": ">=18" @@ -31501,62 +34587,94 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" } }, + "packages/opentelemetry-sdk-trace-base/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-sdk-trace-base/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/opentelemetry-sdk-trace-base/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/opentelemetry-sdk-trace-base/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -31565,29 +34683,36 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true - }, - "webpack-command": { - "optional": true } } }, + "packages/opentelemetry-sdk-trace-base/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "packages/opentelemetry-sdk-trace-node": { "name": "@opentelemetry/sdk-trace-node", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "semver": "^7.5.2" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -31607,19 +34732,19 @@ }, "packages/opentelemetry-sdk-trace-web": { "name": "@opentelemetry/sdk-trace-web", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "devDependencies": { "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/resources": "1.21.0", "@types/jquery": "3.5.29", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -31644,9 +34769,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -31655,91 +34780,274 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" } }, + "packages/opentelemetry-sdk-trace-web/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/opentelemetry-sdk-trace-web/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/webpack": { + "version": "5.89.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" }, "engines": { - "node": ">= 6.9.0" + "node": ">=10.13.0" }, - "peerDependencies": { - "webpack": "^4.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, - "packages/opentelemetry-sdk-trace-web/node_modules/webpack": { - "version": "4.46.0", + "packages/opentelemetry-sdk-trace-web/node_modules/webpack-cli": { + "version": "5.1.4", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" }, "bin": { - "webpack": "bin/webpack.js" + "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, + "peerDependencies": { + "webpack": "5.x.x" + }, "peerDependenciesMeta": { - "webpack-cli": { + "@webpack-cli/generators": { "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "packages/opentelemetry-sdk-trace-web/node_modules/webpack-merge": { - "version": "5.9.0", + "packages/opentelemetry-sdk-trace-web/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/opentelemetry-sdk-trace-web/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "packages/opentelemetry-semantic-conventions": { "name": "@opentelemetry/semantic-conventions", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "devDependencies": { "@types/mocha": "10.0.6", @@ -31761,18 +35069,18 @@ }, "packages/opentelemetry-shim-opentracing": { "name": "@opentelemetry/shim-opentracing", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "opentracing": "^0.14.4" }, "devDependencies": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -31792,11 +35100,11 @@ }, "packages/sdk-metrics": { "name": "@opentelemetry/sdk-metrics", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", "lodash.merge": "^4.6.2" }, "devDependencies": { @@ -31822,9 +35130,9 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -31833,62 +35141,194 @@ "@opentelemetry/api": ">=1.3.0 <1.8.0" } }, + "packages/sdk-metrics/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/sdk-metrics/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "packages/sdk-metrics/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "packages/sdk-metrics/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "packages/sdk-metrics/node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "packages/sdk-metrics/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "packages/sdk-metrics/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/sdk-metrics/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "packages/sdk-metrics/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "packages/sdk-metrics/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "packages/sdk-metrics/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "packages/sdk-metrics/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { - "node": ">= 6.9.0" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.0.0" + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "packages/sdk-metrics/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -31897,27 +35337,78 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "packages/sdk-metrics/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } }, - "packages/sdk-metrics/node_modules/webpack-merge": { - "version": "5.9.0", + "packages/sdk-metrics/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "packages/sdk-metrics/node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=10.0.0" + "node": ">= 8" } }, "packages/template": { "name": "@opentelemetry/template", - "version": "1.18.1", + "version": "1.21.0", "license": "Apache-2.0", "devDependencies": { "@types/node": "18.6.5", @@ -31931,19 +35422,19 @@ }, "selenium-tests": { "name": "@opentelemetry/selenium-tests", - "version": "1.19.1", + "version": "1.22.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", + "@opentelemetry/context-zone-peer-dep": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", "zone.js": "0.11.4" }, "devDependencies": { @@ -31956,17 +35447,17 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.9.0" + "webpack-merge": "5.10.0" }, "engines": { "node": ">=18" @@ -31975,6 +35466,47 @@ "@opentelemetry/api": "^1.0.0" } }, + "selenium-tests/node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "selenium-tests/node_modules/@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "selenium-tests/node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, "selenium-tests/node_modules/ansi-regex": { "version": "6.0.1", "dev": true, @@ -32020,6 +35552,14 @@ "fsevents": "~2.3.2" } }, + "selenium-tests/node_modules/commander": { + "version": "10.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "selenium-tests/node_modules/connect-history-api-fallback": { "version": "1.6.0", "dev": true, @@ -32028,16 +35568,29 @@ "node": ">=0.8" } }, - "selenium-tests/node_modules/fsevents": { - "version": "2.3.3", + "selenium-tests/node_modules/cross-spawn": { + "version": "7.0.3", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + "node": ">= 8" + } + }, + "selenium-tests/node_modules/enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" } }, "selenium-tests/node_modules/glob-parent": { @@ -32051,6 +35604,14 @@ "node": ">= 6" } }, + "selenium-tests/node_modules/interpret": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "selenium-tests/node_modules/ipaddr.js": { "version": "2.1.0", "dev": true, @@ -32094,6 +35655,17 @@ "node": ">=8.10.0" } }, + "selenium-tests/node_modules/rechoir": { + "version": "0.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, "selenium-tests/node_modules/selfsigned": { "version": "1.10.14", "dev": true, @@ -32102,6 +35674,25 @@ "node-forge": "^0.10.0" } }, + "selenium-tests/node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "selenium-tests/node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "selenium-tests/node_modules/strip-ansi": { "version": "7.1.0", "dev": true, @@ -32116,40 +35707,49 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, + "selenium-tests/node_modules/tapable": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "selenium-tests/node_modules/webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "bin": { "webpack": "bin/webpack.js" }, "engines": { - "node": ">=6.11.5" + "node": ">=10.13.0" }, "funding": { "type": "opencollective", @@ -32158,8 +35758,49 @@ "peerDependenciesMeta": { "webpack-cli": { "optional": true + } + } + }, + "selenium-tests/node_modules/webpack-cli": { + "version": "5.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true }, - "webpack-command": { + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { "optional": true } } @@ -32276,14 +35917,24 @@ } } }, - "selenium-tests/node_modules/webpack-dev-server/node_modules/schema-utils": { - "version": "3.3.0", + "selenium-tests/node_modules/webpack-sources": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "selenium-tests/node_modules/webpack/node_modules/terser-webpack-plugin": { + "version": "5.3.9", "dev": true, "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -32291,45 +35942,40 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" - } - }, - "selenium-tests/node_modules/webpack-merge": { - "version": "5.9.0", - "dev": true, - "license": "MIT", - "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" }, - "engines": { - "node": ">=10.0.0" + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "selenium-tests/node_modules/webpack/node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "selenium-tests/node_modules/which": { + "version": "2.0.2", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "isexe": "^2.0.0" }, - "engines": { - "node": ">= 6.9.0" + "bin": { + "node-which": "bin/node-which" }, - "peerDependencies": { - "webpack": "^4.0.0" + "engines": { + "node": ">= 8" } }, "selenium-tests/node_modules/zone.js": { "version": "0.11.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", + "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", "dependencies": { "tslib": "^2.0.0" } @@ -32354,8 +36000,6 @@ }, "@babel/code-frame": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", - "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "requires": { "@babel/highlight": "^7.23.4", @@ -32408,14 +36052,10 @@ }, "@babel/compat-data": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", - "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", "dev": true }, "@babel/core": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz", - "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==", "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", @@ -32447,8 +36087,6 @@ }, "@babel/generator": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", - "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "requires": { "@babel/types": "^7.23.6", @@ -32473,8 +36111,6 @@ }, "@babel/helper-compilation-targets": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, "requires": { "@babel/compat-data": "^7.23.5", @@ -32572,8 +36208,6 @@ }, "@babel/helper-module-transforms": { "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", - "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.22.20", @@ -32635,8 +36269,6 @@ }, "@babel/helper-string-parser": { "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", - "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true }, "@babel/helper-validator-identifier": { @@ -32645,8 +36277,6 @@ }, "@babel/helper-validator-option": { "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true }, "@babel/helper-wrap-function": { @@ -32660,8 +36290,6 @@ }, "@babel/helpers": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz", - "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==", "dev": true, "requires": { "@babel/template": "^7.22.15", @@ -32671,8 +36299,6 @@ }, "@babel/highlight": { "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", - "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.22.20", @@ -32726,8 +36352,6 @@ }, "@babel/parser": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", - "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -33439,8 +37063,6 @@ }, "@babel/traverse": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz", - "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==", "dev": true, "requires": { "@babel/code-frame": "^7.23.5", @@ -33457,8 +37079,6 @@ }, "@babel/types": { "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", - "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.23.4", @@ -33478,11 +37098,6 @@ "@bufbuild/buf-win32-x64": "1.21.0-1" } }, - "@bufbuild/buf-darwin-x64": { - "version": "1.21.0-1", - "dev": true, - "optional": true - }, "@colors/colors": { "version": "1.5.0", "dev": true @@ -34971,11 +38586,6 @@ "tslib": "^2.3.0" } }, - "@nrwl/nx-darwin-x64": { - "version": "15.9.7", - "dev": true, - "optional": true - }, "@nrwl/tao": { "version": "15.9.7", "dev": true, @@ -35164,7 +38774,7 @@ "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.38", + "@types/webpack": "5.28.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -35186,52 +38796,65 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4", "unionfs": "4.5.1", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -35257,52 +38880,65 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -35328,52 +38964,65 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -35382,96 +39031,32 @@ "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" - } - }, - "@opentelemetry/context-zone": { - "version": "file:packages/opentelemetry-context-zone", - "requires": { - "@babel/core": "7.23.6", - "@opentelemetry/context-zone-peer-dep": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0", - "zone.js": "^0.11.0" - }, - "dependencies": { - "terser-webpack-plugin": { - "version": "1.4.5", - "dev": true, - "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - } - }, - "webpack": { - "version": "4.46.0", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - } - }, - "webpack-merge": { - "version": "5.9.0", - "dev": true, + "@types/node": "18.6.5", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + } + }, + "@opentelemetry/context-zone": { + "version": "file:packages/opentelemetry-context-zone", + "requires": { + "@opentelemetry/context-zone-peer-dep": "1.21.0", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "typescript": "4.4.4", + "zone.js": "^0.11.0" + }, + "dependencies": { + "zone.js": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz", + "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==", "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "tslib": "^2.3.0" } } } @@ -35480,6 +39065,7 @@ "version": "file:packages/opentelemetry-context-zone-peer-dep", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -35503,60 +39089,149 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "zone.js": "0.11.4" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "zone.js": "0.13.3" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } }, "zone.js": { - "version": "0.11.4", + "version": "0.13.3", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.3.0" } } } @@ -35564,8 +39239,8 @@ "@opentelemetry/core": { "version": "file:packages/opentelemetry-core", "requires": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35586,52 +39261,65 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -35639,10 +39327,10 @@ "version": "file:packages/opentelemetry-exporter-jaeger", "requires": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35661,17 +39349,16 @@ "@opentelemetry/exporter-logs-otlp-grpc": { "version": "file:experimental/packages/exporter-logs-otlp-grpc", "requires": { - "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35691,13 +39378,14 @@ "version": "file:experimental/packages/exporter-logs-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35720,61 +39408,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -35783,15 +39552,16 @@ "version": "file:experimental/packages/exporter-logs-otlp-proto", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35812,61 +39582,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -35874,16 +39725,15 @@ "@opentelemetry/exporter-metrics-otlp-grpc": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "requires": { - "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35903,12 +39753,13 @@ "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -35931,61 +39782,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { - "terser-webpack-plugin": { - "version": "1.4.5", + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, + "terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -35995,13 +39927,13 @@ "requires": { "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36021,10 +39953,10 @@ "version": "file:experimental/packages/opentelemetry-exporter-prometheus", "requires": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36045,12 +39977,12 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36070,12 +40002,13 @@ "version": "file:experimental/packages/exporter-trace-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36098,61 +40031,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -36161,13 +40175,14 @@ "version": "file:experimental/packages/exporter-trace-otlp-proto", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-proto-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-proto-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36188,62 +40203,153 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", + "webpack": "5.89.0", "webpack-cli": "4.10.0", "webpack-merge": "5.9.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" } }, "webpack-merge": { "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "requires": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } } } }, @@ -36251,11 +40357,12 @@ "version": "file:packages/opentelemetry-exporter-zipkin", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36278,83 +40385,361 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + } + }, + "webpack": { + "version": "5.89.0", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "@opentelemetry/instrumentation": { + "version": "file:experimental/packages/opentelemetry-instrumentation", + "requires": { + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": "1.7.0", + "@opentelemetry/api-logs": "0.47.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/semver": "7.5.6", + "@types/shimmer": "^1.0.2", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "codecov": "3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "import-in-the-middle": "1.7.1", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nyc": "15.1.0", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1", + "sinon": "15.1.2", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "dependencies": { + "@opentelemetry/api-logs": { + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.47.0.tgz", + "integrity": "sha512-AR6UOVcWZkuibLR/7/OecYJasncAf6VstNV/KT5qHq1HShVFmJetcgim0KMog/ON23yHZQjT9GPVTwB0FEhPQA==", + "dev": true, + "requires": { + "@opentelemetry/api": "^1.0.0" + } + }, + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "import-in-the-middle": { + "version": "1.7.1", + "requires": { + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, + "terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } }, - "@opentelemetry/instrumentation": { - "version": "file:experimental/packages/opentelemetry-instrumentation", + "@opentelemetry/instrumentation-fetch": { + "version": "file:experimental/packages/opentelemetry-instrumentation-fetch", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/sdk-metrics": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.6", - "@types/shimmer": "^1.0.2", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", - "cpx": "1.5.0", "cross-var": "1.1.0", - "import-in-the-middle": "1.6.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -36364,160 +40749,146 @@ "lerna": "6.6.2", "mocha": "10.2.0", "nyc": "15.1.0", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { - "terser-webpack-plugin": { - "version": "1.4.5", + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, - "webpack": { - "version": "4.46.0", + "enhanced-resolve": { + "version": "5.15.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, - "webpack-merge": { - "version": "5.9.0", + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "resolve": "^1.20.0" } - } - } - }, - "@opentelemetry/instrumentation-fetch": { - "version": "file:experimental/packages/opentelemetry-instrumentation-fetch", - "requires": { - "@babel/core": "7.23.6", - "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "dependencies": { + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -36529,17 +40900,18 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@protobuf-ts/grpc-transport": "2.9.3", "@protobuf-ts/runtime": "2.9.3", "@protobuf-ts/runtime-rpc": "2.9.3", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -36555,16 +40927,17 @@ "version": "file:experimental/packages/opentelemetry-instrumentation-http", "requires": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "@types/superagent": "4.1.24", "axios": "1.5.1", @@ -36576,6 +40949,7 @@ "nyc": "15.1.0", "request": "2.88.2", "request-promise-native": "1.0.9", + "semver": "^7.5.2", "sinon": "15.1.2", "superagent": "8.0.9", "ts-mocha": "10.0.0", @@ -36597,14 +40971,15 @@ "version": "file:experimental/packages/opentelemetry-instrumentation-xml-http-request", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36626,61 +41001,373 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "@opentelemetry/integration-tests-api": { + "version": "file:integration-tests/api", + "requires": { + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "9.1.1", + "@types/node": "18.6.5", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.0.0", + "nyc": "15.1.0" + }, + "dependencies": { + "@types/mocha": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "dev": true + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "mocha": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", + "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "dev": true, + "requires": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "dependencies": { + "minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } }, - "webpack-merge": { - "version": "5.9.0", + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } } } @@ -36689,9 +41376,10 @@ "version": "file:experimental/packages/opentelemetry-browser-detector", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36711,61 +41399,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -36774,8 +41543,9 @@ "version": "file:experimental/packages/otlp-exporter-base", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", + "@opentelemetry/core": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36795,61 +41565,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -36857,14 +41708,13 @@ "@opentelemetry/otlp-grpc-exporter-base": { "version": "file:experimental/packages/otlp-grpc-exporter-base", "requires": { - "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36886,9 +41736,10 @@ "version": "file:experimental/packages/otlp-proto-exporter-base", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -36909,12 +41760,12 @@ "version": "file:experimental/packages/otlp-transformer", "requires": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", @@ -36932,52 +41783,65 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -36985,7 +41849,7 @@ "version": "file:packages/opentelemetry-propagator-b3", "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/core": "1.18.1", + "@opentelemetry/core": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -37002,7 +41866,7 @@ "version": "file:packages/opentelemetry-propagator-jaeger", "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/core": "1.18.1", + "@opentelemetry/core": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -37023,87 +41887,294 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + } + }, + "webpack": { + "version": "5.89.0", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + } + } + }, + "@opentelemetry/resources": { + "version": "file:packages/opentelemetry-resources", + "requires": { + "@opentelemetry/api": ">=1.1.0 <1.8.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "@types/mocha": "10.0.6", + "@types/node": "18.6.5", + "@types/sinon": "10.0.20", + "@types/webpack-env": "1.16.3", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", + "lerna": "6.6.2", + "mocha": "10.2.0", + "nock": "13.3.8", + "nyc": "15.1.0", + "sinon": "15.1.2", + "ts-mocha": "10.0.0", + "typescript": "4.4.4", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "dependencies": { + "@opentelemetry/resources_1.9.0": { + "version": "npm:@opentelemetry/resources@1.9.0", + "dev": true, + "requires": { + "@opentelemetry/core": "1.9.0", + "@opentelemetry/semantic-conventions": "1.9.0" + }, + "dependencies": { + "@opentelemetry/core": { + "version": "1.9.0", + "dev": true, + "requires": { + "@opentelemetry/semantic-conventions": "1.9.0" + } + }, + "@opentelemetry/semantic-conventions": { + "version": "1.9.0", + "dev": true + } + } + }, + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, + "terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + } + }, + "webpack": { + "version": "5.89.0", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" } }, - "webpack": { - "version": "4.46.0", + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "isexe": "^2.0.0" } } } }, - "@opentelemetry/resources": { - "version": "file:packages/opentelemetry-resources", + "@opentelemetry/sdk-logs": { + "version": "file:experimental/packages/sdk-logs", "requires": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/core": "1.18.1", + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", + "@opentelemetry/api": ">=1.4.0 <1.8.0", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@opentelemetry/semantic-conventions": "1.18.1", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", - "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "lerna": "6.6.2", "mocha": "10.2.0", - "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", + "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@opentelemetry/api": { + "version": "1.4.1", + "dev": true + }, "@opentelemetry/resources_1.9.0": { "version": "npm:@opentelemetry/resources@1.9.0", "dev": true, @@ -37118,149 +42189,144 @@ "requires": { "@opentelemetry/semantic-conventions": "1.9.0" } - }, - "@opentelemetry/semantic-conventions": { - "version": "1.9.0", - "dev": true } } }, - "terser-webpack-plugin": { - "version": "1.4.5", + "@opentelemetry/semantic-conventions": { + "version": "1.9.0", + "dev": true + }, + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, - "webpack": { - "version": "4.46.0", + "enhanced-resolve": { + "version": "5.15.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, - "webpack-merge": { - "version": "5.9.0", + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "resolve": "^1.20.0" } - } - } - }, - "@opentelemetry/sdk-logs": { - "version": "file:experimental/packages/sdk-logs", - "requires": { - "@babel/core": "7.23.6", - "@opentelemetry/api": ">=1.4.0 <1.8.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "dependencies": { + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -37270,8 +42336,8 @@ "requires": { "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.3.0 <1.8.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", "@types/lodash.merge": "4.6.9", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -37293,61 +42359,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -37356,23 +42503,24 @@ "version": "file:experimental/packages/opentelemetry-sdk-node", "requires": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -37389,9 +42537,9 @@ "version": "file:packages/opentelemetry-sdk-trace-base", "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -37413,52 +42561,65 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "dependencies": { + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, @@ -37466,21 +42627,23 @@ "version": "file:packages/opentelemetry-sdk-trace-node", "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "6.6.2", "mocha": "10.2.0", "nyc": "15.1.0", + "semver": "^7.5.2", "sinon": "15.1.2", "ts-mocha": "10.0.0", "typescript": "4.4.4" @@ -37491,12 +42654,12 @@ "requires": { "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/jquery": "3.5.29", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -37521,61 +42684,142 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, + "commander": { + "version": "10.0.1", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "interpret": { + "version": "3.1.1", + "dev": true + }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-cli": { + "version": "5.1.4", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -37589,33 +42833,48 @@ "@babel/plugin-transform-runtime": "7.22.15", "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-zone-peer-dep": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", + "@opentelemetry/context-zone-peer-dep": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.9.0", + "webpack-merge": "5.10.0", "zone.js": "0.11.4" }, "dependencies": { + "@webpack-cli/configtest": { + "version": "2.1.1", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "2.0.2", + "dev": true, + "requires": {} + }, + "@webpack-cli/serve": { + "version": "2.0.5", + "dev": true, + "requires": {} + }, "ansi-regex": { "version": "6.0.1", "dev": true @@ -37638,14 +42897,30 @@ "readdirp": "~3.6.0" } }, + "commander": { + "version": "10.0.1", + "dev": true + }, "connect-history-api-fallback": { "version": "1.6.0", "dev": true }, - "fsevents": { - "version": "2.3.3", + "cross-spawn": { + "version": "7.0.3", "dev": true, - "optional": true + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } }, "glob-parent": { "version": "5.1.2", @@ -37654,6 +42929,10 @@ "is-glob": "^4.0.1" } }, + "interpret": { + "version": "3.1.1", + "dev": true + }, "ipaddr.js": { "version": "2.1.0", "dev": true @@ -37680,6 +42959,13 @@ "picomatch": "^2.2.1" } }, + "rechoir": { + "version": "0.8.0", + "dev": true, + "requires": { + "resolve": "^1.20.0" + } + }, "selfsigned": { "version": "1.10.14", "dev": true, @@ -37687,6 +42973,17 @@ "node-forge": "^0.10.0" } }, + "shebang-command": { + "version": "2.0.0", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, "strip-ansi": { "version": "7.1.0", "dev": true, @@ -37694,52 +42991,72 @@ "ansi-regex": "^6.0.1" } }, + "tapable": { + "version": "2.2.1", + "dev": true + }, "webpack": { - "version": "4.46.0", + "version": "5.89.0", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.5.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" }, "dependencies": { "terser-webpack-plugin": { - "version": "1.4.5", + "version": "5.3.9", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } } } }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, "webpack-dev-middleware": { "version": "5.3.3", "dev": true, @@ -37809,29 +43126,23 @@ "url": "^0.11.0", "webpack-dev-middleware": "^5.2.1", "ws": "^8.1.0" - }, - "dependencies": { - "schema-utils": { - "version": "3.3.0", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } } }, - "webpack-merge": { - "version": "5.9.0", + "webpack-sources": { + "version": "3.2.3", + "dev": true + }, + "which": { + "version": "2.0.2", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "isexe": "^2.0.0" } }, "zone.js": { "version": "0.11.4", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", + "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", "requires": { "tslib": "^2.0.0" } @@ -37860,11 +43171,11 @@ "requires": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -37874,6 +43185,7 @@ "mocha": "10.2.0", "nyc": "15.1.0", "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", "sinon": "15.1.2", "ts-mocha": "10.0.0", "typescript": "4.4.4" @@ -37882,12 +43194,12 @@ "@opentelemetry/shim-opentracing": { "version": "file:packages/opentelemetry-shim-opentracing", "requires": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -37986,8 +43298,6 @@ }, "@protobuf-ts/grpc-transport": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/grpc-transport/-/grpc-transport-2.9.3.tgz", - "integrity": "sha512-2TarJgLrvhHVBpxgJonPeZzEtqlbQJeSTpFZjkNI5Ye+18r8SUIcvZhl4LLS1q4zjIQl/O7lZt/x27PTNglLpg==", "dev": true, "requires": { "@protobuf-ts/runtime": "^2.9.3", @@ -37996,14 +43306,10 @@ }, "@protobuf-ts/runtime": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.3.tgz", - "integrity": "sha512-nivzCpg/qYD0RX2OmHOahJALb8ndjGmUhNBcTJ0BbXoqKwCSM6vYA+vegzS3rhuaPgbyC7Ec8idlnizzUfIRuw==", "dev": true }, "@protobuf-ts/runtime-rpc": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.3.tgz", - "integrity": "sha512-WelHpctvZeG8yhbb7tnsrLzotq9xjMCXuGuhJ8qMyEdNoBBEodbXseofAYFTebo2/PN2LzyEq3X6vwr5f8jqTA==", "dev": true, "requires": { "@protobuf-ts/runtime": "^2.9.3" @@ -38427,7 +43733,7 @@ } }, "@types/eslint-scope": { - "version": "3.7.6", + "version": "3.7.7", "dev": true, "requires": { "@types/eslint": "*", @@ -38475,8 +43781,6 @@ }, "@types/jquery": { "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", - "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", "dev": true, "requires": { "@types/sizzle": "*" @@ -38508,8 +43812,6 @@ }, "@types/lodash.merge": { "version": "4.6.9", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", - "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", "dev": true, "requires": { "@types/lodash": "*" @@ -38541,8 +43843,6 @@ }, "@types/mocha": { "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "@types/node": { @@ -38594,8 +43894,6 @@ }, "@types/request-promise-native": { "version": "1.0.21", - "resolved": "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.21.tgz", - "integrity": "sha512-NJ1M6iqWTEUT+qdP+OmXsRZ6tSdkoBdblHKatIWTVP1HdYpHU3IkfpLPf4MWb0+CC4Nl3TtLpYhDlhjZxytDIA==", "dev": true, "requires": { "@types/request": "*" @@ -38621,8 +43919,6 @@ }, "@types/semver": { "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "@types/send": { @@ -38674,68 +43970,90 @@ "@types/node": "*" } }, - "@types/source-list-map": { - "version": "0.1.4", - "dev": true - }, "@types/superagent": { "version": "4.1.24", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.24.tgz", - "integrity": "sha512-mEafCgyKiMFin24SDzWN7yAADt4gt6YawFiNMp0QS5ZPboORfyxFt0s3VzJKhTaKg9py/4FUmrHLTNfJKt9Rbw==", "dev": true, "requires": { "@types/cookiejar": "*", "@types/node": "*" } }, - "@types/tapable": { - "version": "1.0.10", - "dev": true - }, "@types/tough-cookie": { "version": "4.0.4", "dev": true }, - "@types/uglify-js": { - "version": "3.17.3", - "dev": true, - "requires": { - "source-map": "^0.6.1" - } - }, "@types/webpack": { - "version": "4.41.38", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz", - "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/tapable": "^1", - "@types/uglify-js": "*", - "@types/webpack-sources": "*", - "anymatch": "^3.0.0", - "source-map": "^0.6.0" - } - }, - "@types/webpack-env": { - "version": "1.16.3", - "dev": true - }, - "@types/webpack-sources": { - "version": "3.2.2", + "version": "5.28.5", "dev": true, "requires": { "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.7.3" + "tapable": "^2.2.0", + "webpack": "^5" }, "dependencies": { - "source-map": { - "version": "0.7.4", + "enhanced-resolve": { + "version": "5.15.0", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.1", + "dev": true + }, + "terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + } + }, + "webpack": { + "version": "5.89.0", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-sources": { + "version": "3.2.3", "dev": true } } }, + "@types/webpack-env": { + "version": "1.16.3", + "dev": true + }, "@types/ws": { "version": "8.5.8", "dev": true, @@ -38831,16 +44149,6 @@ "@typescript-eslint/typescript-estree": "5.59.11", "eslint-scope": "^5.1.1", "semver": "^7.3.7" - }, - "dependencies": { - "eslint-scope": { - "version": "5.1.1", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - } } }, "@typescript-eslint/visitor-keys": { @@ -38856,18 +44164,11 @@ "dev": true }, "@webassemblyjs/ast": { - "version": "1.9.0", + "version": "1.11.6", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0" - }, - "dependencies": { - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true - } + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "@webassemblyjs/floating-point-hex-parser": { @@ -38885,13 +44186,30 @@ "@webassemblyjs/helper-code-frame": { "version": "1.9.0", "dev": true, + "peer": true, "requires": { "@webassemblyjs/wast-printer": "1.9.0" }, "dependencies": { + "@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "peer": true + }, "@webassemblyjs/wast-printer": { "version": "1.9.0", "dev": true, + "peer": true, "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/wast-parser": "1.9.0", @@ -38902,13 +44220,32 @@ }, "@webassemblyjs/helper-fsm": { "version": "1.9.0", - "dev": true + "dev": true, + "peer": true }, "@webassemblyjs/helper-module-context": { "version": "1.9.0", "dev": true, + "peer": true, "requires": { "@webassemblyjs/ast": "1.9.0" + }, + "dependencies": { + "@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "peer": true + } } }, "@webassemblyjs/helper-numbers": { @@ -38932,16 +44269,6 @@ "@webassemblyjs/helper-buffer": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/wasm-gen": "1.11.6" - }, - "dependencies": { - "@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - } } }, "@webassemblyjs/ieee754": { @@ -38963,85 +44290,17 @@ "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.9.0", + "version": "1.11.6", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/helper-wasm-section": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-opt": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "@webassemblyjs/wast-printer": "1.9.0" - }, - "dependencies": { - "@webassemblyjs/helper-buffer": { - "version": "1.9.0", - "dev": true - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.9.0", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.9.0", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.9.0", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.9.0", - "dev": true - }, - "@webassemblyjs/wasm-gen": { - "version": "1.9.0", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.9.0", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.9.0", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0", - "@xtuc/long": "4.2.2" - } - } + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "@webassemblyjs/wasm-gen": { @@ -39053,16 +44312,6 @@ "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", "@webassemblyjs/utf8": "1.11.6" - }, - "dependencies": { - "@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - } } }, "@webassemblyjs/wasm-opt": { @@ -39073,73 +44322,24 @@ "@webassemblyjs/helper-buffer": "1.11.6", "@webassemblyjs/wasm-gen": "1.11.6", "@webassemblyjs/wasm-parser": "1.11.6" - }, - "dependencies": { - "@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - } } }, "@webassemblyjs/wasm-parser": { - "version": "1.9.0", + "version": "1.11.6", "dev": true, "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - }, - "dependencies": { - "@webassemblyjs/helper-api-error": { - "version": "1.9.0", - "dev": true - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "dev": true - }, - "@webassemblyjs/ieee754": { - "version": "1.9.0", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.9.0", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.9.0", - "dev": true - } + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wast-parser": { "version": "1.9.0", "dev": true, + "peer": true, "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/floating-point-hex-parser": "1.9.0", @@ -39149,13 +44349,30 @@ "@xtuc/long": "4.2.2" }, "dependencies": { + "@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, "@webassemblyjs/floating-point-hex-parser": { "version": "1.9.0", - "dev": true + "dev": true, + "peer": true }, "@webassemblyjs/helper-api-error": { "version": "1.9.0", - "dev": true + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "peer": true } } }, @@ -39165,35 +44382,8 @@ "requires": { "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" - }, - "dependencies": { - "@webassemblyjs/ast": { - "version": "1.11.6", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - } } }, - "@webpack-cli/configtest": { - "version": "1.2.0", - "dev": true, - "requires": {} - }, - "@webpack-cli/info": { - "version": "1.5.0", - "dev": true, - "requires": { - "envinfo": "^7.7.3" - } - }, - "@webpack-cli/serve": { - "version": "1.7.0", - "dev": true, - "requires": {} - }, "@xtuc/ieee754": { "version": "1.2.0", "dev": true @@ -39250,8 +44440,7 @@ } }, "acorn": { - "version": "6.4.2", - "dev": true + "version": "8.11.2" }, "acorn-globals": { "version": "6.0.0", @@ -39267,6 +44456,10 @@ } } }, + "acorn-import-assertions": { + "version": "1.9.0", + "requires": {} + }, "acorn-jsx": { "version": "5.3.2", "dev": true, @@ -39550,6 +44743,7 @@ "asn1.js": { "version": "5.4.1", "dev": true, + "peer": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -39559,13 +44753,15 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, "assert": { "version": "1.5.1", "dev": true, + "peer": true, "requires": { "object.assign": "^4.1.4", "util": "^0.10.4" @@ -39573,11 +44769,13 @@ "dependencies": { "inherits": { "version": "2.0.3", - "dev": true + "dev": true, + "peer": true }, "util": { "version": "0.10.4", "dev": true, + "peer": true, "requires": { "inherits": "2.0.3" } @@ -40559,8 +45757,8 @@ "backcompat-node14": { "version": "file:experimental/backwards-compatibility/node14", "requires": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/node": "14.18.25", "typescript": "4.4.4" }, @@ -40574,8 +45772,8 @@ "backcompat-node16": { "version": "file:experimental/backwards-compatibility/node16", "requires": { - "@opentelemetry/sdk-node": "0.45.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/sdk-node": "0.48.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/node": "16.11.52", "typescript": "4.4.4" }, @@ -40689,6 +45887,8 @@ }, "bindings": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "dev": true, "optional": true, "requires": { @@ -40729,7 +45929,8 @@ }, "bn.js": { "version": "5.2.1", - "dev": true + "dev": true, + "peer": true }, "body-parser": { "version": "1.19.0", @@ -40868,7 +46069,8 @@ }, "brorand": { "version": "1.1.0", - "dev": true + "dev": true, + "peer": true }, "browser-process-hrtime": { "version": "1.0.0", @@ -40881,6 +46083,7 @@ "browserify-aes": { "version": "1.2.0", "dev": true, + "peer": true, "requires": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", @@ -40893,6 +46096,7 @@ "browserify-cipher": { "version": "1.0.1", "dev": true, + "peer": true, "requires": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -40902,6 +46106,7 @@ "browserify-des": { "version": "1.0.2", "dev": true, + "peer": true, "requires": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -40912,6 +46117,7 @@ "browserify-rsa": { "version": "4.1.0", "dev": true, + "peer": true, "requires": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -40920,6 +46126,7 @@ "browserify-sign": { "version": "4.2.2", "dev": true, + "peer": true, "requires": { "bn.js": "^5.2.1", "browserify-rsa": "^4.1.0", @@ -40935,6 +46142,7 @@ "readable-stream": { "version": "3.6.2", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -40946,14 +46154,13 @@ "browserify-zlib": { "version": "0.2.0", "dev": true, + "peer": true, "requires": { "pako": "~1.0.5" } }, "browserslist": { "version": "4.22.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "dev": true, "requires": { "caniuse-lite": "^1.0.30001565", @@ -40975,6 +46182,7 @@ "buffer": { "version": "4.9.2", "dev": true, + "peer": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -40995,7 +46203,8 @@ }, "buffer-xor": { "version": "1.0.3", - "dev": true + "dev": true, + "peer": true }, "bufrw": { "version": "1.4.0", @@ -41008,7 +46217,8 @@ }, "builtin-status-codes": { "version": "3.0.0", - "dev": true + "dev": true, + "peer": true }, "builtins": { "version": "5.0.1", @@ -41034,6 +46244,7 @@ "cacache": { "version": "12.0.4", "dev": true, + "peer": true, "requires": { "bluebird": "^3.5.5", "chownr": "^1.1.1", @@ -41139,9 +46350,7 @@ } }, "caniuse-lite": { - "version": "1.0.30001570", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", - "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", + "version": "1.0.30001568", "dev": true }, "caseless": { @@ -41235,6 +46444,17 @@ "is-extglob": "^1.0.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "is-extglob": { "version": "1.0.0", "dev": true @@ -41283,14 +46503,15 @@ }, "chownr": { "version": "1.1.4", - "dev": true + "dev": true, + "peer": true }, "chrome-trace-event": { "version": "1.0.3", "dev": true }, "chromedriver": { - "version": "119.0.1", + "version": "120.0.0", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", @@ -41326,6 +46547,7 @@ "cipher-base": { "version": "1.0.4", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -41654,7 +46876,8 @@ }, "console-browserify": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true }, "console-control-strings": { "version": "1.1.0", @@ -41662,7 +46885,8 @@ }, "constants-browserify": { "version": "1.0.0", - "dev": true + "dev": true, + "peer": true }, "content-disposition": { "version": "0.5.4", @@ -41814,6 +47038,7 @@ "copy-concurrently": { "version": "1.0.5", "dev": true, + "peer": true, "requires": { "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", @@ -41825,7 +47050,8 @@ "dependencies": { "aproba": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -41910,6 +47136,7 @@ "create-ecdh": { "version": "4.0.4", "dev": true, + "peer": true, "requires": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -41917,13 +47144,15 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, "create-hash": { "version": "1.2.0", "dev": true, + "peer": true, "requires": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", @@ -41935,6 +47164,7 @@ "create-hmac": { "version": "1.1.7", "dev": true, + "peer": true, "requires": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", @@ -42021,6 +47251,7 @@ "crypto-browserify": { "version": "3.12.0", "dev": true, + "peer": true, "requires": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -42066,7 +47297,8 @@ }, "cyclist": { "version": "1.0.2", - "dev": true + "dev": true, + "peer": true }, "dargs": { "version": "7.0.0", @@ -42387,6 +47619,7 @@ "des.js": { "version": "1.1.0", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -42433,6 +47666,7 @@ "diffie-hellman": { "version": "5.0.3", "dev": true, + "peer": true, "requires": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -42441,7 +47675,8 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -42498,7 +47733,8 @@ }, "domain-browser": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true }, "domelementtype": { "version": "2.3.0", @@ -42592,6 +47828,7 @@ "duplexify": { "version": "3.7.1", "dev": true, + "peer": true, "requires": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", @@ -42623,13 +47860,12 @@ }, "electron-to-chromium": { "version": "1.4.611", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz", - "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==", "dev": true }, "elliptic": { "version": "6.5.4", "dev": true, + "peer": true, "requires": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -42642,7 +47878,8 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -42786,7 +48023,7 @@ } }, "es-module-lexer": { - "version": "1.3.1", + "version": "1.4.1", "dev": true }, "es6-error": { @@ -43008,10 +48245,10 @@ } }, "eslint-scope": { - "version": "4.0.3", + "version": "5.1.1", "dev": true, "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, @@ -43036,13 +48273,13 @@ "version": "file:examples/esm-http-ts", "requires": { "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" } }, "espree": { @@ -43052,12 +48289,6 @@ "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" - }, - "dependencies": { - "acorn": { - "version": "8.11.2", - "dev": true - } } }, "esprima": { @@ -43142,6 +48373,7 @@ "evp_bytestokey": { "version": "1.0.3", "dev": true, + "peer": true, "requires": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" @@ -43151,17 +48383,17 @@ "version": "file:examples/otlp-exporter-node", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-metrics-otlp-proto": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" } }, "execa": { @@ -43561,7 +48793,8 @@ }, "figgy-pudding": { "version": "3.5.2", - "dev": true + "dev": true, + "peer": true }, "figures": { "version": "3.2.0", @@ -43585,6 +48818,8 @@ }, "file-uri-to-path": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "dev": true, "optional": true }, @@ -43665,6 +48900,7 @@ "find-cache-dir": { "version": "2.1.0", "dev": true, + "peer": true, "requires": { "commondir": "^1.0.1", "make-dir": "^2.0.0", @@ -43674,6 +48910,7 @@ "make-dir": { "version": "2.1.0", "dev": true, + "peer": true, "requires": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -43681,11 +48918,13 @@ }, "pify": { "version": "4.0.1", - "dev": true + "dev": true, + "peer": true }, "semver": { "version": "5.7.2", - "dev": true + "dev": true, + "peer": true } } }, @@ -43730,13 +48969,14 @@ "flush-write-stream": { "version": "1.1.1", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.3", "readable-stream": "^2.3.6" } }, "follow-redirects": { - "version": "1.15.3" + "version": "1.15.4" }, "for-in": { "version": "1.0.2", @@ -43837,6 +49077,7 @@ "from2": { "version": "2.3.0", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.0" @@ -43879,6 +49120,7 @@ "fs-write-stream-atomic": { "version": "1.0.10", "dev": true, + "peer": true, "requires": { "graceful-fs": "^4.1.2", "iferr": "^0.1.5", @@ -43891,13 +49133,11 @@ "dev": true }, "fsevents": { - "version": "1.2.13", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } + "optional": true }, "function-bind": { "version": "1.1.2" @@ -43922,8 +49162,6 @@ }, "gaxios": { "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.1.1.tgz", - "integrity": "sha512-bw8smrX+XlAoo9o1JAksBwX+hi/RG15J+NTSxmNPIclKC3ZVK6C2afwY8OSdRvOK0+ZLecUJYtj2MmjOt3Dm0w==", "dev": true, "requires": { "extend": "^3.0.2", @@ -43934,8 +49172,6 @@ "dependencies": { "agent-base": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dev": true, "requires": { "debug": "^4.3.4" @@ -43943,8 +49179,6 @@ }, "https-proxy-agent": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", "dev": true, "requires": { "agent-base": "^7.0.2", @@ -43953,8 +49187,6 @@ }, "node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "requires": { "whatwg-url": "^5.0.0" @@ -43962,20 +49194,14 @@ }, "tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true }, "webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "dev": true }, "whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dev": true, "requires": { "tr46": "~0.0.3", @@ -44465,6 +49691,7 @@ "hash-base": { "version": "3.1.0", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.4", "readable-stream": "^3.6.0", @@ -44474,6 +49701,7 @@ "readable-stream": { "version": "3.6.2", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -44485,6 +49713,7 @@ "hash.js": { "version": "1.1.7", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" @@ -44548,6 +49777,7 @@ "hmac-drbg": { "version": "1.0.1", "dev": true, + "peer": true, "requires": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -44640,14 +49870,14 @@ "version": "file:examples/http", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "cross-env": "^6.0.0" } }, @@ -44726,20 +49956,21 @@ }, "https-browserify": { "version": "1.0.0", - "dev": true + "dev": true, + "peer": true }, "https-example": { "version": "file:examples/https", "requires": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.18.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-http": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/exporter-jaeger": "1.21.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-http": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "cross-env": "^6.0.0" } }, @@ -44774,7 +50005,8 @@ }, "iferr": { "version": "0.1.5", - "dev": true + "dev": true, + "peer": true }, "ignore": { "version": "5.2.4", @@ -44805,26 +50037,6 @@ } } }, - "import-in-the-middle": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.6.0.tgz", - "integrity": "sha512-ENmVXh2AC5PV5xmtPK0QCV6nyde5Y8dXhMZFGDSYhlLcdBPJofge1bf6PnWzs7fnzyuesh/q/CPwO7/6HOTWqQ==", - "requires": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - }, - "dependencies": { - "acorn": { - "version": "8.11.2" - }, - "acorn-import-assertions": { - "version": "1.9.0", - "requires": {} - } - } - }, "import-local": { "version": "3.1.0", "dev": true, @@ -44940,10 +50152,6 @@ "p-event": "^4.2.0" } }, - "interpret": { - "version": "2.2.0", - "dev": true - }, "invariant": { "version": "2.2.4", "dev": true, @@ -45194,7 +50402,8 @@ }, "is-wsl": { "version": "1.1.0", - "dev": true + "dev": true, + "peer": true }, "is2": { "version": "2.0.9", @@ -45506,10 +50715,6 @@ "xml-name-validator": "^4.0.0" }, "dependencies": { - "acorn": { - "version": "8.11.2", - "dev": true - }, "agent-base": { "version": "6.0.2", "dev": true, @@ -45680,11 +50885,6 @@ "readdirp": "~3.6.0" } }, - "fsevents": { - "version": "2.3.3", - "dev": true, - "optional": true - }, "glob-parent": { "version": "5.1.2", "dev": true, @@ -45790,6 +50990,15 @@ "webpack-dev-middleware": "^3.7.0" }, "dependencies": { + "schema-utils": { + "version": "1.0.0", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, "source-map": { "version": "0.7.4", "dev": true @@ -46155,8 +51364,6 @@ }, "linkinator": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.0.2.tgz", - "integrity": "sha512-28eiQVzGwaCvVUb/cxii5jraWZYUv5n2Q5CaSRUH9oGDo1Jr8GcREnpw/0IfJ5YTRoIt9/ihra2lG8yqCN292g==", "dev": true, "requires": { "chalk": "^5.0.0", @@ -46173,8 +51380,6 @@ "dependencies": { "brace-expansion": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "requires": { "balanced-match": "^1.0.0" @@ -46186,8 +51391,6 @@ }, "cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -46197,8 +51400,6 @@ }, "foreground-child": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dev": true, "requires": { "cross-spawn": "^7.0.0", @@ -46207,8 +51408,6 @@ }, "glob": { "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "requires": { "foreground-child": "^3.1.0", @@ -46228,8 +51427,6 @@ }, "minimatch": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -46237,14 +51434,10 @@ }, "minipass": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true }, "shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { "shebang-regex": "^3.0.0" @@ -46252,20 +51445,14 @@ }, "shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, "signal-exit": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true }, "which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -46290,7 +51477,7 @@ } }, "loader-runner": { - "version": "2.4.0", + "version": "4.3.0", "dev": true }, "loader-utils": { @@ -46476,16 +51663,12 @@ "version": "file:experimental/examples/logs", "requires": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/sdk-logs": "0.45.1", + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/sdk-logs": "0.48.0", "@types/node": "18.6.5", "ts-node": "^10.9.1" }, "dependencies": { - "acorn": { - "version": "8.11.2", - "dev": true - }, "acorn-walk": { "version": "8.3.0", "dev": true @@ -46895,8 +52078,6 @@ }, "marked": { "version": "10.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-10.0.0.tgz", - "integrity": "sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==", "dev": true }, "math-random": { @@ -46906,6 +52087,7 @@ "md5.js": { "version": "1.3.5", "dev": true, + "peer": true, "requires": { "hash-base": "^3.0.0", "inherits": "^2.0.1", @@ -47128,6 +52310,7 @@ "miller-rabin": { "version": "4.0.1", "dev": true, + "peer": true, "requires": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -47135,7 +52318,8 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -47170,7 +52354,8 @@ }, "minimalistic-crypto-utils": { "version": "1.0.1", - "dev": true + "dev": true, + "peer": true }, "minimatch": { "version": "3.1.2", @@ -47267,6 +52452,7 @@ "mississippi": { "version": "3.0.0", "dev": true, + "peer": true, "requires": { "concat-stream": "^1.5.0", "duplexify": "^3.4.2", @@ -47283,6 +52469,7 @@ "concat-stream": { "version": "1.6.2", "dev": true, + "peer": true, "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -47293,6 +52480,7 @@ "through2": { "version": "2.0.5", "dev": true, + "peer": true, "requires": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -47391,12 +52579,6 @@ "path-exists": "^4.0.0" } }, - "fsevents": { - "version": "2.3.3", - "dev": true, - "optional": true, - "peer": true - }, "glob": { "version": "7.2.0", "dev": true, @@ -47530,6 +52712,7 @@ "move-concurrently": { "version": "1.0.1", "dev": true, + "peer": true, "requires": { "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", @@ -47541,7 +52724,8 @@ "dependencies": { "aproba": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -47583,6 +52767,8 @@ }, "nan": { "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, "optional": true }, @@ -47740,11 +52926,6 @@ "universalify": "^2.0.0" } }, - "fsevents": { - "version": "2.3.3", - "dev": true, - "optional": true - }, "glob-parent": { "version": "5.1.2", "dev": true, @@ -48062,6 +53243,7 @@ "node-libs-browser": { "version": "2.2.1", "dev": true, + "peer": true, "requires": { "assert": "^1.1.1", "browserify-zlib": "^0.2.0", @@ -48097,8 +53279,6 @@ }, "node-releases": { "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "nopt": { @@ -48790,11 +53970,12 @@ } }, "object.assign": { - "version": "4.1.4", + "version": "4.1.5", "dev": true, + "peer": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } @@ -48873,13 +54054,13 @@ "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.7.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-node": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", - "@opentelemetry/shim-opencensus": "0.45.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-node": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", + "@opentelemetry/shim-opencensus": "0.48.0" } }, "opentracing": { @@ -48914,7 +54095,8 @@ }, "os-browserify": { "version": "0.3.0", - "dev": true + "dev": true, + "peer": true }, "os-homedir": { "version": "1.0.2", @@ -49249,6 +54431,7 @@ "parallel-transform": { "version": "1.2.0", "dev": true, + "peer": true, "requires": { "cyclist": "^1.0.1", "inherits": "^2.0.3", @@ -49265,6 +54448,7 @@ "parse-asn1": { "version": "5.1.6", "dev": true, + "peer": true, "requires": { "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", @@ -49354,7 +54538,8 @@ }, "path-browserify": { "version": "0.0.1", - "dev": true + "dev": true, + "peer": true }, "path-dirname": { "version": "1.0.2", @@ -49416,6 +54601,7 @@ "pbkdf2": { "version": "3.1.2", "dev": true, + "peer": true, "requires": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -49468,6 +54654,7 @@ "pkg-dir": { "version": "3.0.0", "dev": true, + "peer": true, "requires": { "find-up": "^3.0.0" }, @@ -49475,6 +54662,7 @@ "find-up": { "version": "3.0.0", "dev": true, + "peer": true, "requires": { "locate-path": "^3.0.0" } @@ -49482,6 +54670,7 @@ "locate-path": { "version": "3.0.0", "dev": true, + "peer": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -49490,13 +54679,15 @@ "p-locate": { "version": "3.0.0", "dev": true, + "peer": true, "requires": { "p-limit": "^2.0.0" } }, "path-exists": { "version": "3.0.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -49602,8 +54793,8 @@ "version": "file:experimental/examples/prometheus", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1" + "@opentelemetry/exporter-prometheus": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0" } }, "promise-all-reject-late": { @@ -49641,9 +54832,9 @@ "version": "file:integration-tests/propagation-validation-server", "requires": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "axios": "1.5.1", "body-parser": "1.19.0", "express": "4.17.3", @@ -49812,6 +55003,7 @@ "public-encrypt": { "version": "4.0.3", "dev": true, + "peer": true, "requires": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -49823,7 +55015,8 @@ "dependencies": { "bn.js": { "version": "4.12.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -49838,6 +55031,7 @@ "pumpify": { "version": "1.5.1", "dev": true, + "peer": true, "requires": { "duplexify": "^3.6.0", "inherits": "^2.0.3", @@ -49847,6 +55041,7 @@ "pump": { "version": "2.0.1", "dev": true, + "peer": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -49871,7 +55066,8 @@ }, "querystring-es3": { "version": "0.2.1", - "dev": true + "dev": true, + "peer": true }, "querystringify": { "version": "2.2.0", @@ -49910,6 +55106,7 @@ "randomfill": { "version": "1.0.4", "dev": true, + "peer": true, "requires": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -50185,13 +55382,6 @@ "readable-stream": "^2.0.2" } }, - "rechoir": { - "version": "0.7.1", - "dev": true, - "requires": { - "resolve": "^1.9.0" - } - }, "redent": { "version": "3.0.0", "dev": true, @@ -50483,6 +55673,7 @@ "rimraf": { "version": "2.7.1", "dev": true, + "peer": true, "requires": { "glob": "^7.1.3" } @@ -50490,6 +55681,7 @@ "ripemd160": { "version": "2.0.2", "dev": true, + "peer": true, "requires": { "hash-base": "^3.0.0", "inherits": "^2.0.1" @@ -50532,13 +55724,15 @@ "run-queue": { "version": "1.0.3", "dev": true, + "peer": true, "requires": { "aproba": "^1.1.1" }, "dependencies": { "aproba": { "version": "1.2.0", - "dev": true + "dev": true, + "peer": true } } }, @@ -50570,12 +55764,12 @@ } }, "schema-utils": { - "version": "1.0.0", + "version": "3.3.0", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, "select-hose": { @@ -50671,7 +55865,7 @@ } }, "serialize-javascript": { - "version": "4.0.0", + "version": "6.0.1", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -50790,6 +55984,7 @@ "sha.js": { "version": "2.4.11", "dev": true, + "peer": true, "requires": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -51412,6 +56607,7 @@ "ssri": { "version": "6.0.2", "dev": true, + "peer": true, "requires": { "figgy-pudding": "^3.5.1" } @@ -51464,6 +56660,7 @@ "stream-browserify": { "version": "2.0.2", "dev": true, + "peer": true, "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -51479,6 +56676,7 @@ "stream-each": { "version": "1.2.3", "dev": true, + "peer": true, "requires": { "end-of-stream": "^1.1.0", "stream-shift": "^1.0.0" @@ -51494,6 +56692,7 @@ "stream-http": { "version": "2.8.3", "dev": true, + "peer": true, "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -51504,7 +56703,8 @@ }, "stream-shift": { "version": "1.0.1", - "dev": true + "dev": true, + "peer": true }, "streamroller": { "version": "3.1.5", @@ -51835,12 +57035,13 @@ } }, "terser": { - "version": "4.8.1", + "version": "5.24.0", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "source-map-support": "~0.5.20" } }, "terser-webpack-plugin": { @@ -51874,10 +57075,6 @@ "rimraf": "^3.0.2" } }, - "acorn": { - "version": "8.11.2", - "dev": true - }, "cacache": { "version": "15.3.0", "dev": true, @@ -51963,15 +57160,6 @@ "glob": "^7.1.3" } }, - "schema-utils": { - "version": "3.3.0", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, "serialize-javascript": { "version": "5.0.1", "dev": true, @@ -51986,16 +57174,6 @@ "minipass": "^3.1.1" } }, - "terser": { - "version": "5.24.0", - "dev": true, - "requires": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, "yallist": { "version": "4.0.0", "dev": true @@ -52061,6 +57239,7 @@ "timers-browserify": { "version": "2.0.12", "dev": true, + "peer": true, "requires": { "setimmediate": "^1.0.4" } @@ -52087,7 +57266,8 @@ }, "to-arraybuffer": { "version": "1.0.1", - "dev": true + "dev": true, + "peer": true }, "to-fast-properties": { "version": "2.0.0", @@ -52314,7 +57494,8 @@ }, "tty-browserify": { "version": "0.0.0", - "dev": true + "dev": true, + "peer": true }, "tuf-js": { "version": "1.1.7", @@ -52797,13 +57978,15 @@ "util": { "version": "0.11.1", "dev": true, + "peer": true, "requires": { "inherits": "2.0.3" }, "dependencies": { "inherits": { "version": "2.0.3", - "dev": true + "dev": true, + "peer": true } } }, @@ -52860,7 +58043,8 @@ }, "vm-browserify": { "version": "1.1.2", - "dev": true + "dev": true, + "peer": true }, "void-elements": { "version": "2.0.1", @@ -52893,70 +58077,11 @@ "dev": true }, "watchpack": { - "version": "1.7.5", + "version": "2.4.0", "dev": true, "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.1" - }, - "dependencies": { - "binary-extensions": { - "version": "2.2.0", - "dev": true, - "optional": true, - "peer": true - }, - "chokidar": { - "version": "3.5.3", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "fsevents": { - "version": "2.3.3", - "dev": true, - "optional": true, - "peer": true - }, - "glob-parent": { - "version": "5.1.2", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "readdirp": { - "version": "3.6.0", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "picomatch": "^2.2.1" - } - } + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" } }, "watchpack-chokidar2": { @@ -53048,6 +58173,18 @@ "to-regex-range": "^2.1.0" } }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "glob-parent": { "version": "3.1.0", "dev": true, @@ -53110,73 +58247,59 @@ "web-opentelemetry-example": { "version": "file:examples/opentelemetry-web", "requires": { - "@babel/core": "^7.6.0", + "@babel/core": "^7.23.6", + "@babel/preset-env": "^7.22.20", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", - "webpack": "^5.65.0", - "webpack-cli": "^4.10.0", + "webpack": "^5.89.0", + "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.5.0", - "webpack-merge": "^5.8.0" + "webpack-merge": "^5.10.0" }, "dependencies": { - "@webassemblyjs/ast": { - "version": "1.11.6", + "@webpack-cli/configtest": { + "version": "2.1.1", "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } + "requires": {} }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.6", + "@webpack-cli/info": { + "version": "2.0.2", "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" - } + "requires": {} }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.6", + "@webpack-cli/serve": { + "version": "2.0.5", "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } + "requires": {} }, - "acorn": { - "version": "8.11.2", + "commander": { + "version": "10.0.1", "dev": true }, - "acorn-import-assertions": { - "version": "1.9.0", + "cross-spawn": { + "version": "7.0.3", "dev": true, - "requires": {} + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } }, "enhanced-resolve": { "version": "5.15.0", @@ -53186,16 +58309,8 @@ "tapable": "^2.2.0" } }, - "eslint-scope": { - "version": "5.1.1", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "loader-runner": { - "version": "4.3.0", + "interpret": { + "version": "3.1.1", "dev": true }, "micromatch": { @@ -53206,22 +58321,24 @@ "picomatch": "^2.3.1" } }, - "schema-utils": { - "version": "3.3.0", + "rechoir": { + "version": "0.8.0", "dev": true, "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "resolve": "^1.20.0" } }, - "serialize-javascript": { - "version": "6.0.1", + "shebang-command": { + "version": "2.0.0", "dev": true, "requires": { - "randombytes": "^2.1.0" + "shebang-regex": "^3.0.0" } }, + "shebang-regex": { + "version": "3.0.0", + "dev": true + }, "source-map": { "version": "0.7.4", "dev": true @@ -53230,16 +58347,6 @@ "version": "2.2.1", "dev": true }, - "terser": { - "version": "5.24.0", - "dev": true, - "requires": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, "terser-webpack-plugin": { "version": "5.3.9", "dev": true, @@ -53266,14 +58373,6 @@ "version": "4.9.5", "dev": true }, - "watchpack": { - "version": "2.4.0", - "dev": true, - "requires": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - } - }, "webpack": { "version": "5.89.0", "dev": true, @@ -53304,9 +58403,35 @@ "webpack-sources": "^3.2.3" } }, + "webpack-cli": { + "version": "5.1.4", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + } + }, "webpack-sources": { "version": "3.2.3", "dev": true + }, + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } } } }, @@ -53344,6 +58469,220 @@ "webpack-sources": "^1.4.1" }, "dependencies": { + "@webassemblyjs/ast": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" + } + }, + "@webassemblyjs/helper-api-error": { + "version": "1.9.0", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.9.0", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.9.0", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0" + } + }, + "@webassemblyjs/ieee754": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "@webassemblyjs/leb128": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/utf8": { + "version": "1.9.0", + "dev": true, + "peer": true + }, + "@webassemblyjs/wasm-edit": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/helper-wasm-section": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-opt": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "@webassemblyjs/wast-printer": "1.9.0" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.9.0", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0", + "@xtuc/long": "4.2.2" + } + }, + "acorn": { + "version": "6.4.2", + "dev": true, + "peer": true + }, + "binary-extensions": { + "version": "2.2.0", + "dev": true, + "optional": true, + "peer": true + }, + "chokidar": { + "version": "3.5.3", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "eslint-scope": { + "version": "4.0.3", + "dev": true, + "peer": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "glob-parent": { + "version": "5.1.2", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "loader-runner": { + "version": "2.4.0", + "dev": true, + "peer": true + }, + "readdirp": { + "version": "3.6.0", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "schema-utils": { + "version": "1.0.0", + "dev": true, + "peer": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "serialize-javascript": { + "version": "4.0.0", + "dev": true, + "peer": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "terser": { + "version": "4.8.1", + "dev": true, + "peer": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } + }, "terser-webpack-plugin": { "version": "1.4.5", "dev": true, @@ -53359,56 +58698,16 @@ "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" } - } - } - }, - "webpack-cli": { - "version": "4.10.0", - "dev": true, - "requires": { - "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", - "colorette": "^2.0.14", - "commander": "^7.0.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.12", - "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", - "webpack-merge": "^5.7.3" - }, - "dependencies": { - "commander": { - "version": "7.2.0", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } }, - "shebang-command": { - "version": "2.0.0", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "dev": true - }, - "which": { - "version": "2.0.2", + "watchpack": { + "version": "1.7.5", "dev": true, + "peer": true, "requires": { - "isexe": "^2.0.0" + "chokidar": "^3.4.1", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" } } } @@ -53495,11 +58794,6 @@ "readdirp": "~3.6.0" } }, - "fsevents": { - "version": "2.3.3", - "dev": true, - "optional": true - }, "glob-parent": { "version": "5.1.2", "dev": true, @@ -53675,6 +58969,7 @@ "worker-farm": { "version": "1.7.0", "dev": true, + "peer": true, "requires": { "errno": "~0.1.7" } @@ -53923,7 +59218,8 @@ } }, "zone.js": { - "version": "0.11.8", + "version": "0.14.3", + "dev": true, "requires": { "tslib": "^2.3.0" } diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 5dc56da0bf..d5217d8d0d 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 8e7fbaa8cb..564aa937a1 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,6 +54,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -77,13 +78,13 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "zone.js": "0.11.4" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "zone.js": "0.13.3" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "zone.js": "^0.10.2 || ^0.11.0" + "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0" }, "sideEffects": false, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep" diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index b83a17bca3..0961f60367 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -50,32 +50,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.6", - "@types/mocha": "10.0.6", - "@types/node": "18.6.5", - "@types/sinon": "10.0.20", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "codecov": "3.8.3", "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", "lerna": "6.6.2", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.18.1", + "@opentelemetry/context-zone-peer-dep": "1.21.0", "zone.js": "^0.11.0" }, "sideEffects": true, diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 30a3ef0bac..24d962023d 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -64,7 +64,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", + "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -85,13 +85,13 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.1.0 <1.8.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-core/src/common/hex-to-binary.ts b/packages/opentelemetry-core/src/common/hex-to-binary.ts new file mode 100644 index 0000000000..d2a367d3bc --- /dev/null +++ b/packages/opentelemetry-core/src/common/hex-to-binary.ts @@ -0,0 +1,43 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +function intValue(charCode: number): number { + // 0-9 + if (charCode >= 48 && charCode <= 57) { + return charCode - 48; + } + + // a-f + if (charCode >= 97 && charCode <= 102) { + return charCode - 87; + } + + // A-F + return charCode - 55; +} + +export function hexToBinary(hexStr: string): Uint8Array { + const buf = new Uint8Array(hexStr.length / 2); + let offset = 0; + + for (let i = 0; i < hexStr.length; i += 2) { + const hi = intValue(hexStr.charCodeAt(i)); + const lo = intValue(hexStr.charCodeAt(i + 1)); + buf[offset++] = (hi << 4) | lo; + } + + return buf; +} diff --git a/packages/opentelemetry-core/src/index.ts b/packages/opentelemetry-core/src/index.ts index a3ab418117..4ec08b1db1 100644 --- a/packages/opentelemetry-core/src/index.ts +++ b/packages/opentelemetry-core/src/index.ts @@ -21,6 +21,7 @@ export * from './common/global-error-handler'; export * from './common/logging-error-handler'; export * from './common/time'; export * from './common/types'; +export * from './common/hex-to-binary'; export * from './ExportResult'; export * as baggageUtils from './baggage/utils'; export * from './platform'; diff --git a/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts b/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts index baf01bdc36..dee61ec727 100644 --- a/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts +++ b/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts @@ -13,13 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import { hexToBinary } from '../../common/hex-to-binary'; + export function hexToBase64(hexStr: string): string { - const hexStrLen = hexStr.length; - let hexAsciiCharsStr = ''; - for (let i = 0; i < hexStrLen; i += 2) { - const hexPair = hexStr.substring(i, i + 2); - const hexVal = parseInt(hexPair, 16); - hexAsciiCharsStr += String.fromCharCode(hexVal); - } - return btoa(hexAsciiCharsStr); + return btoa(String.fromCharCode(...hexToBinary(hexStr))); } diff --git a/packages/opentelemetry-core/src/platform/node/environment.ts b/packages/opentelemetry-core/src/platform/node/environment.ts index 749633f08b..48658693fe 100644 --- a/packages/opentelemetry-core/src/platform/node/environment.ts +++ b/packages/opentelemetry-core/src/platform/node/environment.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as os from 'os'; import { DEFAULT_ENVIRONMENT, ENVIRONMENT, @@ -27,11 +26,5 @@ import { */ export function getEnv(): Required { const processEnv = parseEnvironment(process.env as RAW_ENVIRONMENT); - return Object.assign( - { - HOSTNAME: os.hostname(), - }, - DEFAULT_ENVIRONMENT, - processEnv - ); + return Object.assign({}, DEFAULT_ENVIRONMENT, processEnv); } diff --git a/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts b/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts index 66d4ad0fe9..7be359e651 100644 --- a/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts +++ b/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts @@ -13,40 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -function intValue(charCode: number): number { - // 0-9 - if (charCode >= 48 && charCode <= 57) { - return charCode - 48; - } - - // a-f - if (charCode >= 97 && charCode <= 102) { - return charCode - 87; - } - - // A-F - return charCode - 55; -} - -const buf8 = Buffer.alloc(8); -const buf16 = Buffer.alloc(16); +import { hexToBinary } from '../../common/hex-to-binary'; export function hexToBase64(hexStr: string): string { - let buf; - if (hexStr.length === 16) { - buf = buf8; - } else if (hexStr.length === 32) { - buf = buf16; - } else { - buf = Buffer.alloc(hexStr.length / 2); - } - let offset = 0; - - for (let i = 0; i < hexStr.length; i += 2) { - const hi = intValue(hexStr.charCodeAt(i)); - const lo = intValue(hexStr.charCodeAt(i + 1)); - buf.writeUInt8((hi << 4) | lo, offset++); - } - - return buf.toString('base64'); + return Buffer.from(hexToBinary(hexStr)).toString('base64'); } diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index decfcffaf8..0969a31bcb 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/resources": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index b5ac9e68f2..2598d9278f 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,6 +61,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -84,18 +85,18 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 01e7ae5b6e..b138f8b3bf 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -51,7 +51,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 0f41ab8b54..7e34a1eca4 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,13 +75,13 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index fc502ef642..d9178be6e0 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -83,16 +83,16 @@ "sinon": "15.1.2", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 0c2e954e64..58cad6a7d7 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -87,15 +87,15 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0" + "webpack": "5.89.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/src/Span.ts b/packages/opentelemetry-sdk-trace-base/src/Span.ts index e3e37d8213..2a00be5d8a 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Span.ts @@ -120,6 +120,8 @@ export class Span implements APISpan, ReadableSpan { this.resource = parentTracer.resource; this.instrumentationLibrary = parentTracer.instrumentationLibrary; this._spanLimits = parentTracer.getSpanLimits(); + this._attributeValueLengthLimit = + this._spanLimits.attributeValueLengthLimit || 0; if (attributes != null) { this.setAttributes(attributes); @@ -127,8 +129,6 @@ export class Span implements APISpan, ReadableSpan { this._spanProcessor = parentTracer.getActiveSpanProcessor(); this._spanProcessor.onStart(this, context); - this._attributeValueLengthLimit = - this._spanLimits.attributeValueLengthLimit || 0; } spanContext(): SpanContext { @@ -185,7 +185,9 @@ export class Span implements APISpan, ReadableSpan { return this; } if (this.events.length >= this._spanLimits.eventCountLimit!) { - diag.warn('Dropping extra events.'); + if (this._droppedEventsCount === 0) { + diag.debug('Dropping extra events.'); + } this.events.shift(); this._droppedEventsCount++; } @@ -242,6 +244,12 @@ export class Span implements APISpan, ReadableSpan { this._duration = [0, 0]; } + if (this._droppedEventsCount > 0) { + diag.warn( + `Dropped ${this._droppedEventsCount} events because eventCountLimit reached` + ); + } + this._spanProcessor.onEnd(this); } diff --git a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts index fef5c80dc0..f069aac0c7 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts @@ -221,7 +221,7 @@ export abstract class BatchSpanProcessorBase const flush = () => { this._isExporting = true; this._flushOneBatch() - .then(() => { + .finally(() => { this._isExporting = false; if (this._finishedSpans.length > 0) { this._clearTimer(); diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts index 11b0f3f318..5dd7ec79e5 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts @@ -15,6 +15,7 @@ */ import { + diag, SpanStatusCode, Exception, ROOT_CONTEXT, @@ -368,6 +369,22 @@ describe('Span', () => { span.setAttribute('attr-non-string', true); assert.strictEqual(span.attributes['attr-non-string'], true); }); + + it('should truncate value when attributes are passed to the constructor', () => { + const span = new Span( + tracer, + ROOT_CONTEXT, + name, + spanContext, + SpanKind.CLIENT, + undefined, + undefined, + undefined, + undefined, + { 'attr-with-more-length': 'abcdefgh' } + ); + assert.strictEqual(span.attributes['attr-with-more-length'], 'abcde'); + }); }); describe('when "attributeValueLengthLimit" option is invalid', () => { @@ -786,6 +803,10 @@ describe('Span', () => { spanContext, SpanKind.CLIENT ); + + const debugStub = sinon.spy(diag, 'debug'); + const warnStub = sinon.spy(diag, 'warn'); + for (let i = 0; i < 150; i++) { span.addEvent('sent' + i); } @@ -793,6 +814,12 @@ describe('Span', () => { assert.strictEqual(span.events.length, 100); assert.strictEqual(span.events[span.events.length - 1].name, 'sent149'); + + sinon.assert.calledOnceWithExactly(debugStub, 'Dropping extra events.'); + sinon.assert.calledOnceWithExactly( + warnStub, + 'Dropped 50 events because eventCountLimit reached' + ); }); it('should store the count of dropped events in droppedEventsCount', () => { diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts index 359816874d..9d5d07ea14 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts @@ -28,7 +28,6 @@ import { TraceFlags, TraceState, } from '@opentelemetry/api'; -import { getSpan } from '@opentelemetry/api/build/src/trace/context-utils'; import { InstrumentationLibrary, sanitizeAttributes, @@ -303,7 +302,7 @@ describe('Tracer', () => { const samplerContext = shouldSampleSpy.firstCall.args[0]; const processorContext = onStartSpy.firstCall.args[1]; assert.strictEqual(samplerContext, processorContext); - assert.strictEqual(getSpan(samplerContext), undefined); + assert.strictEqual(trace.getSpan(samplerContext), undefined); }); it('should sample a trace when OTEL_TRACES_SAMPLER_ARG is unset', () => { @@ -361,7 +360,7 @@ describe('Tracer', () => { tracer.startActiveSpan('my-span', span => { try { assert(spy.calledWith('my-span')); - assert.strictEqual(getSpan(context.active()), span); + assert.strictEqual(trace.getSpan(context.active()), span); return 1; } finally { span.end(); @@ -387,7 +386,7 @@ describe('Tracer', () => { span => { try { assert(spy.calledWith('my-span', { attributes: { foo: 'bar' } })); - assert.strictEqual(getSpan(context.active()), span); + assert.strictEqual(trace.getSpan(context.active()), span); return 1; } finally { span.end(); @@ -421,7 +420,7 @@ describe('Tracer', () => { assert( spy.calledWith('my-span', { attributes: { foo: 'bar' } }, ctx) ); - assert.strictEqual(getSpan(context.active()), span); + assert.strictEqual(trace.getSpan(context.active()), span); assert.strictEqual(ctx.getValue(ctxKey), 'bar'); return 1; } finally { diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts index 83fb3ebe44..251971385c 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts @@ -387,6 +387,57 @@ describe('BatchSpanProcessorBase', () => { }); }); + it('should still export when previously failed', async () => { + // The scenario is made of several parts: + // 1. The exporter tries to export some spans + // 2. While it does so, more spans are processed + // 3. The exporter fails + // 4. Spans arriving during step 2 should be exported + + let firstCall = true; + const fillingExportStub = sinon + .stub(exporter, 'export') + .callsFake((spans, cb) => { + // The first time export is called, add some spans to the processor. + // Any other time, call through. We don't simply restore the stub + // so we can count the calls with `sinon.assert` + if (!firstCall) { + return fillingExportStub.wrappedMethod.call(exporter, spans, cb); + } + + // Step 2: During export, add another span + firstCall = false; + processSpan(); + + return fillingExportStub.wrappedMethod.call(exporter, spans, () => { + // Step 3: Mock failure + cb({ + code: ExportResultCode.FAILED, + }); + }); + }); + + const clock = sinon.useFakeTimers(); + + // Step 1: Export a span + processSpan(); + await clock.runAllAsync(); + + clock.restore(); + fillingExportStub.restore(); + + // Step 4: Make sure all spans were processed + assert.equal(exporter['_finishedSpans'].length, 2); + assert.equal(processor['_finishedSpans'].length, 0); + sinon.assert.calledTwice(fillingExportStub); + + function processSpan() { + const span = createSampledSpan('test'); + processor.onStart(span, ROOT_CONTEXT); + processor.onEnd(span); + } + }); + it('should wait for pending resource on flush', async () => { const tracer = new BasicTracerProvider({ resource: new Resource( diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index a6b5a7927e..00f89bf0a7 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,10 +46,11 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -64,11 +65,12 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/context-async-hooks": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index f433587b3c..6822959dfd 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,9 +57,9 @@ "devDependencies": { "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@opentelemetry/context-zone": "1.18.1", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/context-zone": "1.21.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/resources": "1.21.0", "@types/jquery": "3.5.29", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -84,17 +84,17 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 536103f0a2..4d0ce7140e 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 1f1d2f4bba..005713fd79 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,10 +42,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": ">=1.1.0 <1.8.0", - "@opentelemetry/propagator-b3": "1.18.1", - "@opentelemetry/propagator-jaeger": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", + "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/propagator-b3": "1.21.0", + "@opentelemetry/propagator-jaeger": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -60,8 +60,8 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 988fc4409a..d6ba7412f2 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics", - "version": "1.18.1", + "version": "1.21.0", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -76,16 +76,16 @@ "ts-loader": "8.4.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" + "webpack": "5.89.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.8.0" }, "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", diff --git a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts index 9356580205..d13042c330 100644 --- a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts +++ b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts @@ -193,6 +193,12 @@ export class ExponentialHistogramAccumulation implements Accumulation { * @param increment */ updateByIncrement(value: number, increment: number) { + // NaN does not fall into any bucket, is not zero and should not be counted, + // NaN is never greater than max nor less than min, therefore return as there's nothing for us to do. + if (Number.isNaN(value)) { + return; + } + if (value > this._max) { this._max = value; } @@ -344,6 +350,10 @@ export class ExponentialHistogramAccumulation implements Accumulation { return; } + if (buckets.length === 0) { + buckets.indexStart = buckets.indexEnd = buckets.indexBase = index; + } + if (index < buckets.indexStart) { const span = buckets.indexEnd - index; if (span >= buckets.backing.length) { diff --git a/packages/sdk-metrics/src/aggregator/Histogram.ts b/packages/sdk-metrics/src/aggregator/Histogram.ts index 60e5e8df05..94cf906039 100644 --- a/packages/sdk-metrics/src/aggregator/Histogram.ts +++ b/packages/sdk-metrics/src/aggregator/Histogram.ts @@ -72,6 +72,12 @@ export class HistogramAccumulation implements Accumulation { ) {} record(value: number): void { + // NaN does not fall into any bucket, is not zero and should not be counted, + // NaN is never greater than max nor less than min, therefore return as there's nothing for us to do. + if (Number.isNaN(value)) { + return; + } + this._current.count += 1; this._current.sum += value; diff --git a/packages/sdk-metrics/src/version.js b/packages/sdk-metrics/src/version.js deleted file mode 100644 index 2090d63abf..0000000000 --- a/packages/sdk-metrics/src/version.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; diff --git a/packages/sdk-metrics/src/view/Aggregation.ts b/packages/sdk-metrics/src/view/Aggregation.ts index 6edf50c495..2f74063ca2 100644 --- a/packages/sdk-metrics/src/view/Aggregation.ts +++ b/packages/sdk-metrics/src/view/Aggregation.ts @@ -130,8 +130,10 @@ export class ExplicitBucketHistogramAggregation extends Aggregation { private readonly _recordMinMax = true ) { super(); - if (boundaries === undefined || boundaries.length === 0) { - throw new Error('HistogramAggregator should be created with boundaries.'); + if (boundaries == null) { + throw new Error( + 'ExplicitBucketHistogramAggregation should be created with explicit boundaries, if a single bucket histogram is required, please pass an empty array' + ); } // Copy the boundaries array for modification. boundaries = boundaries.concat(); diff --git a/packages/sdk-metrics/test/Instruments.test.ts b/packages/sdk-metrics/test/Instruments.test.ts index ab466c295a..71c69913a3 100644 --- a/packages/sdk-metrics/test/Instruments.test.ts +++ b/packages/sdk-metrics/test/Instruments.test.ts @@ -247,6 +247,7 @@ describe('Instruments', () => { upDownCounter.add(1.1, { foo: 'bar' }); // non-number values should be ignored. upDownCounter.add('1' as any); + await validateExport(deltaReader, { dataPointType: DataPointType.SUM, isMonotonic: false, @@ -406,6 +407,20 @@ describe('Instruments', () => { }); }); + it('should allow metric advice with empty explicit boundaries', function () { + const meter = new MeterProvider({ + readers: [new TestMetricReader()], + }).getMeter('meter'); + + assert.doesNotThrow(() => { + meter.createHistogram('histogram', { + advice: { + explicitBucketBoundaries: [], + }, + }); + }); + }); + it('should collect min and max', async () => { const { meter, deltaReader, cumulativeReader } = setup(); const histogram = meter.createHistogram('test', { @@ -506,6 +521,7 @@ describe('Instruments', () => { histogram.record(0.1, { foo: 'bar' }); // non-number values should be ignored. histogram.record('1' as any); + histogram.record(NaN); await validateExport(deltaReader, { dataPointType: DataPointType.HISTOGRAM, diff --git a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts index 2bcbc43307..cdeb4cc761 100644 --- a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts +++ b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts @@ -215,6 +215,20 @@ describe('ExponentialHistogramAccumulation', () => { } }); }); + + it('ignores NaN', () => { + const accumulation = new ExponentialHistogramAccumulation([0, 0], 1); + + accumulation.record(NaN); + + assert.strictEqual(accumulation.scale, 0); + assert.strictEqual(accumulation.max, -Infinity); + assert.strictEqual(accumulation.min, Infinity); + assert.strictEqual(accumulation.sum, 0); + assert.strictEqual(accumulation.count, 0); + assert.deepStrictEqual(getCounts(accumulation.positive), []); + assert.deepStrictEqual(getCounts(accumulation.negative), []); + }); }); describe('merge', () => { it('handles simple (even) case', () => { @@ -583,6 +597,49 @@ describe('ExponentialHistogramAggregation', () => { const result = agg.merge(acc0, acc1); assert.strictEqual(result.startTime, acc0.startTime); }); + it('handles zero-length buckets in source histogram', () => { + // https://github.com/open-telemetry/opentelemetry-js/issues/4450 + const delta = new ExponentialHistogramAccumulation([0, 0], 160); + delta.updateByIncrement(0.0, 2); // A histogram with zero count of two and empty buckets + + const previous = new ExponentialHistogramAccumulation([0, 0], 160); + previous.updateByIncrement(0, 1); + previous.updateByIncrement(0.000979, 41); //Bucket: (0.00097656, 0.0010198], Count: 41, Index: -160 + previous.updateByIncrement(0.001959, 17); //Bucket: (0.00195313, 0.0020396], Count: 17, Index: -144 + previous.updateByIncrement(0.002889, 1); //Bucket: (0.00288443, 0.00301213], Count: 1, Index: -135 + previous.updateByIncrement(0.003909, 1); //Bucket: (0.00390625, 0.00407919], Count: 1, Index: -128 + previous.updateByIncrement(0.004859, 2); //Bucket: (0.00485101, 0.00506578], Count: 2, Index: -123 + previous.updateByIncrement(0.008899, 1); //Bucket: (0.00889679, 0.00929068], Count: 1, Index: -109 + previous.updateByIncrement(0.018589, 1); //Bucket: (0.01858136, 0.01940403], Count: 1, Index: -92 + previous.updateByIncrement(0.020269, 2); //Bucket: (0.02026312, 0.02116024], Count: 2, Index: -90 + previous.updateByIncrement(0.021169, 3); //Bucket: (0.02116024, 0.02209709], Count: 3, Index: -89 + previous.updateByIncrement(0.023079, 2); //Bucket: (0.02307541, 0.02409704], Count: 2, Index: -87 + previous.updateByIncrement(0.025169, 2); //Bucket: (0.02516391, 0.02627801], Count: 2, Index: -85 + previous.updateByIncrement(0.026279, 1); //Bucket: (0.02627801, 0.02744144], Count: 1, Index: -84 + previous.updateByIncrement(0.029929, 2); //Bucket: (0.0299251, 0.03125], Count: 2, Index: -81 + previous.updateByIncrement(0.031259, 1); //Bucket: (0.03125, 0.03263356], Count: 1, Index: -80 + previous.updateByIncrement(0.032639, 1); //Bucket: (0.03263356, 0.03407837], Count: 1, Index: -79 + previous.updateByIncrement(0.037169, 1); //Bucket: (0.03716272, 0.03880806], Count: 1, Index: -76 + previous.updateByIncrement(0.038809, 1); //Bucket: (0.03880806, 0.04052624], Count: 1, Index: -75 + previous.updateByIncrement(0.042329, 1); //Bucket: (0.04232049, 0.04419417], Count: 1, Index: -73 + previous.updateByIncrement(0.044199, 1); //Bucket: (0.04419417, 0.04615082], Count: 1, Index: -72 + previous.updateByIncrement(0.048199, 1); //Bucket: (0.04819409, 0.05032782], Count: 1, Index: -70 + previous.updateByIncrement(0.065269, 1); //Bucket: (0.06526711, 0.06815673], Count: 1, Index: -63 + previous.updateByIncrement(0.092309, 1); //Bucket: (0.09230163, 0.09638818], Count: 1, Index: -55 + previous.updateByIncrement(0.100659, 1); //Bucket: (0.10065565, 0.10511205], Count: 1, Index: -53 + + const result = delta.clone(); + result.merge(previous); + + assert.equal(result.count, delta.count + previous.count); + assert.equal(result.count, bucketCounts(result)); + assert.equal(delta.count, bucketCounts(delta)); + assert.equal(previous.count, bucketCounts(previous)); + assert.equal( + bucketCounts(result), + bucketCounts(delta) + bucketCounts(previous) + ); + }); }); describe('diff', () => { @@ -824,3 +881,14 @@ function bucketsToString(buckets: Buckets): string { str += ']\n'; return str; } + +function bucketCounts(histo: ExponentialHistogramAccumulation): number { + // zero counts do not get a dedicated bucket, but they are part of the overall + // histogram count + return histo + .toPointValue() + .positive.bucketCounts.reduce( + (total, current) => (total += current), + histo.zeroCount + ); +} diff --git a/packages/sdk-metrics/test/aggregator/Histogram.test.ts b/packages/sdk-metrics/test/aggregator/Histogram.test.ts index 5d03477d3e..894e30e4af 100644 --- a/packages/sdk-metrics/test/aggregator/Histogram.test.ts +++ b/packages/sdk-metrics/test/aggregator/Histogram.test.ts @@ -81,6 +81,30 @@ describe('HistogramAggregator', () => { sum: -65, }); }); + + it('with single bucket', function () { + const aggregator = new HistogramAggregator([], true); + const prev = aggregator.createAccumulation([0, 0]); + prev.record(0); + prev.record(1); + + const delta = aggregator.createAccumulation([1, 1]); + delta.record(2); + delta.record(11); + + const expected = new HistogramAccumulation([0, 0], [], true, { + buckets: { + boundaries: [], + counts: [4], + }, + count: 4, + sum: 14, + hasMinMax: true, + min: 0, + max: 11, + }); + assert.deepStrictEqual(aggregator.merge(prev, delta), expected); + }); }); describe('diff', () => { @@ -112,6 +136,35 @@ describe('HistogramAggregator', () => { assert.deepStrictEqual(aggregator.diff(prev, curr), expected); }); + + it('with single bucket', function () { + const aggregator = new HistogramAggregator([], true); + const prev = aggregator.createAccumulation([0, 0]); + prev.record(0); + prev.record(1); + + const curr = aggregator.createAccumulation([1, 1]); + // replay actions on prev + curr.record(0); + curr.record(1); + // perform new actions + curr.record(2); + curr.record(11); + + const expected = new HistogramAccumulation([1, 1], [], true, { + buckets: { + boundaries: [], + counts: [2], + }, + count: 2, + sum: 13, + hasMinMax: false, + min: Infinity, + max: -Infinity, + }); + + assert.deepStrictEqual(aggregator.diff(prev, curr), expected); + }); }); describe('toMetricData', () => { @@ -199,6 +252,48 @@ describe('HistogramAggregator', () => { ); }); + it('should transform to expected data with empty boundaries', () => { + const aggregator = new HistogramAggregator([], false); + + const startTime: HrTime = [0, 0]; + const endTime: HrTime = [1, 1]; + const accumulation = aggregator.createAccumulation(startTime); + accumulation.record(0); + accumulation.record(1); + + const expected: MetricData = { + descriptor: defaultInstrumentDescriptor, + aggregationTemporality: AggregationTemporality.CUMULATIVE, + dataPointType: DataPointType.HISTOGRAM, + dataPoints: [ + { + attributes: {}, + startTime, + endTime, + value: { + buckets: { + boundaries: [], + counts: [2], + }, + count: 2, + sum: 1, + min: undefined, + max: undefined, + }, + }, + ], + }; + assert.deepStrictEqual( + aggregator.toMetricData( + defaultInstrumentDescriptor, + AggregationTemporality.CUMULATIVE, + [[{}, accumulation]], + endTime + ), + expected + ); + }); + function testSum(instrumentType: InstrumentType, expectSum: boolean) { const aggregator = new HistogramAggregator([1, 10, 100], true); @@ -257,6 +352,19 @@ describe('HistogramAccumulation', () => { accumulation.record(value); } }); + + it('ignores NaN', () => { + const accumulation = new HistogramAccumulation([0, 0], [1, 10, 100]); + + accumulation.record(NaN); + + const pointValue = accumulation.toPointValue(); + assert.strictEqual(pointValue.max, -Infinity); + assert.strictEqual(pointValue.min, Infinity); + assert.strictEqual(pointValue.sum, 0); + assert.strictEqual(pointValue.count, 0); + assert.deepStrictEqual(pointValue.buckets.counts, [0, 0, 0, 0]); + }); }); describe('setStartTime', () => { diff --git a/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts b/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts new file mode 100644 index 0000000000..a37c9c8e92 --- /dev/null +++ b/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts @@ -0,0 +1,99 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import { + Aggregation, + AggregationTemporality, + MeterProvider, + MetricReader, + DataPoint, + ExponentialHistogram, + Histogram, +} from '../../src'; +import { TestMetricReader } from '../export/TestMetricReader'; + +describe('histogram-recording-nan', () => { + it('exponential histogram should not count NaN', async () => { + const reader = new TestMetricReader({ + aggregationTemporalitySelector() { + return AggregationTemporality.CUMULATIVE; + }, + aggregationSelector(type) { + return Aggregation.ExponentialHistogram(); + }, + }); + const meterProvider = new MeterProvider({ + readers: [reader], + }); + + const meter = meterProvider.getMeter('my-meter'); + const hist = meter.createHistogram('testhist'); + + hist.record(1); + hist.record(2); + hist.record(4); + hist.record(NaN); + + const resourceMetrics1 = await collectNoErrors(reader); + const dataPoint1 = resourceMetrics1.scopeMetrics[0].metrics[0] + .dataPoints[0] as DataPoint; + + assert.deepStrictEqual( + dataPoint1.value.count, + 3, + 'Sum of bucket count values should match overall count' + ); + }); + + it('explicit bucket histogram should not count NaN', async () => { + const reader = new TestMetricReader({ + aggregationTemporalitySelector() { + return AggregationTemporality.CUMULATIVE; + }, + aggregationSelector(type) { + return Aggregation.Histogram(); + }, + }); + const meterProvider = new MeterProvider({ + readers: [reader], + }); + + const meter = meterProvider.getMeter('my-meter'); + const hist = meter.createHistogram('testhist'); + + hist.record(1); + hist.record(2); + hist.record(4); + hist.record(NaN); + + const resourceMetrics1 = await collectNoErrors(reader); + const dataPoint1 = resourceMetrics1.scopeMetrics[0].metrics[0] + .dataPoints[0] as DataPoint; + + assert.deepStrictEqual( + dataPoint1.value.count, + 3, + 'Sum of bucket count values should match overall count' + ); + }); + + const collectNoErrors = async (reader: MetricReader) => { + const { resourceMetrics, errors } = await reader.collect(); + assert.strictEqual(errors.length, 0); + return resourceMetrics; + }; +}); diff --git a/packages/sdk-metrics/test/view/Aggregation.test.ts b/packages/sdk-metrics/test/view/Aggregation.test.ts index 0da2c09bee..51595aa590 100644 --- a/packages/sdk-metrics/test/view/Aggregation.test.ts +++ b/packages/sdk-metrics/test/view/Aggregation.test.ts @@ -158,6 +158,25 @@ describe('ExplicitBucketHistogramAggregation', () => { } }); + it('construct with empty boundaries', function () { + const boundaries: number[] = []; + const aggregation = new ExplicitBucketHistogramAggregation(boundaries); + assert.ok(aggregation instanceof ExplicitBucketHistogramAggregation); + assert.deepStrictEqual(aggregation['_boundaries'], []); + }); + + it('construct with undefined boundaries should throw', function () { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore simulate how a JS user could pass undefined + assert.throws(() => new ExplicitBucketHistogramAggregation(undefined)); + }); + + it('construct with null boundaries should throw', function () { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore simulate how a JS user could pass null + assert.throws(() => new ExplicitBucketHistogramAggregation(null)); + }); + it('constructor should not modify inputs', () => { const boundaries = [100, 10, 1]; const aggregation = new ExplicitBucketHistogramAggregation(boundaries); diff --git a/packages/template/package.json b/packages/template/package.json index a2746412c7..716e6cbdb9 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.18.1", + "version": "1.21.0", "private": true, "publishConfig": { "access": "restricted" @@ -102,6 +102,6 @@ "karma-spec-reporter": "0.0.32", "karma-webpack": "4.0.2", "ts-loader": "8.4.0", - "webpack": "4.46.0" + "webpack": "5.89.0" } } diff --git a/packages/template/src/version.js b/packages/template/src/version.js deleted file mode 100644 index 2090d63abf..0000000000 --- a/packages/template/src/version.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.VERSION = void 0; -// this is autogenerated file, see scripts/version-update.js -exports.VERSION = '1.16.0'; diff --git a/renovate.json b/renovate.json index bc0f6854c4..1257c688d1 100644 --- a/renovate.json +++ b/renovate.json @@ -17,7 +17,7 @@ "schedule": ["before 3am on Monday"] }, { - "matchPackageNames": ["typescript", "webpack", "webpack-cli", "lerna"], + "matchPackageNames": ["typescript", "lerna"], "dependencyDashboardApproval": true } ], diff --git a/selenium-tests/package.json b/selenium-tests/package.json index d3e7c7e584..b3567e73ad 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.19.1", + "version": "1.22.0", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -40,32 +40,32 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", + "webpack": "5.89.0", + "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.9.0" + "webpack-merge": "5.10.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.18.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/exporter-trace-otlp-http": "0.45.1", - "@opentelemetry/exporter-zipkin": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/instrumentation-fetch": "0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/sdk-trace-web": "1.18.1", + "@opentelemetry/context-zone-peer-dep": "1.21.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/exporter-trace-otlp-http": "0.48.0", + "@opentelemetry/exporter-zipkin": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/instrumentation-fetch": "0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0", + "@opentelemetry/sdk-trace-web": "1.21.0", "zone.js": "0.11.4" } }