diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 1ee74306e9c..c8225738d05 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -17,10 +17,13 @@ jobs: NPM_CONFIG_UNSAFE_PERM: true steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: ${{ matrix.node_version }} - run: npm install -g npm@latest diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml index b3cd8f83e5d..209d230ac41 100644 --- a/.github/workflows/close-stale.yml +++ b/.github/workflows/close-stale.yml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: days-before-stale: 60 days-before-close: 14 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 9c5e8037c7b..3c519e632e4 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -13,6 +13,9 @@ jobs: - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: '18' - name: Install and Build 🔧 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 30beff6f5d8..81608395315 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,11 +12,14 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 - - - uses: actions/checkout@v4 + cache: 'npm' + cache-dependency-path: | + package-lock.json + node-version: '20' - name: Lint changelog file uses: avto-dev/markdown-lint@v1 diff --git a/.github/workflows/peer-api.yml b/.github/workflows/peer-api.yml index bfcd7ab1523..f7b84a8bf00 100644 --- a/.github/workflows/peer-api.yml +++ b/.github/workflows/peer-api.yml @@ -20,7 +20,7 @@ jobs: run: npm install -g lerna@6.6.2 - name: Install semver - run: npm install semver + run: npm install -g semver - name: Check API dependency semantics working-directory: packages diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index aba88acef3d..c9bfadecbaa 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,7 @@ jobs: matrix: node_version: - "18" - # - "20" # disabled until http instrumentation can be fixed + - "20" runs-on: ubuntu-latest env: NPM_CONFIG_UNSAFE_PERM: true @@ -23,6 +23,9 @@ jobs: - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: ${{ matrix.node_version }} - run: npm install -g npm@latest @@ -51,6 +54,9 @@ jobs: - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: '18' - run: npm install -g npm@latest @@ -77,7 +83,14 @@ jobs: - uses: actions/setup-node@v4 with: +<<<<<<< HEAD node-version: 18 +======= + cache: 'npm' + cache-dependency-path: | + package-lock.json + node-version: 16 +>>>>>>> origin/main - name: Bootstrap run: npm ci @@ -95,10 +108,17 @@ jobs: NPM_CONFIG_UNSAFE_PERM: true steps: - name: Checkout - uses: actions/checkout@v4.0.0 + uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: +<<<<<<< HEAD node-version: 18 +======= + cache: 'npm' + cache-dependency-path: | + package-lock.json + node-version: 16 +>>>>>>> origin/main - name: Bootstrap run: npm ci @@ -127,6 +147,9 @@ jobs: - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: ${{ matrix.node_version }} - name: Build diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml index 51614cf87b3..bb2be0645e5 100644 --- a/.github/workflows/w3c-integration-test.yml +++ b/.github/workflows/w3c-integration-test.yml @@ -16,6 +16,9 @@ jobs: - uses: actions/setup-node@v4 with: + cache: 'npm' + cache-dependency-path: | + package-lock.json node-version: 18 - name: Install and Bootstrap 🔧 diff --git a/.npmrc b/.npmrc index b15c08c1bdd..776cfbfbf21 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ -//registry.npmjs.org/:_authToken=${NPM_TOKEN} lockfile-version=2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 336e211d6f1..8a0bcc4b3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :boom: Breaking Change +* 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) ### :books: (Refine Doc) @@ -17,9 +21,11 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas * chore: no need for 'packages' in lerna.json [#4264](https://github.com/open-telemetry/opentelemetry-js/pull/4264) @trentm +* test: add node 20 to test matrix [#4336](https://github.com/open-telemetry/opentelemetry-js/pull/4336) @dyladan ### :bug: (Bug Fix) +* fix(api-logs): allow for TimeInput type for LogRecord timestamps [#4345](https://github.com/open-telemetry/opentelemetry-js/pull/4345) * fix(sdk-trace-web): only access location if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063) * fix(sdk-trace-base): processor onStart called with a span having empty attributes @@ -365,16 +371,8 @@ There are no changes between 1.0.0 and the previous 0.33.0 version. * fix(sdk-web): parse url with relative url string [#2972](https://github.com/open-telemetry/opentelemetry-js/pull/2972) @legendecas -### :books: (Refine Doc) - -### :house: (Internal) - ## 1.2.0 -### :boom: Breaking Change - -### :rocket: (Enhancement) - ### :bug: (Bug Fix) * fix: sanitize attributes inputs [#2881](https://github.com/open-telemetry/opentelemetry-js/pull/2881) @legendecas @@ -2290,7 +2288,9 @@ Released 2020-03-19 Released 2020-03-16 -### This is a first official beta release, which provides almost fully complete metrics, tracing, and context propagation functionality but makes no promises around breaking changes +### First official beta release + +* provides almost fully complete metrics, tracing, and context propagation functionality but makes **no promises** around breaking changes ### :boom: Breaking Change diff --git a/README.md b/README.md index fdc5233f23f..a2c0387fdc9 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,7 @@ If you are a library author looking to build OpenTelemetry into your library, pl | Platform Version | Supported | |---------------------|-----------------------------------------------| +| Node.JS `v20` | :heavy_check_mark: | | Node.JS `v18` | :heavy_check_mark: | | Node.JS `v16` | :heavy_check_mark: | | Node.JS `v14` | :heavy_check_mark: | @@ -210,6 +211,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t - [Neville Wylie](https://github.com/MSNev), Microsoft - [Purvi Kanal](https://github.com/pkanal), Honeycomb - [Svetlana Brennan](https://github.com/svetlanabrennan), New Relic +- [Trent Mick](https://github.com/trentm), Elastic *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).* diff --git a/api/package.json b/api/package.json index a80060a19b8..04ac24ed9aa 100644 --- a/api/package.json +++ b/api/package.json @@ -66,10 +66,10 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.36", + "@types/webpack": "4.41.38", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index b9935e26c58..0454299c684 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,17 +6,21 @@ 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(sdk-logs): add droppedAttributesCount field to ReadableLogRecord + ### :bug: (Bug Fix) * 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 - -### :books: (Refine Doc) - -### :house: (Internal) +* 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) ## 0.45.1 @@ -183,8 +187,6 @@ All notable changes to experimental packages in this project will be documented * doc(instrumentation): add limitiations section to readme [#3786](https://github.com/open-telemetry/opentelemetry-js/pull/3786) @flarna -### :house: (Internal) - ## 0.38.0 ### :boom: Breaking Change @@ -401,10 +403,6 @@ All notable changes to experimental packages in this project will be documented * fix(histogram): fix maximum when only values < -1 are provided [#3086](https://github.com/open-telemetry/opentelemetry-js/pull/3086) @pichlermarc * fix(instrumentation-grpc): always set grpc semcov status code attribute with numeric value [#3076](https://github.com/open-telemetry/opentelemetry-js/pull/3076) @blumamir -### :books: (Refine Doc) - -### :house: (Internal) - ## 0.30.0 ### :boom: Breaking Change @@ -479,10 +477,6 @@ All notable changes to experimental packages in this project will be documented * fix(metrics): specification compliant default metric unit [#2983](https://github.com/open-telemetry/opentelemetry-js/pull/2983) @andyfleming * fix(opentelemetry-instrumentation): use all provided patches for the same file [#2963](https://github.com/open-telemetry/opentelemetry-js/pull/2963) @Ugzuzg -### :books: (Refine Doc) - -### :house: (Internal) - ## 0.28.0 ### :boom: Breaking Change diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 316ddfbf268..0b2683f6d16 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -64,7 +64,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 311dba69504..b96782520f9 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -64,7 +64,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/api-logs/src/types/LogRecord.ts b/experimental/packages/api-logs/src/types/LogRecord.ts index 59718aa30ba..69dd14f7cba 100644 --- a/experimental/packages/api-logs/src/types/LogRecord.ts +++ b/experimental/packages/api-logs/src/types/LogRecord.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AttributeValue, Context } from '@opentelemetry/api'; +import { AttributeValue, Context, TimeInput } from '@opentelemetry/api'; export type LogAttributeValue = AttributeValue | LogAttributes; export interface LogAttributes { @@ -53,12 +53,12 @@ export interface LogRecord { /** * The time when the log record occurred as UNIX Epoch time in nanoseconds. */ - timestamp?: number; + timestamp?: TimeInput; /** * Time when the event was observed by the collection system. */ - observedTimestamp?: number; + observedTimestamp?: TimeInput; /** * Numerical value of the severity. diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index b1fd3203f59..0f5a864a8d5 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -48,13 +48,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts b/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts index 633d1a7833a..21e151d2277 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts @@ -49,6 +49,7 @@ export const mockedReadableLogRecord: ReadableLogRecord = { attributes: { 'some-attribute': 'some attribute value', }, + droppedAttributesCount: 0, severityNumber: SeverityNumber.ERROR, severityText: 'error', body: 'some_log_body', diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index f4483e3940f..2045ebbac8f 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -71,10 +71,10 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts index bc4d17a4f0f..11facc4402e 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts @@ -44,6 +44,7 @@ export const mockedReadableLogRecord: ReadableLogRecord = { attributes: { 'some-attribute': 'some attribute value', }, + droppedAttributesCount: 0, severityNumber: SeverityNumber.ERROR, severityText: 'error', body: 'some_log_body', diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index b0f06f6c24f..f521f934b38 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -63,9 +63,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts index ae72deae335..ab2f0885033 100644 --- a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts +++ b/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts @@ -45,6 +45,7 @@ export const mockedReadableLogRecord: ReadableLogRecord = { attributes: { 'some-attribute': 'some attribute value', }, + droppedAttributesCount: 0, severityNumber: SeverityNumber.ERROR, severityText: 'error', body: 'some_log_body', diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index a14a3592a41..c1bf7a87011 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -47,11 +47,11 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-exporter-base": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index fb1959eefbb..434ee6b946e 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -63,9 +63,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 868fb370fc1..3f2cf7221e2 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -62,9 +62,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index e72006abe9c..240db2e9db8 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -53,9 +53,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index bae4147fc43..4c6bc50dedc 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -47,10 +47,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts index 0ada75d4375..b1b12272750 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts @@ -49,6 +49,7 @@ class OTLPMetricExporterProxy extends OTLPGRPCExporterNodeBase< ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS ), + ...config?.headers, }; this.metadata ||= new Metadata(); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts index 1df8e0cc128..79a6125a095 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts @@ -322,6 +322,15 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; envSource.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT = ''; }); + it('should use override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar/v1/metrics'; + const constructorDefinedEndpoint = 'http://constructor/v1/metrics'; + const collectorExporter = new OTLPMetricExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual(collectorExporter._otlpExporter.url, 'constructor'); + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; + }); it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar'; const collectorExporter = new OTLPMetricExporter(); @@ -363,6 +372,23 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_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 OTLPMetricExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.deepStrictEqual( + collectorExporter._otlpExporter.metadata?.get('foo'), + ['constructor'] + ); + assert.deepStrictEqual( + collectorExporter._otlpExporter.metadata?.get('bar'), + ['foo'] + ); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); }); testOTLPMetricExporter({ useTLS: true }); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 7554c13a1ef..f3756acc7e5 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -63,9 +63,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts index d051b7be9b3..cd648ce8753 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts @@ -48,6 +48,7 @@ class OTLPExporterNodeProxy extends OTLPExporterNodeBase< ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS ), + ...config?.headers, }; } 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 2f809e62517..66f6af3006e 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 @@ -296,6 +296,18 @@ describe('OTLPMetricExporter - node with json over http', () => { ); envSource.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT = ''; }); + it('should use override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar/v1/metrics'; + const constructorDefinedEndpoint = 'http://constructor/v1/metrics'; + const collectorExporter = new OTLPMetricExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual( + collectorExporter._otlpExporter.url, + constructorDefinedEndpoint + ); + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; + }); it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar'; const collectorExporter = new OTLPMetricExporter(); @@ -318,6 +330,20 @@ describe('OTLPMetricExporter - node with json over http', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_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 OTLPMetricExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual( + collectorExporter._otlpExporter.headers.foo, + 'constructor' + ); + assert.strictEqual(collectorExporter._otlpExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); it('should use delta temporality defined via env', () => { for (const envValue of ['delta', 'DELTA', 'DeLTa', 'delta ']) { envSource.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = envValue; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 289079ac1b9..9140fe518db 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -55,9 +55,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts index 8d1fb114b3f..52c9991e30a 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts @@ -51,6 +51,7 @@ class OTLPMetricExporterNodeProxy extends OTLPProtoExporterNodeBase< ...baggageUtils.parseKeyPairsIntoRecord( getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS ), + ...config?.headers, }; } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts index 80902daeaa2..51c175f8e6c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts @@ -148,6 +148,18 @@ describe('OTLPMetricExporter - node with proto over http', () => { ); envSource.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT = ''; }); + it('should use override url defined in env with url defined in constructor', () => { + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar/v1/metrics'; + const constructorDefinedEndpoint = 'http://constructor/v1/metrics'; + const collectorExporter = new OTLPMetricExporter({ + url: constructorDefinedEndpoint, + }); + assert.strictEqual( + collectorExporter._otlpExporter.url, + constructorDefinedEndpoint + ); + envSource.OTEL_EXPORTER_OTLP_ENDPOINT = ''; + }); it('should use headers defined via env', () => { envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar'; const collectorExporter = new OTLPMetricExporter(); @@ -163,6 +175,20 @@ describe('OTLPMetricExporter - node with proto over http', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_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 OTLPMetricExporter({ + headers: { + foo: 'constructor', + }, + }); + assert.strictEqual( + collectorExporter._otlpExporter.headers.foo, + 'constructor' + ); + assert.strictEqual(collectorExporter._otlpExporter.headers.bar, 'foo'); + envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; + }); }); describe('export', () => { diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index be3d8c2bbbf..ae94e09dee4 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@opentelemetry/api": "1.7.0", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index dc44135e7a3..b24b1897821 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -54,12 +54,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index c6315944f79..1387d81d550 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -54,12 +54,12 @@ "@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.1", - "@protobuf-ts/runtime": "2.9.1", - "@protobuf-ts/runtime-rpc": "2.9.1", - "@types/mocha": "10.0.4", + "@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.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-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index cfdd22803ba..4bd2cb71b17 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -50,12 +50,12 @@ "@opentelemetry/sdk-metrics": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-node": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", - "@types/superagent": "4.1.21", + "@types/superagent": "4.1.24", "axios": "1.5.1", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index 9422bbc9efd..337d058033d 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -330,6 +330,9 @@ export class HttpInstrumentation extends InstrumentationBase { 'response', (response: http.IncomingMessage & { aborted?: boolean }) => { this._diag.debug('outgoingRequest on response()'); + if (request.listenerCount('response') <= 1) { + response.resume(); + } const responseAttributes = utils.getOutgoingRequestAttributesOnResponse(response); span.setAttributes(responseAttributes); @@ -672,6 +675,10 @@ export class HttpInstrumentation extends InstrumentationBase { if (!optionsParsed.headers) { optionsParsed.headers = {}; + } else { + // Make a copy of the headers object to avoid mutating an object the + // caller might have a reference to. + optionsParsed.headers = Object.assign({}, optionsParsed.headers); } propagation.inject(requestContext, optionsParsed.headers); diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts index 625b8b65499..a04027a2c95 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts @@ -269,6 +269,20 @@ describe('HttpInstrumentation Integration tests', () => { assertSpan(span, SpanKind.CLIENT, validations); }); + it('should not mutate given headers object when adding propagation headers', async () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 0); + + const headers = { 'x-foo': 'foo' }; + const result = await httpRequest.get( + new url.URL(`${protocol}://localhost:${mockServerPort}/?query=test`), + { headers } + ); + assert.deepStrictEqual(headers, { 'x-foo': 'foo' }); + assert.ok(result.reqHeaders[DummyPropagation.TRACE_CONTEXT_KEY]); + assert.ok(result.reqHeaders[DummyPropagation.SPAN_CONTEXT_KEY]); + }); + it('should create a span for GET requests and add propagation headers with Expect headers', async () => { let spans = memoryExporter.getFinishedSpans(); assert.strictEqual(spans.length, 0); diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts index c2fefa284a6..dc00fabfad3 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts @@ -22,7 +22,7 @@ export async function sendRequestTwice( port: number ): Promise { return new Promise((resolve, reject) => { - const request = 'GET /raw HTTP/1.1\n\n'; + const request = `GET /raw HTTP/1.1\r\nHost: ${host}:${port}\r\n\r\n`; const socket = net.createConnection({ host, port }, () => { socket.write(`${request}${request}`, err => { if (err) reject(err); diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 4a95040d79b..85c073e5e46 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -54,12 +54,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 9cdd10d0179..f9c9dafdb58 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.4.2", + "import-in-the-middle": "1.6.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -81,12 +81,12 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 2cc33e2c8ca..1bbca9ddb84 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -65,9 +65,9 @@ "@opentelemetry/api": "1.7.0", "@opentelemetry/context-async-hooks": "1.18.1", "@opentelemetry/exporter-jaeger": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.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/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index f57c6d9a3ae..ebf1d7fab80 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -64,9 +64,9 @@ "@opentelemetry/core": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts index 2c55a7f91ce..8a008dacb91 100644 --- a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts +++ b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts @@ -57,7 +57,7 @@ export abstract class OTLPExporterBase< this._concurrencyLimit = typeof config.concurrencyLimit === 'number' ? config.concurrencyLimit - : Infinity; + : 30; this.timeoutMillis = configureExporterTimeout(config.timeoutMillis); diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 69e641ca85f..ef2180f112c 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -48,12 +48,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 4dc245815b3..e53fd35fe23 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -59,9 +59,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 551b3bf83d6..fc4f2ef03d9 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -59,7 +59,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", diff --git a/experimental/packages/otlp-transformer/src/logs/index.ts b/experimental/packages/otlp-transformer/src/logs/index.ts index 9ca1a40c282..b690484a71c 100644 --- a/experimental/packages/otlp-transformer/src/logs/index.ts +++ b/experimental/packages/otlp-transformer/src/logs/index.ts @@ -101,7 +101,7 @@ function toLogRecord(log: ReadableLogRecord, encoder: Encoder): ILogRecord { severityText: log.severityText, body: toAnyValue(log.body), attributes: toLogAttributes(log.attributes), - droppedAttributesCount: 0, + droppedAttributesCount: log.droppedAttributesCount, flags: log.spanContext?.traceFlags, traceId: encoder.encodeOptionalSpanContext(log.spanContext?.traceId), spanId: encoder.encodeOptionalSpanContext(log.spanContext?.spanId), diff --git a/experimental/packages/otlp-transformer/test/logs.test.ts b/experimental/packages/otlp-transformer/test/logs.test.ts index 85e55e9fd76..18dfbdabe4e 100644 --- a/experimental/packages/otlp-transformer/test/logs.test.ts +++ b/experimental/packages/otlp-transformer/test/logs.test.ts @@ -107,6 +107,7 @@ describe('Logs', () => { attributes: { 'some-attribute': 'some attribute value', }, + droppedAttributesCount: 0, severityNumber: SeverityNumber.ERROR, severityText: 'error', body: 'some_log_body', @@ -122,6 +123,7 @@ describe('Logs', () => { attributes: { 'another-attribute': 'another attribute value', }, + droppedAttributesCount: 0, }; log_1_1_1 = { ...log_fragment_1, diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 369627ed71a..d14138ab4f2 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -72,10 +72,10 @@ "@opentelemetry/api-logs": ">=0.39.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.4.0 <1.8.0", "@opentelemetry/api-logs": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/experimental/packages/sdk-logs/src/LogRecord.ts b/experimental/packages/sdk-logs/src/LogRecord.ts index 8d8fae6168d..d827c7fa1dd 100644 --- a/experimental/packages/sdk-logs/src/LogRecord.ts +++ b/experimental/packages/sdk-logs/src/LogRecord.ts @@ -39,6 +39,7 @@ export class LogRecord implements ReadableLogRecord { private _severityText?: string; private _severityNumber?: logsAPI.SeverityNumber; private _body?: string; + private totalAttributesCount: number = 0; private _isReadonly: boolean = false; private readonly _logRecordLimits: Required; @@ -73,6 +74,10 @@ export class LogRecord implements ReadableLogRecord { return this._body; } + get droppedAttributesCount(): number { + return this.totalAttributesCount - Object.keys(this.attributes).length; + } + constructor( _sharedState: LoggerProviderSharedState, instrumentationScope: InstrumentationScope, @@ -129,6 +134,7 @@ export class LogRecord implements ReadableLogRecord { api.diag.warn(`Invalid attribute value set for key: ${key}`); return this; } + this.totalAttributesCount += 1; if ( Object.keys(this.attributes).length >= this._logRecordLimits.attributeCountLimit && diff --git a/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts b/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts index a7eff21e2dc..2dc3ece8658 100644 --- a/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts +++ b/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts @@ -29,4 +29,5 @@ export interface ReadableLogRecord { readonly resource: IResource; readonly instrumentationScope: InstrumentationScope; readonly attributes: LogAttributes; + readonly droppedAttributesCount: number; } diff --git a/experimental/packages/sdk-logs/test/common/LogRecord.test.ts b/experimental/packages/sdk-logs/test/common/LogRecord.test.ts index 678b4c2e726..5a0acaa6db2 100644 --- a/experimental/packages/sdk-logs/test/common/LogRecord.test.ts +++ b/experimental/packages/sdk-logs/test/common/LogRecord.test.ts @@ -203,13 +203,14 @@ describe('LogRecord', () => { } it('should remove / drop all remaining values after the number of values exceeds this limit', () => { - const { attributes } = logRecord; + const { attributes, droppedAttributesCount } = logRecord; assert.strictEqual(Object.keys(attributes).length, 100); assert.strictEqual(attributes.foo0, 'bar0'); assert.deepStrictEqual(attributes.foo98, { bar: 'bar98' }); assert.strictEqual(attributes.foo147, undefined); assert.strictEqual(attributes.foo148, undefined); assert.strictEqual(attributes.foo149, undefined); + assert.strictEqual(droppedAttributesCount, 50); }); }); diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index d1aa11dbae9..58f1444e651 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -52,7 +52,7 @@ "@opentelemetry/api": "1.7.0", "@opentelemetry/context-async-hooks": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/package-lock.json b/package-lock.json index ae8fdac863a..13764f40177 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "lerna": "6.6.2", - "linkinator": "5.0.2", + "linkinator": "6.0.2", "markdownlint-cli": "0.36.0", "prettier": "3.0.3", "semver": "7.5.4", @@ -56,10 +56,10 @@ "version": "1.7.0", "license": "Apache-2.0", "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.36", + "@types/webpack": "4.41.38", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -725,7 +725,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", @@ -827,7 +827,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", @@ -933,13 +933,13 @@ "@opentelemetry/sdk-logs": "0.45.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -972,10 +972,10 @@ "@opentelemetry/sdk-logs": "0.45.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -1105,9 +1105,9 @@ "@opentelemetry/sdk-trace-base": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -1233,11 +1233,11 @@ "@opentelemetry/sdk-trace-base": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-exporter-base": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -1270,9 +1270,9 @@ "@opentelemetry/sdk-trace-base": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -1400,9 +1400,9 @@ "@opentelemetry/sdk-trace-base": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -1524,9 +1524,9 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -1652,10 +1652,10 @@ "@opentelemetry/sdk-metrics": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -1688,9 +1688,9 @@ "@opentelemetry/sdk-metrics": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -1819,9 +1819,9 @@ "@opentelemetry/sdk-metrics": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -1854,7 +1854,7 @@ "devDependencies": { "@opentelemetry/api": "1.7.0", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -1879,18 +1879,18 @@ "license": "Apache-2.0", "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.4.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.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", @@ -1933,12 +1933,12 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -2069,12 +2069,12 @@ "@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.1", - "@protobuf-ts/runtime": "2.9.1", - "@protobuf-ts/runtime-rpc": "2.9.1", - "@types/mocha": "10.0.4", + "@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.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -2109,12 +2109,12 @@ "@opentelemetry/sdk-metrics": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-node": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", - "@types/superagent": "4.1.21", + "@types/superagent": "4.1.24", "axios": "1.5.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -2157,12 +2157,12 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -2381,9 +2381,9 @@ "@opentelemetry/api": "1.7.0", "@opentelemetry/context-async-hooks": "1.18.1", "@opentelemetry/exporter-jaeger": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -2411,9 +2411,9 @@ "@opentelemetry/core": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -2536,12 +2536,12 @@ "protobufjs": "^7.2.3" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -2573,9 +2573,9 @@ "protobufjs": "^7.2.3" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -2610,7 +2610,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.7.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -2715,10 +2715,10 @@ "@opentelemetry/resources": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.4.0 <1.8.0", "@opentelemetry/api-logs": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -2847,7 +2847,7 @@ "@opentelemetry/api": "1.7.0", "@opentelemetry/context-async-hooks": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -2921,11 +2921,12 @@ "license": "Apache-2.0" }, "node_modules/@babel/code-frame": { - "version": "7.22.13", + "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.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -2997,29 +2998,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.23.2", + "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.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz", - "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz", + "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", - "@babel/helper-compilation-targets": "^7.22.15", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.2", - "@babel/parser": "^7.23.3", + "@babel/helpers": "^7.23.6", + "@babel/parser": "^7.23.6", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.3", - "@babel/types": "^7.23.3", + "@babel/traverse": "^7.23.6", + "@babel/types": "^7.23.6", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -3048,12 +3050,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", - "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "dependencies": { - "@babel/types": "^7.23.3", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -3085,13 +3087,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.15", + "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.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -3333,9 +3336,10 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", + "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" } @@ -3349,9 +3353,10 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.15", + "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" } @@ -3370,22 +3375,24 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.2", + "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.2", - "@babel/types": "^7.23.0" + "@babel/traverse": "^7.23.6", + "@babel/types": "^7.23.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", + "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", @@ -3460,9 +3467,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", + "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -4676,20 +4683,20 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", - "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz", + "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.3", - "@babel/types": "^7.23.3", - "debug": "^4.1.0", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -4697,12 +4704,12 @@ } }, "node_modules/@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -7622,28 +7629,31 @@ } }, "node_modules/@protobuf-ts/grpc-transport": { - "version": "2.9.1", + "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.1", - "@protobuf-ts/runtime-rpc": "^2.9.1" + "@protobuf-ts/runtime": "^2.9.3", + "@protobuf-ts/runtime-rpc": "^2.9.3" }, "peerDependencies": { "@grpc/grpc-js": "^1.6.0" } }, "node_modules/@protobuf-ts/runtime": { - "version": "2.9.1", - "dev": true, - "license": "(Apache-2.0 AND BSD-3-Clause)" + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.3.tgz", + "integrity": "sha512-nivzCpg/qYD0RX2OmHOahJALb8ndjGmUhNBcTJ0BbXoqKwCSM6vYA+vegzS3rhuaPgbyC7Ec8idlnizzUfIRuw==", + "dev": true }, "node_modules/@protobuf-ts/runtime-rpc": { - "version": "2.9.1", + "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.1" + "@protobuf-ts/runtime": "^2.9.3" } }, "node_modules/@protobufjs/aspromise": { @@ -8291,9 +8301,9 @@ } }, "node_modules/@types/jquery": { - "version": "3.5.27", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz", - "integrity": "sha512-TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ==", + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", + "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", "dev": true, "dependencies": { "@types/sizzle": "*" @@ -8367,9 +8377,9 @@ "license": "MIT" }, "node_modules/@types/mocha": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.4.tgz", - "integrity": "sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", + "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, "node_modules/@types/node": { @@ -8459,9 +8469,9 @@ } }, "node_modules/@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "node_modules/@types/send": { @@ -8527,9 +8537,9 @@ "license": "MIT" }, "node_modules/@types/superagent": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.21.tgz", - "integrity": "sha512-yrbAccEEY9+BSa1wji3ry8R3/BdW9kyWnjkRKctrtw5ebn/k2a2CsMeaQ7dD4iLfomgHkomBVIVgOFRMV4XYHA==", + "version": "4.1.24", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.24.tgz", + "integrity": "sha512-mEafCgyKiMFin24SDzWN7yAADt4gt6YawFiNMp0QS5ZPboORfyxFt0s3VzJKhTaKg9py/4FUmrHLTNfJKt9Rbw==", "dev": true, "dependencies": { "@types/cookiejar": "*", @@ -8555,9 +8565,9 @@ } }, "node_modules/@types/webpack": { - "version": "4.41.36", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.36.tgz", - "integrity": "sha512-pF+DVW1pMLmgsPXqJr5QimdxIzOhe8oGKB98gdqAm0egKBy1lOLD5mRxbYboMQRkpYcG7BYcpqYblpKyvE7vhQ==", + "version": "4.41.38", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz", + "integrity": "sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==", "dev": true, "dependencies": { "@types/node": "*", @@ -11487,7 +11497,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.1", + "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": [ { @@ -11503,11 +11515,10 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, "bin": { @@ -11760,7 +11771,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001559", + "version": "1.0.30001570", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", + "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", "dev": true, "funding": [ { @@ -11775,8 +11788,7 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/caseless": { "version": "0.12.0", @@ -13984,9 +13996,10 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.572", - "dev": true, - "license": "ISC" + "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 }, "node_modules/elliptic": { "version": "6.5.4", @@ -15943,46 +15956,50 @@ } }, "node_modules/gaxios": { - "version": "5.1.3", + "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": "^5.0.0", + "https-proxy-agent": "^7.0.1", "is-stream": "^2.0.0", "node-fetch": "^2.6.9" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/gaxios/node_modules/agent-base": { - "version": "6.0.2", + "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" + "debug": "^4.3.4" }, "engines": { - "node": ">= 6.0.0" + "node": ">= 14" } }, "node_modules/gaxios/node_modules/https-proxy-agent": { - "version": "5.0.1", + "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": "6", + "agent-base": "^7.0.2", "debug": "4" }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "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" }, @@ -16000,18 +16017,21 @@ }, "node_modules/gaxios/node_modules/tr46": { "version": "0.0.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true }, "node_modules/gaxios/node_modules/webidl-conversions": { "version": "3.0.1", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true }, "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" @@ -17250,8 +17270,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.4.2", - "license": "Apache-2.0", + "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", @@ -19305,16 +19326,17 @@ } }, "node_modules/linkinator": { - "version": "5.0.2", + "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", - "gaxios": "^5.0.0", - "glob": "^9.3.2", + "gaxios": "^6.0.0", + "glob": "^10.3.10", "htmlparser2": "^9.0.0", - "marked": "^7.0.4", + "marked": "^10.0.0", "meow": "^12.0.1", "mime": "^3.0.0", "server-destroy": "^1.0.1", @@ -19324,13 +19346,14 @@ "linkinator": "build/src/cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "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" } @@ -19346,15 +19369,50 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "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, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 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, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/linkinator/node_modules/glob": { - "version": "9.3.5", + "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": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -19386,9 +19444,10 @@ } }, "node_modules/linkinator/node_modules/minimatch": { - "version": "8.0.4", + "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" }, @@ -19400,13 +19459,62 @@ } }, "node_modules/linkinator/node_modules/minipass": { - "version": "4.2.8", + "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, + "dependencies": { + "shebang-regex": "^3.0.0" + }, "engines": { "node": ">=8" } }, + "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, + "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, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "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, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/load-json-file": { "version": "6.2.0", "dev": true, @@ -20258,14 +20366,15 @@ } }, "node_modules/marked": { - "version": "7.0.5", + "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" }, "engines": { - "node": ">= 16" + "node": ">= 18" } }, "node_modules/math-random": { @@ -22059,9 +22168,10 @@ } }, "node_modules/node-releases": { - "version": "2.0.13", - "dev": true, - "license": "MIT" + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true }, "node_modules/nopt": { "version": "7.2.0", @@ -30536,7 +30646,7 @@ "license": "Apache-2.0", "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -30562,8 +30672,8 @@ "zone.js": "^0.11.0" }, "devDependencies": { - "@babel/core": "7.23.3", - "@types/mocha": "10.0.4", + "@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", @@ -30595,9 +30705,9 @@ "version": "1.18.1", "license": "Apache-2.0", "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -30800,7 +30910,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -30912,7 +31022,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/resources": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -30943,9 +31053,9 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -31069,7 +31179,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -31096,7 +31206,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -31206,7 +31316,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -31368,7 +31478,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -31484,9 +31594,9 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/resources": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -31514,13 +31624,13 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/jquery": "3.5.27", - "@types/mocha": "10.0.4", + "@types/jquery": "3.5.29", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -31641,7 +31751,7 @@ "version": "1.18.1", "license": "Apache-2.0", "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -31672,7 +31782,7 @@ "@opentelemetry/propagator-b3": "1.18.1", "@opentelemetry/propagator-jaeger": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -31699,10 +31809,10 @@ "lodash.merge": "^4.6.2" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@types/lodash.merge": "4.6.9", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -31846,7 +31956,7 @@ "zone.js": "0.11.4" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.15", "@babel/plugin-transform-runtime": "7.22.15", @@ -32252,10 +32362,12 @@ "dev": true }, "@babel/code-frame": { - "version": "7.22.13", + "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.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "dependencies": { @@ -32304,25 +32416,27 @@ } }, "@babel/compat-data": { - "version": "7.23.2", + "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.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz", - "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==", + "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", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", - "@babel/helper-compilation-targets": "^7.22.15", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.2", - "@babel/parser": "^7.23.3", + "@babel/helpers": "^7.23.6", + "@babel/parser": "^7.23.6", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.3", - "@babel/types": "^7.23.3", + "@babel/traverse": "^7.23.6", + "@babel/types": "^7.23.6", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -32341,12 +32455,12 @@ } }, "@babel/generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", - "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", + "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.3", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -32367,12 +32481,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.22.15", + "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.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -32527,7 +32643,9 @@ } }, "@babel/helper-string-parser": { - "version": "7.22.5", + "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": { @@ -32535,7 +32653,9 @@ "dev": true }, "@babel/helper-validator-option": { - "version": "7.22.15", + "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": { @@ -32548,16 +32668,20 @@ } }, "@babel/helpers": { - "version": "7.23.2", + "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", - "@babel/traverse": "^7.23.2", - "@babel/types": "^7.23.0" + "@babel/traverse": "^7.23.6", + "@babel/types": "^7.23.6" } }, "@babel/highlight": { - "version": "7.22.20", + "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", @@ -32610,9 +32734,9 @@ } }, "@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", + "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": { @@ -33323,30 +33447,30 @@ } }, "@babel/traverse": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", - "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", + "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.22.13", - "@babel/generator": "^7.23.3", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.3", - "@babel/types": "^7.23.3", - "debug": "^4.1.0", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", + "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.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } @@ -35046,10 +35170,10 @@ "@opentelemetry/api": { "version": "file:api", "requires": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", - "@types/webpack": "4.41.36", + "@types/webpack": "4.41.38", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -35124,7 +35248,7 @@ "version": "file:experimental/packages/api-events", "requires": { "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", @@ -35195,7 +35319,7 @@ "version": "file:experimental/packages/api-logs", "requires": { "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", @@ -35266,7 +35390,7 @@ "version": "file:packages/opentelemetry-context-async-hooks", "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -35280,9 +35404,9 @@ "@opentelemetry/context-zone": { "version": "file:packages/opentelemetry-context-zone", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/context-zone-peer-dep": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -35364,9 +35488,9 @@ "@opentelemetry/context-zone-peer-dep": { "version": "file:packages/opentelemetry-context-zone-peer-dep", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -35451,7 +35575,7 @@ "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -35528,7 +35652,7 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35546,7 +35670,7 @@ "@opentelemetry/exporter-logs-otlp-grpc": { "version": "file:experimental/packages/exporter-logs-otlp-grpc", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -35557,7 +35681,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-logs": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35575,7 +35699,7 @@ "@opentelemetry/exporter-logs-otlp-http": { "version": "file:experimental/packages/exporter-logs-otlp-http", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.45.1", "@opentelemetry/core": "1.18.1", @@ -35583,7 +35707,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-logs": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -35667,7 +35791,7 @@ "@opentelemetry/exporter-logs-otlp-proto": { "version": "file:experimental/packages/exporter-logs-otlp-proto", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.45.1", "@opentelemetry/core": "1.18.1", @@ -35677,7 +35801,7 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-logs": "0.45.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -35759,7 +35883,7 @@ "@opentelemetry/exporter-metrics-otlp-grpc": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -35769,7 +35893,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35787,14 +35911,14 @@ "@opentelemetry/exporter-metrics-otlp-http": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-http", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -35878,7 +36002,7 @@ "@opentelemetry/exporter-metrics-otlp-proto": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.18.1", "@opentelemetry/exporter-metrics-otlp-http": "0.45.1", @@ -35887,7 +36011,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35910,7 +36034,7 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-metrics": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35926,7 +36050,7 @@ "@opentelemetry/exporter-trace-otlp-grpc": { "version": "file:experimental/packages/exporter-trace-otlp-grpc", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -35936,7 +36060,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -35954,14 +36078,14 @@ "@opentelemetry/exporter-trace-otlp-http": { "version": "file:experimental/packages/exporter-trace-otlp-http", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36045,7 +36169,7 @@ "@opentelemetry/exporter-trace-otlp-proto": { "version": "file:experimental/packages/exporter-trace-otlp-proto", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.18.1", "@opentelemetry/otlp-exporter-base": "0.45.1", @@ -36053,7 +36177,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -36135,13 +36259,13 @@ "@opentelemetry/exporter-zipkin": { "version": "file:packages/opentelemetry-exporter-zipkin", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@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", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36225,12 +36349,12 @@ "@opentelemetry/instrumentation": { "version": "file:experimental/packages/opentelemetry-instrumentation", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/shimmer": "^1.0.2", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36239,7 +36363,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "import-in-the-middle": "1.4.2", + "import-in-the-middle": "1.6.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -36318,7 +36442,7 @@ "@opentelemetry/instrumentation-fetch": { "version": "file:experimental/packages/opentelemetry-instrumentation-fetch", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.18.1", "@opentelemetry/core": "1.18.1", @@ -36327,7 +36451,7 @@ "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-web": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36420,12 +36544,12 @@ "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-node": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@protobuf-ts/grpc-transport": "2.9.1", - "@protobuf-ts/runtime": "2.9.1", - "@protobuf-ts/runtime-rpc": "2.9.1", - "@types/mocha": "10.0.4", + "@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.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -36449,12 +36573,12 @@ "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-node": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", - "@types/superagent": "4.1.21", + "@types/superagent": "4.1.24", "axios": "1.5.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -36485,7 +36609,7 @@ "@opentelemetry/instrumentation-xml-http-request": { "version": "file:experimental/packages/opentelemetry-instrumentation-xml-http-request", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.18.1", "@opentelemetry/core": "1.18.1", @@ -36494,7 +36618,7 @@ "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-web": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36577,11 +36701,11 @@ "@opentelemetry/opentelemetry-browser-detector": { "version": "file:experimental/packages/opentelemetry-browser-detector", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -36662,10 +36786,10 @@ "@opentelemetry/otlp-exporter-base": { "version": "file:experimental/packages/otlp-exporter-base", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -36746,7 +36870,7 @@ "@opentelemetry/otlp-grpc-exporter-base": { "version": "file:experimental/packages/otlp-grpc-exporter-base", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@grpc/grpc-js": "^1.7.1", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.18.1", @@ -36754,7 +36878,7 @@ "@opentelemetry/otlp-transformer": "0.45.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -36774,11 +36898,11 @@ "@opentelemetry/otlp-proto-exporter-base": { "version": "file:experimental/packages/otlp-proto-exporter-base", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.18.1", "@opentelemetry/otlp-exporter-base": "0.45.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -36804,7 +36928,7 @@ "@opentelemetry/sdk-logs": "0.45.1", "@opentelemetry/sdk-metrics": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -36875,7 +36999,7 @@ "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/core": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -36892,7 +37016,7 @@ "requires": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/core": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -36968,7 +37092,7 @@ "@opentelemetry/core": "1.18.1", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -37071,12 +37195,12 @@ "@opentelemetry/sdk-logs": { "version": "file:experimental/packages/sdk-logs", "requires": { - "@babel/core": "7.23.3", + "@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.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -37157,12 +37281,12 @@ "@opentelemetry/sdk-metrics": { "version": "file:packages/sdk-metrics", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@opentelemetry/core": "1.18.1", "@opentelemetry/resources": "1.18.1", "@types/lodash.merge": "4.6.9", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", @@ -37260,9 +37384,9 @@ "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/sdk-trace-node": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -37283,7 +37407,7 @@ "@opentelemetry/core": "1.18.1", "@opentelemetry/resources": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -37364,9 +37488,9 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -37382,7 +37506,7 @@ "@opentelemetry/sdk-trace-web": { "version": "file:packages/opentelemetry-sdk-trace-web", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/context-zone": "1.18.1", "@opentelemetry/core": "1.18.1", @@ -37390,8 +37514,8 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/jquery": "3.5.27", - "@types/mocha": "10.0.4", + "@types/jquery": "3.5.29", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -37476,7 +37600,7 @@ "@opentelemetry/selenium-tests": { "version": "file:selenium-tests", "requires": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.15", "@babel/plugin-transform-runtime": "7.22.15", @@ -37734,7 +37858,7 @@ "@opentelemetry/semantic-conventions": { "version": "file:packages/opentelemetry-semantic-conventions", "requires": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -37758,7 +37882,7 @@ "@opentelemetry/resources": "1.18.1", "@opentelemetry/sdk-metrics": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", @@ -37782,7 +37906,7 @@ "@opentelemetry/propagator-jaeger": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -37879,22 +38003,28 @@ } }, "@protobuf-ts/grpc-transport": { - "version": "2.9.1", + "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.1", - "@protobuf-ts/runtime-rpc": "^2.9.1" + "@protobuf-ts/runtime": "^2.9.3", + "@protobuf-ts/runtime-rpc": "^2.9.3" } }, "@protobuf-ts/runtime": { - "version": "2.9.1", + "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.1", + "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.1" + "@protobuf-ts/runtime": "^2.9.3" } }, "@protobufjs/aspromise": { @@ -38362,9 +38492,9 @@ } }, "@types/jquery": { - "version": "3.5.27", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz", - "integrity": "sha512-TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ==", + "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": "*" @@ -38428,9 +38558,9 @@ "dev": true }, "@types/mocha": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.4.tgz", - "integrity": "sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==", + "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": { @@ -38508,9 +38638,9 @@ } }, "@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "@types/send": { @@ -38567,9 +38697,9 @@ "dev": true }, "@types/superagent": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.21.tgz", - "integrity": "sha512-yrbAccEEY9+BSa1wji3ry8R3/BdW9kyWnjkRKctrtw5ebn/k2a2CsMeaQ7dD4iLfomgHkomBVIVgOFRMV4XYHA==", + "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": "*", @@ -38592,9 +38722,9 @@ } }, "@types/webpack": { - "version": "4.41.36", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.36.tgz", - "integrity": "sha512-pF+DVW1pMLmgsPXqJr5QimdxIzOhe8oGKB98gdqAm0egKBy1lOLD5mRxbYboMQRkpYcG7BYcpqYblpKyvE7vhQ==", + "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": "*", @@ -40839,12 +40969,14 @@ } }, "browserslist": { - "version": "4.22.1", + "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.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" } }, @@ -41025,7 +41157,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001559", + "version": "1.0.30001570", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", + "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", "dev": true }, "caseless": { @@ -42506,7 +42640,9 @@ } }, "electron-to-chromium": { - "version": "1.4.572", + "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": { @@ -43803,32 +43939,40 @@ } }, "gaxios": { - "version": "5.1.3", + "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", - "https-proxy-agent": "^5.0.0", + "https-proxy-agent": "^7.0.1", "is-stream": "^2.0.0", "node-fetch": "^2.6.9" }, "dependencies": { "agent-base": { - "version": "6.0.2", + "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" + "debug": "^4.3.4" } }, "https-proxy-agent": { - "version": "5.0.1", + "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": "6", + "agent-base": "^7.0.2", "debug": "4" } }, "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" @@ -43836,14 +43980,20 @@ }, "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", @@ -44674,7 +44824,9 @@ } }, "import-in-the-middle": { - "version": "1.4.2", + "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", @@ -46020,15 +46172,17 @@ } }, "linkinator": { - "version": "5.0.2", + "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", "escape-html": "^1.0.3", - "gaxios": "^5.0.0", - "glob": "^9.3.2", + "gaxios": "^6.0.0", + "glob": "^10.3.10", "htmlparser2": "^9.0.0", - "marked": "^7.0.4", + "marked": "^10.0.0", "meow": "^12.0.1", "mime": "^3.0.0", "server-destroy": "^1.0.1", @@ -46037,6 +46191,8 @@ "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" @@ -46046,14 +46202,38 @@ "version": "5.3.0", "dev": true }, + "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", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "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", + "signal-exit": "^4.0.1" + } + }, "glob": { - "version": "9.3.5", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "meow": { @@ -46065,15 +46245,49 @@ "dev": true }, "minimatch": { - "version": "8.0.4", + "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" } }, "minipass": { - "version": "4.2.8", + "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" + } + }, + "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" + } } } }, @@ -46698,7 +46912,9 @@ "dev": true }, "marked": { - "version": "7.0.5", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-10.0.0.tgz", + "integrity": "sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==", "dev": true }, "math-random": { @@ -47898,7 +48114,9 @@ } }, "node-releases": { - "version": "2.0.13", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "nopt": { diff --git a/package.json b/package.json index 4ea5fa489aa..f1db653d122 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ "comment_prepare_1": "echo scripts in this section automatically prepare releases. Intended for use by maintainers only.", "comment_prepare_2": "echo experimental preparation scripts only prepare experimental packages", - "prepare_release:experimental:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_patch && npm run _restore:package-json", - "prepare_release:experimental:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_minor && npm run _restore:package-json", + "prepare_release:experimental:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_experimental", + "prepare_release:experimental:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental", "comment_prepare_3": "echo sdk preparation scripts prepare all stable and experimental packages", - "prepare_release:sdk:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:version_patch && npm run _restore:package-json", - "prepare_release:sdk:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:version_minor && npm run _restore:package-json", + "prepare_release:sdk:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", + "prepare_release:sdk:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", "release:publish": "lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access", "comment_internal": "echo scripts below this line are for internal use", @@ -51,7 +51,9 @@ "_lerna:remove_api": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p!==\"api\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", "_lerna:remove_stable": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p!==\"packages/*\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", "_lerna:version_patch": "npx lerna version patch --exact --no-git-tag-version --no-push --yes", - "_lerna:version_minor": "npx lerna version minor --exact --no-git-tag-version --no-push --yes" + "_lerna:version_minor": "npx lerna version minor --exact --no-git-tag-version --no-push --yes", + "_changelog:prepare_experimental": "node scripts/update-changelog.js ./experimental/CHANGELOG.md ./experimental/packages/", + "_changelog:prepare_stable": "node scripts/update-changelog.js ./CHANGELOG.md ./packages/" }, "repository": "open-telemetry/opentelemetry-js", "keywords": [ @@ -81,7 +83,7 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "lerna": "6.6.2", - "linkinator": "5.0.2", + "linkinator": "6.0.2", "markdownlint-cli": "0.36.0", "prettier": "3.0.3", "semver": "7.5.4", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 7285c00d33a..5dc56da0bfa 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index b4289dea40c..8e7fbaa8cb4 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -53,9 +53,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 5e9a477e36e..b83a17bca30 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -50,8 +50,8 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", - "@types/mocha": "10.0.4", + "@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", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 30ff22af16c..ac390d84e99 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -65,7 +65,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 9af1a8e519c..decfcffaf8f 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/resources": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 13624898b80..b5ac9e68f23 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -60,9 +60,9 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 8addf077d1c..01e7ae5b6e5 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -58,7 +58,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index f11eb4b0843..0f41ab8b541 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -55,7 +55,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index d6799b594a7..3c78e12eeb7 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -63,7 +63,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 87787d08076..0c2e954e64a 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -66,7 +66,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 7a94b193fec..1a2791bf002 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -48,9 +48,9 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/resources": "1.18.1", "@opentelemetry/semantic-conventions": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", - "@types/semver": "7.5.5", + "@types/semver": "7.5.6", "@types/sinon": "10.0.20", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index ba9d648fc72..f433587b3c5 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -55,13 +55,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@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", - "@types/jquery": "3.5.27", - "@types/mocha": "10.0.4", + "@types/jquery": "3.5.29", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 343b37de518..536103f0a29 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -49,7 +49,7 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "codecov": "3.8.3", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 8ef699dfb05..073ed472e7a 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -46,7 +46,7 @@ "@opentelemetry/propagator-b3": "1.18.1", "@opentelemetry/propagator-jaeger": "1.18.1", "@opentelemetry/sdk-trace-base": "1.18.1", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 914abab5cea..988fc4409ab 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -54,10 +54,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@types/lodash.merge": "4.6.9", - "@types/mocha": "10.0.4", + "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "babel-plugin-istanbul": "6.1.1", diff --git a/renovate.json b/renovate.json index c7d143d7977..bc0f6854c4e 100644 --- a/renovate.json +++ b/renovate.json @@ -17,7 +17,7 @@ "schedule": ["before 3am on Monday"] }, { - "matchPackageNames": ["typescript", "webpack", "webpack-cli"], + "matchPackageNames": ["typescript", "webpack", "webpack-cli", "lerna"], "dependencyDashboardApproval": true } ], diff --git a/scripts/update-changelog.js b/scripts/update-changelog.js new file mode 100644 index 00000000000..f131afc0ceb --- /dev/null +++ b/scripts/update-changelog.js @@ -0,0 +1,65 @@ +/** + * This script updates changelogs after lerna has updated versions in the respective areas (packages/*, experimental/packages/*) + * - removes all empty subsections (bugs, enhancements, etc.) in the changelog. + * - replaces the "Unreleased"-header with the version from the first non-private package in the directory (versions are expected to be uniform across a changelog) + * - adds a new "Unreleased"-header with empty subsections at the top + * + * Usage (from project root): + * - node scripts/update-changelog.js [PATH TO CHANGELOG] [DIRECTORY CONTAINING ASSOCIATED PACKAGES] + * Examples: + * - node scripts/update-changelog.js ./CHANGELOG.md ./packages + * - node scripts/update-changelog.js ./experimental/CHANGELOG.md ./experimental/packages + */ + +const fs = require('fs'); +const path = require("path"); + +const EMPTY_UNRELEASED_SECTION = `## Unreleased + +### :boom: Breaking Change + +### :rocket: (Enhancement) + +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) + +` + +function findFirstPackageVersion(basePath){ + const packageDirs = fs.readdirSync(basePath); + for(const packageDir of packageDirs){ + const packageJsonPath = path.join(basePath, packageDir, 'package.json'); + try { + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8')); + + if(packageJson.private === true || packageJson.private === 'true'){ + console.log('Skipping version from private package at', packageJsonPath); + continue; + } + + if(packageJson.version != null){ + return packageJson.version; + } + + console.log('Version in', packageJsonPath, 'was null or undefined, skipping'); + } catch (err) { + console.log('Could not get package JSON', packageJsonPath, err); + } + } + throw new Error('Unable to extract version from packages in ' + basePath); +} + +// no special handling for bad args as this is only intended for use via predefined npm scripts. +const changelogPath = path.resolve(process.argv[2]); +const version = findFirstPackageVersion(path.resolve(process.argv[3])); + +const changelog = fs.readFileSync(changelogPath, 'utf8').toString() + // replace all empty sections + .replace(new RegExp('^###.*\n*(?=^##)', 'gm'), '') + // replace unreleased header with new unreleased section and a version header for the former unreleased section + .replace(RegExp('## Unreleased'), EMPTY_UNRELEASED_SECTION + '## ' + version); + +fs.writeFileSync(changelogPath, changelog); diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 60b78cb133d..d3e7c7e5840 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,7 +31,7 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.23.3", + "@babel/core": "7.23.6", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.15", "@babel/plugin-transform-runtime": "7.22.15",