diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 5e195159de6..f657727b303 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -5,38 +5,61 @@ body: - type: markdown attributes: value: | - Thanks for taking the time to fill out this bug report! - Please make sure to fill out the entire form below, - providing as much context as you can in order to help us - triage and track down your bug as quickly as possible. + > [!IMPORTANT] + > **Please read all parts of this form carefully.** By following the instructions carefully, you ensure that we + > can get started fixing your bug, instead of being stuck at trying to reproduce your issue. Please provide + > all requested information, even if you think it does not apply to your problem. + > + > **If you use a third-party package that re-distributes OpenTelemetry, open the bug ticket with that third party unless you can provide steps to reproduce this with pure OpenTelemetry.** + > Digging into third-party distributions of OpenTelemetry is not in scope for this project. - Before filing a bug, please be sure you have searched through - [existing bugs](https://github.com/open-telemetry/opentelemetry-js/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug) - to see if your bug is already addressed. - - If your bug is related to an instrumentation or plugin in [opentelemetry-js-contrib](https://github.com/open-telemetry/opentelemetry-js-contrib) - please be sure to file it there. + Before filing a bug, please be sure you have searched through [existing open bugs](https://github.com/open-telemetry/opentelemetry-js/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug) + to see if this bug has already been filed. + - type: markdown + attributes: + value: | + ## Bug Reproduction - type: textarea attributes: label: What happened? - description: Please provide as much detail as you reasonably can. + description: | + > [!IMPORTANT] + > **Please provide as much detail as you reasonably can.** + > We all know the complexities of developing with JavaScript/TypeScript. **Be specific** about your setup and **DO NOT** assume that the person handling your bug report knows how to use your specific combination of tooling. Always provide build instructions and config files. value: | ## Steps to Reproduce - + ## Expected Result ## Actual Result ## Additional Details + + validations: required: true - type: textarea attributes: label: OpenTelemetry Setup Code - description: Please provide the code you use to set up OpenTelemetry + description: | + Please provide the code you use to set up OpenTelemetry. + If you use `@opentelemetry/auto-instrumentations-node/register`, please state so here. + You may omit this step if you have provided a reproducer repository. placeholder: | # This comes from our README.md - // tracing.js + // otel.js 'use strict' @@ -75,13 +98,15 @@ body: - type: textarea attributes: label: package.json - description: If possible, please provide your full package.json. If not, please provide at least your list of dependencies and their versions, especially OpenTelemetry versions. + description: | + Please provide your the full package.json needed to reproduce the issue. + You may omit this step if you provided a reproducer repository. render: "JSON" placeholder: | { "name": "my-app", "scripts": { - "start": "node -r tracing.js app.js" + "start": "node -r otel.js app.js" }, "dependencies": { "@opentelemetry/api": "^1.3.0", @@ -95,3 +120,20 @@ body: description: | Please copy and paste any relevant log output. render: shell + - type: markdown + attributes: + value: | + ## System Details + System Details help us when we cannot reproduce your problem with the information provided above. Sometimes bugs only surface on specific platforms and runtime versions. + - type: textarea + attributes: + label: Operating System and Version + placeholder: Ubuntu 24.04, Windows 11 Build 26100.2033, macOS 15.0.1 + validations: + required: false + - type: textarea + attributes: + label: Runtime and Version + placeholder: Node.js v20.12.1, Node.js v18.18.2, Firefox 130, Chrome 132, ... + validations: + required: false diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 554b4ebfee5..485c1a48aa6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,7 +7,7 @@ Before creating a pull request, please make sure: - You have read the guide for contributing - See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md - You signed all your commits (otherwise we won't be able to merge the PR) - - See https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#sign-the-cla + - See https://github.com/open-telemetry/community/blob/main/guides/contributor#sign-the-cla - You added unit tests for the new functionality - You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close the issue that your PR fixes (if such) diff --git a/.github/workflows/peer-api.yml b/.github/workflows/peer-api.yml index f7b84a8bf00..332395ed7f4 100644 --- a/.github/workflows/peer-api.yml +++ b/.github/workflows/peer-api.yml @@ -11,7 +11,7 @@ jobs: peer-api-check: runs-on: ubuntu-latest container: - image: node:20 + image: node:22 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/publish-to-npm.yml b/.github/workflows/publish-to-npm.yml index b51678268ab..e45e3d99a88 100644 --- a/.github/workflows/publish-to-npm.yml +++ b/.github/workflows/publish-to-npm.yml @@ -7,6 +7,7 @@ jobs: release-to-npm: runs-on: ubuntu-latest permissions: + # needed for NPM provenance id-token: write steps: - name: Checkout Repository @@ -22,10 +23,19 @@ jobs: - run: npm ci + # NOTE: in the past, we've had situations where the compiled files were missing as the `prepublishOnly` script was + # missing in some packages. `npx lerna publish` *should* also run compile, but this is intended as a safeguard + # when that does not happen for whatever reason. - run: npm run compile - name: Publish to npm env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} NPM_CONFIG_PROVENANCE: true + # NOTE: using --concurrency 1 to reduce the likelihood of a race when publishing, + # which happens when the npm registry is not fully consistent yet. This can cause the publishing of a package to be + # rejected because dependencies are not available yet. `lerna` does ensure that this is not the case locally + # (packages are in-fact published in the correct order), but the race on the registry still applies. + # If this happens, run the workflow again - there should be enough time for everything to settle until this workflow + # attempts to publish again. run: npx lerna publish --concurrency 1 from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 55db4052849..7fd2c691f50 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -47,7 +47,7 @@ jobs: - name: Unit tests run: npm run test - name: Report Coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: @@ -103,7 +103,7 @@ jobs: - name: Unit tests run: npm run test:browser - name: Report Coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: @@ -131,7 +131,7 @@ jobs: - name: Unit tests run: npm run test:webworker - name: Report Coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7194d8ba174..adbcd497163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,35 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se ### :boom: Breaking Change +* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5182](https://github.com/open-telemetry/opentelemetry-js/pull/5128) + +### :rocket: (Enhancement) + +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) + +## 1.28.0 + +### :rocket: (Enhancement) + +* feat(sdk-metrics, sdk-trace): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](https://github.com/open-telemetry/opentelemetry-js/pull/4617) + * default: `true` (no change in behavior) + * note: `false` will become the default behavior in the next major version in order to comply with [specification requirements](https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36) + +* feat(sdk-trace-base): add `spanProcessors` property in `TracerConfig` interface. [#5138](https://github.com/open-telemetry/opentelemetry-js/pull/5138) @david-luna + +### :bug: (Bug Fix) + +* fix(sdk-metrics): await exports in `PeriodicExportingMetricReader` when async resource attributes have not yet settled [#5119](https://github.com/open-telemetry/opentelemetry-js/pull/5119/) @pichlermarc +* fix(sdk-trace): performance.now() may return the same value for consecutive calls [#5150](https://github.com/open-telemetry/opentelemetry-js/pull/5150) @dyladan +* fix(sdk-trace-base): pass BatchSpanProcessor#forceFlush() errors on visibilitychange/pagehide to globalErrorHandler [#5143](https://github.com/open-telemetry/opentelemetry-js/pull/5143) @pichlermarc + * fixes a bug where switching browser tabs with a failing exporter would cause an unhandled error + +## 1.27.0 + ### :rocket: (Enhancement) * feat: add processors for adding session.id attribute to spans and logs [#4972](https://github.com/open-telemetry/opentelemetry-js/pull/4972) @@ -20,8 +49,10 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se * fix(sdk-trace-base): avoid keeping non-string `status.message` on `Span#setStatus()` [#4999](https://github.com/open-telemetry/opentelemetry-js/pull/4999) @pichlermarc * fix(sdk-metrics): Add missing catch and handle error in promise of `PeriodicExportingMetricReader` [#5006](https://github.com/open-telemetry/opentelemetry-js/pull/5006) @jj22ee * fix(opentelemetry-core): confusing log extract of composite propagator [#5017](https://github.com/open-telemetry/opentelemetry-js/pull/5017) @rv2673 - -### :books: (Refine Doc) +* fix(propagator-aws-xray-*): move propagators back to contrib repository [#4966](https://github.com/open-telemetry/opentelemetry-js/pull/4966) @pichlermarc + * The [specification](https://github.com/open-telemetry/opentelemetry-specification/blob/6672dbc97ddeb34f36c020a0f0a30323c8bc4d95/specification/context/api-propagators.md?plain=1#L354-L356) prohibits hosting these packages in the core repository + * `@opentelemetry/propagator-aws-xray` is now located in [open-telemetry/opentelemetry-js-contrib](https://github.com/open-telemetry/opentelemetry-js-contrib) + * `@opentelemetry/propagator-aws-xray-lambda` is now located in [open-telemetry/opentelemetry-js-contrib](https://github.com/open-telemetry/opentelemetry-js-contrib) ### :house: (Internal) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c4c6fc0e47..a0b040337de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,7 +79,7 @@ Reporting bugs is an important contribution. Please make sure to include: ### Before you start Please read project contribution -[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md) +[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor) for general practices for OpenTelemetry project. #### Conventional commit @@ -145,7 +145,7 @@ git merge upstream/main Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main. -Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) section of general project contributing guide. +Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow) section of general project contributing guide. ## Development diff --git a/README.md b/README.md index 1d9138c1671..18741193da1 100644 --- a/README.md +++ b/README.md @@ -227,12 +227,13 @@ 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 +- [Marylia Gutierrez](https://github.com/maryliag), Grafana Labs *Find more about the approver role in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).* #### Triager ([@open-telemetry/javascript-triagers](https://github.com/orgs/open-telemetry/teams/javascript-triagers)) -- [Marylia Gutierrez](https://github.com/maryliag), Grafana Labs +- N/A *Find more about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triager).* diff --git a/api/README.md b/api/README.md index 59d4cd7a08d..40015dbf051 100644 --- a/api/README.md +++ b/api/README.md @@ -45,8 +45,9 @@ const { trace } = require("@opentelemetry/api"); const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require("@opentelemetry/sdk-trace-base"); // Create and register an SDK -const provider = new BasicTracerProvider(); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const provider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); trace.setGlobalTracerProvider(provider); // Acquire a tracer from the global tracer provider which will be used to trace the application diff --git a/api/package.json b/api/package.json index 78f9f03b798..9d22be74c72 100644 --- a/api/package.json +++ b/api/package.json @@ -77,7 +77,7 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack": "5.28.5", @@ -94,13 +94,13 @@ "karma-webpack": "5.0.1", "lerna": "6.6.2", "memfs": "3.5.3", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", "unionfs": "4.5.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api", "sideEffects": false diff --git a/api/src/platform/browser/globalThis.ts b/api/src/platform/browser/globalThis.ts index f09378a95ea..8371a5b1a33 100644 --- a/api/src/platform/browser/globalThis.ts +++ b/api/src/platform/browser/globalThis.ts @@ -30,9 +30,9 @@ export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : typeof self === 'object' - ? self - : typeof window === 'object' - ? window - : typeof global === 'object' - ? global - : ({} as typeof globalThis); + ? self + : typeof window === 'object' + ? window + : typeof global === 'object' + ? global + : ({} as typeof globalThis); diff --git a/doc/contributing/releasing.md b/doc/contributing/releasing.md index 4a48995431c..18246c3cf88 100644 --- a/doc/contributing/releasing.md +++ b/doc/contributing/releasing.md @@ -3,9 +3,9 @@ This document is aimed at Maintainers and describes how to release a new version of the packages contained in this repository. We aim to eventually automate this process as much as possible. -## Create a release PR +## 1. Create a release PR -1. Go to the [Release PR Workflow](https://github.com/open-telemetry/opentelemetry-js/actions/workflows/create-or-update-release.yml) +1. Go to the [Release PR Workflow](https://github.com/open-telemetry/opentelemetry-js/actions/workflows/create-or-update-release-pr.yml) 2. Click "Run workflow" 3. For `Release Type`, select if you want to create a release PR for a new `minor` or `patch` version. 4. For `Release Scope`, select if you want to release @@ -18,37 +18,23 @@ We aim to eventually automate this process as much as possible. > If there was a commit to `main`, after PR creation simply run the workflow again before merging it. > Re-running it will update the PR with the contents from `main` and will update the PR body too. -## Review and merge the release PR +## 2. Review and merge the release PR 1. Review the PR generated via the workflow (it will be titled `chore: prepare next release` and opened by the @opentelemetrybot user) 2. Once approved, merge the PR -## Publish to NPM - -### Prerequisites - -1. Ensure you have access to the [`opentelemetry` npm organization](https://www.npmjs.com/org/opentelemetry) -2. Go to your npm user's `Access Tokens` page -3. Click `Generate New Token` -> `Granular Access Token` (2FA prompt will pop up) -4. Input all required fields - - recommended: set the expiry date on the token to 1 day - - recommended: set a CIDR range to only allow your IP -5. Under `Packages and Scopes` - - set `Permissions` to `Read and Write` - - Select `Only Select packages and scopes`, choose `@opentelemetry` - -### Publishing - -1. Check out the commit created by merging the release PR -2. run `git clean -fdx --exclude ` -3. run `npm ci` -4. run `npm run compile` -5. run `NODE_AUTH_TOKEN= npm run release:publish` +## 3. Publish to NPM > [!IMPORTANT] -> Delete the token once you're done publishing +> This step will publish anything that's on `main` IF AND ONLY IF the version has been bumped. If the version for a package +> has not been bumped, it will not publish a new version of the package. + +1. Go to the [NPM publish workflow](https://github.com/open-telemetry/opentelemetry-js/actions/workflows/publish-to-npm.yml) +2. Click "Run workflow" (from main) + 1. In rare cases not all packages are published due to a race when publishing, if you suspect this to + be the case, re-run the workflow: there should be enough time from 1. -## Create GitHub Releases +## 4. Create GitHub Releases 1. Check out the commit created by merging the release PR 2. Run diff --git a/examples/basic-tracer-node/index.js b/examples/basic-tracer-node/index.js index 889d4ba31e4..ff50b8e8b72 100644 --- a/examples/basic-tracer-node/index.js +++ b/examples/basic-tracer-node/index.js @@ -6,19 +6,20 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); const { JaegerExporter } = require('@opentelemetry/exporter-jaeger'); +// Configure span processor to send spans to the exporter +const exporter = new JaegerExporter({ + endpoint: 'http://localhost:14268/api/traces', +}); const provider = new BasicTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'basic-service', }), + spanProcessors: [ + new SimpleSpanProcessor(exporter), + new SimpleSpanProcessor(new ConsoleSpanExporter()), + ] }); -// Configure span processor to send spans to the exporter -const exporter = new JaegerExporter({ - endpoint: 'http://localhost:14268/api/traces', -}); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); - /** * Initialize the OpenTelemetry APIs to use the BasicTracerProvider bindings. * diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index 3596387e35d..47722a5460f 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -32,12 +32,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" } } diff --git a/examples/grpc-js/tracer.js b/examples/grpc-js/tracer.js index 77d30dbd1c2..8266f407d84 100644 --- a/examples/grpc-js/tracer.js +++ b/examples/grpc-js/tracer.js @@ -13,21 +13,15 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc'); const EXPORTER = process.env.EXPORTER || ''; module.exports = (serviceName) => { + const useZipkin = EXPORTER.toLowerCase().startsWith('z'); + const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter(); const provider = new NodeTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName, }), + spanProcessors: [new SimpleSpanProcessor(exporter)] }); - let exporter; - if (EXPORTER.toLowerCase().startsWith('z')) { - exporter = new ZipkinExporter(); - } else { - exporter = new JaegerExporter(); - } - - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings provider.register(); diff --git a/examples/http/package.json b/examples/http/package.json index 64a05ed4307..1e813be5288 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -30,14 +30,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/http/tracer.js b/examples/http/tracer.js index b2351221bde..b96993446b6 100644 --- a/examples/http/tracer.js +++ b/examples/http/tracer.js @@ -13,21 +13,15 @@ const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http'); const EXPORTER = process.env.EXPORTER || ''; module.exports = (serviceName) => { + const useZipkin = EXPORTER.toLowerCase().startsWith('z'); + const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter(); const provider = new NodeTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName, }), + spanProcessors: [new SimpleSpanProcessor(exporter)] }); - - let exporter; - if (EXPORTER.toLowerCase().startsWith('z')) { - exporter = new ZipkinExporter(); - } else { - exporter = new JaegerExporter(); - } - - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - + // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings provider.register(); diff --git a/examples/https/package.json b/examples/https/package.json index baf7cd9c14d..c1fe2734a90 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -34,14 +34,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/https/tracer.js b/examples/https/tracer.js index 9d76f30355b..d59835da96f 100644 --- a/examples/https/tracer.js +++ b/examples/https/tracer.js @@ -14,21 +14,14 @@ const EXPORTER = process.env.EXPORTER || ''; process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; module.exports = (serviceName) => { - let exporter; + const useZipkin = EXPORTER.toLowerCase().startsWith('z'); + const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter(); const provider = new NodeTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName, }), + spanProcessors: [new SimpleSpanProcessor(exporter)] }); - - if (EXPORTER.toLowerCase().startsWith('z')) { - exporter = new ZipkinExporter(); - } else { - exporter = new JaegerExporter(); - } - - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings provider.register(); diff --git a/examples/opentelemetry-web/examples/fetch-proto/index.js b/examples/opentelemetry-web/examples/fetch-proto/index.js index 0faaa0149aa..346ff12163f 100644 --- a/examples/opentelemetry-web/examples/fetch-proto/index.js +++ b/examples/opentelemetry-web/examples/fetch-proto/index.js @@ -12,17 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require("@opentelemetry/semantic-convention const provider = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'fetch-proto-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors: [ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new OTLPTraceExporterProto()), + ] }); -// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests -// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the -// exporter without delay -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor( - new SimpleSpanProcessor(new OTLPTraceExporterProto()) -); - provider.register({ contextManager: new ZoneContextManager(), propagator: new B3Propagator(), diff --git a/examples/opentelemetry-web/examples/fetch/index.js b/examples/opentelemetry-web/examples/fetch/index.js index 3326beb19b6..8e0ac16e03d 100644 --- a/examples/opentelemetry-web/examples/fetch/index.js +++ b/examples/opentelemetry-web/examples/fetch/index.js @@ -12,14 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const provider = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'fetch-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors:[ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new OTLPTraceExporter()), + ] }); -// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests -// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the -// exporter without delay -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter())); provider.register({ contextManager: new ZoneContextManager(), propagator: new B3Propagator(), diff --git a/examples/opentelemetry-web/examples/fetchXhr/index.js b/examples/opentelemetry-web/examples/fetchXhr/index.js index 1d93af4c49d..92e9b72eb3c 100644 --- a/examples/opentelemetry-web/examples/fetchXhr/index.js +++ b/examples/opentelemetry-web/examples/fetchXhr/index.js @@ -12,14 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const provider = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors: [ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new OTLPTraceExporter()), + ] }); -// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests -// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the -// exporter without delay -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter())); provider.register({ contextManager: new ZoneContextManager(), }); diff --git a/examples/opentelemetry-web/examples/fetchXhrB3/index.js b/examples/opentelemetry-web/examples/fetchXhrB3/index.js index 2923cccc6b7..368ae309f44 100644 --- a/examples/opentelemetry-web/examples/fetchXhrB3/index.js +++ b/examples/opentelemetry-web/examples/fetchXhrB3/index.js @@ -13,14 +13,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const provider = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-b3-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors: [ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new OTLPTraceExporter()), + ] }); -// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests -// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the -// exporter without delay -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter())); provider.register({ contextManager: new ZoneContextManager(), propagator: new B3Propagator(), diff --git a/examples/opentelemetry-web/examples/xml-http-request/index.js b/examples/opentelemetry-web/examples/xml-http-request/index.js index 7530528ed87..908716f9a0a 100644 --- a/examples/opentelemetry-web/examples/xml-http-request/index.js +++ b/examples/opentelemetry-web/examples/xml-http-request/index.js @@ -12,15 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const providerWithZone = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'xml-http-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors: [ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new OTLPTraceExporter()), + ] }); -// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests -// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the -// exporter without delay -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter())); - providerWithZone.register({ contextManager: new ZoneContextManager(), propagator: new B3Propagator(), diff --git a/examples/opentelemetry-web/examples/zipkin/index.js b/examples/opentelemetry-web/examples/zipkin/index.js index d76de7e563b..a6382a1bc77 100644 --- a/examples/opentelemetry-web/examples/zipkin/index.js +++ b/examples/opentelemetry-web/examples/zipkin/index.js @@ -7,19 +7,23 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention const provider = new WebTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'zipkin-web-service' - }) + }), + // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests + // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the + // exporter without delay + spanProcessors: [ + new SimpleSpanProcessor(new ConsoleSpanExporter()), + new SimpleSpanProcessor(new ZipkinExporter({ + // testing interceptor + // getExportRequestHeaders: () => { + // return { + // foo: 'bar', + // } + // } + })), + ] }); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({ - // testing interceptor - // getExportRequestHeaders: ()=> { - // return { - // foo: 'bar', - // } - // } -}))); - provider.register(); const tracer = provider.getTracer('example-tracer-web'); diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index a6747524170..478c45ef292 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -45,20 +45,20 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/examples/opentracing-shim/shim.js b/examples/opentracing-shim/shim.js index 0f791071ee4..caea31c178c 100644 --- a/examples/opentracing-shim/shim.js +++ b/examples/opentracing-shim/shim.js @@ -11,9 +11,9 @@ const { TracerShim } = require('@opentelemetry/shim-opentracing'); function shim(serviceName) { const provider = new NodeTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName }), + spanProcessors: [new SimpleSpanProcessor(getExporter(serviceName))], }); - provider.addSpanProcessor(new SimpleSpanProcessor(getExporter(serviceName))); // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings provider.register(); diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index b0bb70f2632..acbc7fc3f26 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -30,17 +30,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/examples/otlp-exporter-node/tracing.js b/examples/otlp-exporter-node/tracing.js index 475665f23cd..fb740fb2096 100644 --- a/examples/otlp-exporter-node/tracing.js +++ b/examples/otlp-exporter-node/tracing.js @@ -26,9 +26,11 @@ const provider = new BasicTracerProvider({ resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: 'basic-service', }), + spanProcessors: [ + new SimpleSpanProcessor(exporter), + new SimpleSpanProcessor(new ConsoleSpanExporter()), + ] }); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); provider.register(); const tracer = trace.getTracer('example-otlp-exporter-node'); diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 724a0c32882..eebd013262b 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -7,6 +7,105 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change +* feat(otlp-exporter-base)!: collapse base classes into one [#5031](https://github.com/open-telemetry/opentelemetry-js/pull/5031) @pichlermarc + * `OTLPExporterNodeBase` has been removed in favor of a platform-agnostic implementation (`OTLPExporterBase`) + * `OTLPExporterBrowserBase` has been removed in favor of a platform-agnostic implementation (`OTLPExporterBase`) + * `ExportServiceError` was intended for internal use and has been dropped from exports + * `validateAndNormalizeHeaders` was intended for internal use and has been dropped from exports + * `OTLPExporterBase` all properties are now private, the constructor now takes an `IOTLPExportDelegate`, the type parameter for config type has been dropped. + * This type is scheduled for removal in a future version of this package, please treat all exporters as `SpanExporter`, `PushMetricExporter` or `LogRecordExporter`, based on their respective type. +* feat(otlp-grpc-exporter-base)!: collapse base classes into one [#5031](https://github.com/open-telemetry/opentelemetry-js/pull/5031) @pichlermarc + * `OTLPGRPCExporterNodeBase` has been removed in favor of a platform-agnostic implementation (`OTLPExporterBase` from `@opentelemetry/otlp-exporter-base`) +* feat(otlp-transformer)!: accept `ResourceMetrics` in serializers instead of `ResourceMetrics[]` + * (user-facing): `ProtobufMetricsSerializer` now only accepts `ResourceMetrics` instead of `ResourceMetrics[]` to align with `PushMetricExporter` requirements + * (user-facing): `JsonMetricsSerializer` now only accepts `ResourceMetrics` instead of `ResourceMetrics[]` to align with `PushMetricExporter` requirements + +### :rocket: (Enhancement) + +* feat(otlp-exporter-base): internally accept a http header provider function only [#5179](https://github.com/open-telemetry/opentelemetry-js/pull/5179) @pichlermarc +* refactor(otlp-exporter-base): don't create blob before sending xhr [#5193](https://github.com/open-telemetry/opentelemetry-js/pull/5193) @pichlermarc + * improves compatibility with some unsupported runtimes +* feat(otlp-exporter-base): add http response body to exporter error [#5204](https://github.com/open-telemetry/opentelemetry-js/pull/5204) @pichlermarc + +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) + +* chore(otlp-exporter-\*-grpc): clean up tests [#5196](https://github.com/open-telemetry/opentelemetry-js/pull/5196) @pichlermarc +* chore(otlp-exporter-\*-http): clean up tests [#5196](https://github.com/open-telemetry/opentelemetry-js/pull/5198) @pichlermarc +* chore(otlp-exporter-\*-proto): clean up tests [#5196](https://github.com/open-telemetry/opentelemetry-js/pull/5199) @pichlermarc + +## 0.55.0 + +### :boom: Breaking Change + +* feat(instrumentation-http)!: reduce public API surface by removing exports and making protected methods private [#5124](https://github.com/open-telemetry/opentelemetry-js/pull/5124) @pichlermarc + * (user-facing) the following exports were intended for internal use only and have been removed without replacement + * extractHostnameAndPort + * getAbsoluteUrl + * getIncomingRequestAttributes + * getIncomingRequestAttributesOnResponse + * getIncomingRequestMetricAttributes + * getIncomingRequestMetricAttributesOnResponse + * getOutgoingRequestAttributes + * getOutgoingRequestAttributesOnResponse + * getOutgoingRequestMetricAttributes + * getOutgoingRequestMetricAttributesOnResponse + * getRequestInfo + * headerCapture + * isCompressed + * isValidOptionsType + * parseResponseStatus + * satisfiesPattern + * setAttributesFromHttpKind + * setRequestContentLengthAttribute + * setResponseContentLengthAttribute + * setSpanWithError + * RequestSignature + * RequestFunction + * ParsedRequestOptions + * IgnoreMatcher + * Https + * HttpRequestArgs + * HttpCallbackOptional + * HttpCallback + * Http + * GetFunction + * Func + * Err + +### :rocket: (Enhancement) + +* feat(sdk-node, sdk-logs): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](https://github.com/open-telemetry/opentelemetry-js/pull/4617) + * default: `true` + * note: `false` will become the default behavior in a future iteration in order to comply with [specification requirements](https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36) +* feat(instrumentation): Track request body size in XHR and Fetch instrumentations [#4706](https://github.com/open-telemetry/opentelemetry-js/pull/4706) @mustafahaddara + +### :bug: (Bug Fix) + +* fix(instrumentation-http): Fix the `OTEL_SEMCONV_STABILITY_OPT_IN` variable check. Using `of` instead of `in` [#5137](https://github.com/open-telemetry/opentelemetry-js/pull/5137) +* fix(instrumentation-http): drop url.parse in favor of URL constructor [#5091](https://github.com/open-telemetry/opentelemetry-js/pull/5091) @pichlermarc + * fixes a bug where using cyrillic characters in a client request string URL would throw an exception, whereas an un-instrumented client would accept the same input without throwing an exception +* fix(otlp-exporter-base): fix unhandled error when writing to destroyed http request [#5163](https://github.com/open-telemetry/opentelemetry-js/pull/5163) @pichlermarc + +## 0.54.2 + +### :bug: (Bug Fix) + +* fix(instrumentation): Fix wrapping ESM files with absolute path [#5094](https://github.com/open-telemetry/opentelemetry-js/pull/5094) @serkan-ozal + +## 0.54.1 + +### :bug: (Bug Fix) + +* fix(instrumentation-http): skip malformed forwarded headers. [#5095](https://github.com/open-telemetry/opentelemetry-js/issues/5095) @pmlanger + +## 0.54.0 + +### :boom: Breaking Change + * feat(exporter-*-otlp-*)!: rewrite exporter config logic for testability [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc * (user-facing) `getDefaultUrl` was intended for internal use has been removed from all exporters * (user-facing) `getUrlFromConfig` was intended for internal use and has been removed from all exporters @@ -14,6 +113,7 @@ All notable changes to experimental packages in this project will be documented * (user-facing) `url` was intended for internal use and has been removed from all exporters * (user-facing) `timeoutMillis` was intended for internal use and has been removed from all exporters * (user-facing) `onInit` was intended for internal use and has been removed from all exporters + * (user-facing) OTLP exporter config `headers` type changed from `Partial>` to `Record` * feat(otlp-exporter-base)!: do not export functions that are intended for internal use [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc * Drops the following functions and types that were intended for internal use from the package exports: * `parseHeaders` @@ -21,6 +121,10 @@ All notable changes to experimental packages in this project will be documented * `appendResourcePathToUrlIfNeeded` * `configureExporterTimeout` * `invalidTimeout` +* feat(instrumentation-http)!: remove long deprecated options [#5085](https://github.com/open-telemetry/opentelemetry-js/pull/5085) @pichlermarc + * `ignoreIncomingPaths` has been removed, use the more versatile `ignoreIncomingRequestHook` instead. + * `ignoreOutgoingUrls` has been removed, use the more versatile `ignoreOutgoingRequestHook` instead. + * `isIgnored` utility function was intended for internal use and has been removed without replacement. ### :rocket: (Enhancement) @@ -51,8 +155,6 @@ All notable changes to experimental packages in this project will be documented * fix(exporter-logs-otlp-proto): Use correct config type in Node constructor * fix(instrumentation-http): Fix instrumentation of `http.get`, `http.request`, `https.get`, and `https.request` when used from ESM code and imported via the `import defaultExport from 'http'` style. [#5024](https://github.com/open-telemetry/opentelemetry-js/issues/5024) @trentm -### :books: (Refine Doc) - ### :house: (Internal) * refactor(exporter-prometheus): replace `MetricAttributes` and `MetricAttributeValues` with `Attributes` and `AttributeValues` [#4993](https://github.com/open-telemetry/opentelemetry-js/pull/4993) diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index 466cff5ba16..4a9ab4aeba7 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.53.0", + "version": "0.55.0", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -10,8 +10,8 @@ "align-api-deps": "node ../../../scripts/align-api-deps.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index 9b855138214..d934c9a3e30 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.53.0", + "version": "0.55.0", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -10,8 +10,8 @@ "align-api-deps": "node ../../../scripts/align-api-deps.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/experimental/examples/events/package.json b/experimental/examples/events/package.json index 1476f9ce345..7aff247c13c 100644 --- a/experimental/examples/events/package.json +++ b/experimental/examples/events/package.json @@ -1,17 +1,17 @@ { "name": "events-example", - "version": "0.53.0", + "version": "0.55.0", "private": true, "scripts": { "start": "ts-node index.ts" }, "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/sdk-events": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/sdk-events": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { "@types/node": "18.6.5", diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json index eeacaea85c5..5b8bf25e1fc 100644 --- a/experimental/examples/logs/package.json +++ b/experimental/examples/logs/package.json @@ -1,6 +1,6 @@ { "name": "logs-example", - "version": "0.53.0", + "version": "0.55.0", "private": true, "scripts": { "start": "ts-node index.ts", @@ -8,8 +8,8 @@ }, "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { "@types/node": "18.6.5", diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index 0ec43be087d..9aeb831565f 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.53.0", + "version": "0.55.0", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -32,13 +32,13 @@ "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@opentelemetry/shim-opencensus": "0.53.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@opentelemetry/shim-opencensus": "0.55.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/experimental/examples/opencensus-shim/setup.js b/experimental/examples/opencensus-shim/setup.js index 1bb277eddb4..e3e189eae2d 100644 --- a/experimental/examples/opencensus-shim/setup.js +++ b/experimental/examples/opencensus-shim/setup.js @@ -48,12 +48,14 @@ module.exports = function setup(serviceName) { const resource = new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName, }); - const tracerProvider = new NodeTracerProvider({ resource }); - tracerProvider.addSpanProcessor( - new BatchSpanProcessor(new OTLPTraceExporter(), { - scheduledDelayMillis: 5000, - }) - ); + const tracerProvider = new NodeTracerProvider({ + resource, + spanProcessors: [ + new BatchSpanProcessor(new OTLPTraceExporter(), { + scheduledDelayMillis: 5000, + }) + ] + }); tracerProvider.register(); const meterProvider = new MeterProvider({ resource }); diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index 7e82e2d2647..98843285577 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.53.0", + "version": "0.55.0", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0" } } diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 66a7a278790..df306260b87 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-events", - "version": "0.53.0", + "version": "0.55.0", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,10 +61,10 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/api-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -76,11 +76,11 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events", "sideEffects": false diff --git a/experimental/packages/api-events/src/platform/browser/globalThis.ts b/experimental/packages/api-events/src/platform/browser/globalThis.ts index e8a79351b27..208858eeea6 100644 --- a/experimental/packages/api-events/src/platform/browser/globalThis.ts +++ b/experimental/packages/api-events/src/platform/browser/globalThis.ts @@ -31,9 +31,9 @@ export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : typeof self === 'object' - ? self - : typeof window === 'object' - ? window - : typeof global === 'object' - ? global - : ({} as typeof globalThis); + ? self + : typeof window === 'object' + ? window + : typeof global === 'object' + ? global + : ({} as typeof globalThis); diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index d3d4a554d65..1db757e0761 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-logs", - "version": "0.53.0", + "version": "0.55.0", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -87,7 +87,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -99,11 +99,11 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs", "sideEffects": false diff --git a/experimental/packages/api-logs/src/platform/browser/globalThis.ts b/experimental/packages/api-logs/src/platform/browser/globalThis.ts index e8a79351b27..208858eeea6 100644 --- a/experimental/packages/api-logs/src/platform/browser/globalThis.ts +++ b/experimental/packages/api-logs/src/platform/browser/globalThis.ts @@ -31,9 +31,9 @@ export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : typeof self === 'object' - ? self - : typeof window === 'object' - ? window - : typeof global === 'object' - ? global - : ({} as typeof globalThis); + ? self + : typeof window === 'object' + ? window + : typeof global === 'object' + ? global + : ({} as typeof globalThis); diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 9db1a4cb182..42c2e566579 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -18,8 +18,7 @@ "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../../scripts/peer-api-check.js", - "align-api-deps": "node ../../../scripts/align-api-deps.js", - "maint:regenerate-test-certs": "cd test/certs && ./regenerate.sh" + "align-api-deps": "node ../../../scripts/align-api-deps.js" }, "keywords": [ "opentelemetry", @@ -51,15 +50,15 @@ "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -70,10 +69,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts index 31f1daf95ea..e7e883e1ea3 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts @@ -16,31 +16,28 @@ import { LogRecordExporter, ReadableLogRecord } from '@opentelemetry/sdk-logs'; import { + convertLegacyOtlpGrpcOptions, + createOtlpGrpcExportDelegate, OTLPGRPCExporterConfigNode, - OTLPGRPCExporterNodeBase, } from '@opentelemetry/otlp-grpc-exporter-base'; -import { - IExportLogsServiceResponse, - ProtobufLogsSerializer, -} from '@opentelemetry/otlp-transformer'; +import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; /** * OTLP Logs Exporter for Node */ export class OTLPLogExporter - extends OTLPGRPCExporterNodeBase< - ReadableLogRecord, - IExportLogsServiceResponse - > + extends OTLPExporterBase implements LogRecordExporter { constructor(config: OTLPGRPCExporterConfigNode = {}) { super( - config, - ProtobufLogsSerializer, - 'LogsExportService', - '/opentelemetry.proto.collector.logs.v1.LogsService/Export', - 'LOGS' + createOtlpGrpcExportDelegate( + convertLegacyOtlpGrpcOptions(config, 'LOGS'), + ProtobufLogsSerializer, + 'LogsExportService', + '/opentelemetry.proto.collector.logs.v1.LogsService/Export' + ) ); } } diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts index 996b5180acf..6218f750368 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts @@ -14,290 +14,86 @@ * limitations under the License. */ -import * as protoLoader from '@grpc/proto-loader'; -import { diag } from '@opentelemetry/api'; - -import * as assert from 'assert'; -import * as crypto from 'crypto'; -import * as fs from 'fs'; -import * as grpc from '@grpc/grpc-js'; -import * as path from 'path'; -import * as sinon from 'sinon'; -import { OTLPLogExporter } from '../src'; - -import { - ensureExportedLogRecordIsCorrect, - ensureMetadataIsCorrect, - ensureResourceIsCorrect, - mockedReadableLogRecord, -} from './logsHelper'; -import * as core from '@opentelemetry/core'; -import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; import { - IExportLogsServiceRequest, - IResourceLogs, -} from '@opentelemetry/otlp-transformer'; - -const logsServiceProtoPath = - 'opentelemetry/proto/collector/logs/v1/logs_service.proto'; -const includeDirs = [path.resolve(__dirname, '../../otlp-transformer/protos')]; - -const httpAddr = 'https://localhost:1503'; -const udsAddr = 'unix:///tmp/otlp-logs.sock'; + LoggerProvider, + SimpleLogRecordProcessor, +} from '@opentelemetry/sdk-logs'; +import { OTLPLogExporter } from '../src'; +import { ServerTestContext, startServer } from './utils'; +import * as assert from 'assert'; -type TestParams = { - address?: string; - useTLS?: boolean; - metadata?: grpc.Metadata; +const testServiceDefinition = { + export: { + path: '/opentelemetry.proto.collector.logs.v1.LogsService/Export', + requestStream: false, + responseStream: false, + requestSerialize: (arg: Buffer) => { + return arg; + }, + requestDeserialize: (arg: Buffer) => { + return arg; + }, + responseSerialize: (arg: Buffer) => { + return arg; + }, + responseDeserialize: (arg: Buffer) => { + return arg; + }, + }, }; -const metadata = new grpc.Metadata(); -metadata.set('k', 'v'); - -const testCollectorExporter = (params: TestParams) => { - const { address = httpAddr, useTLS, metadata } = params; - return describe(`OTLPLogExporter - node ${useTLS ? 'with' : 'without'} TLS, ${ - metadata ? 'with' : 'without' - } metadata, target ${address}`, () => { - let collectorExporter: OTLPLogExporter; - let server: grpc.Server; - let exportedData: IResourceLogs | undefined; - let reqMetadata: grpc.Metadata | undefined; - - before(done => { - server = new grpc.Server(); - protoLoader - .load(logsServiceProtoPath, { - keepCase: false, - longs: String, - enums: String, - defaults: true, - oneofs: true, - includeDirs, - }) - .then((packageDefinition: protoLoader.PackageDefinition) => { - const packageObject: any = - grpc.loadPackageDefinition(packageDefinition); - server.addService( - packageObject.opentelemetry.proto.collector.logs.v1.LogsService - .service, - { - Export: (data: { - request: IExportLogsServiceRequest; - metadata: grpc.Metadata; - }) => { - if (data.request.resourceLogs != null) { - exportedData = data.request.resourceLogs[0]; - } - reqMetadata = data.metadata; - }, - } - ); - const credentials = useTLS - ? grpc.ServerCredentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - [ - { - cert_chain: fs.readFileSync('./test/certs/server.crt'), - private_key: fs.readFileSync('./test/certs/server.key'), - }, - ] - ) - : grpc.ServerCredentials.createInsecure(); - const serverAddr = new URL(address); - server.bindAsync( - serverAddr.protocol === 'https:' ? serverAddr.host : address, - credentials, - err => { - if (err) { - done(err); - } else { - server.start(); - done(); - } - } - ); - }) - .catch(done); - }); - - after(() => { - server.forceShutdown(); - }); - - beforeEach(done => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); - collectorExporter = new OTLPLogExporter({ - url: address, - credentials, - metadata: metadata, - }); - done(); - }); - - afterEach(() => { - exportedData = undefined; - reqMetadata = undefined; - sinon.restore(); - }); - - if (useTLS && crypto.X509Certificate) { - it('test certs are valid', () => { - const certPaths = [ - './test/certs/ca.crt', - './test/certs/client.crt', - './test/certs/server.crt', - ]; - certPaths.forEach(certPath => { - const cert = new crypto.X509Certificate(fs.readFileSync(certPath)); - const now = new Date(); - assert.ok( - new Date(cert.validTo) > now, - `TLS cert "${certPath}" is still valid: cert.validTo="${cert.validTo}" (if this fails use 'npm run maint:regenerate-test-certs')` - ); - }); - }); - } - - describe('instance', () => { - it('should warn about headers when using grpc', () => { - // Need to stub/spy on the underlying logger as the 'diag' instance is global - const spyLoggerWarn = sinon.stub(diag, 'warn'); - collectorExporter = new OTLPLogExporter({ - url: address, - headers: { - foo: 'bar', - }, - }); - const args = spyLoggerWarn.args[0]; - assert.strictEqual(args[0], 'Headers cannot be set when using grpc'); - }); - it('should warn about path in url', () => { - if (new URL(address).protocol === 'unix:') { - // Skip this test for UDS - return; - } - const spyLoggerWarn = sinon.stub(diag, 'warn'); - collectorExporter = new OTLPLogExporter({ - url: `${address}/v1/logs`, - }); - const args = spyLoggerWarn.args[0]; - assert.strictEqual( - args[0], - 'URL path should not be set when using grpc, the path part of the URL will be ignored.' - ); - }); - }); - - describe('export', () => { - it('should export log records', done => { - const responseSpy = sinon.spy(); - const logRecords = [Object.assign({}, mockedReadableLogRecord)]; - collectorExporter.export(logRecords, responseSpy); - setTimeout(() => { - assert.ok( - typeof exportedData !== 'undefined', - 'resource' + " doesn't exist" - ); - - const logs = exportedData.scopeLogs[0].logRecords; - const resource = exportedData.resource; - - assert.ok(typeof logs !== 'undefined', 'log records do not exist'); - - ensureExportedLogRecordIsCorrect(logs[0]); - - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - - ensureResourceIsCorrect(resource); - - ensureMetadataIsCorrect(reqMetadata, params?.metadata); +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...) + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + * - `@opentelemetry/otlp-grpc-exporter-base`: gRPC transport + */ +describe('OTLPLogExporter', function () { + let shutdownHandle: () => void | undefined; + const serverTestContext: ServerTestContext = { + requests: [], + serverResponseProvider: () => { + return { error: null, buffer: Buffer.from([]) }; + }, + }; + + beforeEach(async function () { + shutdownHandle = await startServer( + 'localhost:1503', + testServiceDefinition, + serverTestContext + ); + }); - done(); - }, 500); - }); - it('should log deadline exceeded error', done => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); + afterEach(function () { + shutdownHandle(); - const collectorExporterWithTimeout = new OTLPLogExporter({ - url: address, - credentials, - metadata: metadata, - timeoutMillis: 100, - }); + // clear context + serverTestContext.requests = []; + serverTestContext.serverResponseProvider = () => { + return { error: null, buffer: Buffer.from([]) }; + }; + }); - const responseSpy = sinon.spy(); - const logRecords = [Object.assign({}, mockedReadableLogRecord)]; - collectorExporterWithTimeout.export(logRecords, responseSpy); + it('successfully exports data', async () => { + // arrange + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor( + new OTLPLogExporter({ + url: 'http://localhost:1503', + }) + ) + ); - setTimeout(() => { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - assert.match( - responseSpy.args[0][0].error.details, - /Deadline exceeded.*/ - ); - done(); - }, 300); - }); + // act + loggerProvider.getLogger('test-logger').emit({ + body: 'test-body', }); - describe('export - with gzip compression', () => { - beforeEach(() => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); - collectorExporter = new OTLPLogExporter({ - url: address, - credentials, - metadata: metadata, - compression: CompressionAlgorithm.GZIP, - }); - }); - it('should successfully send the log records', done => { - const responseSpy = sinon.spy(); - const logRecords = [Object.assign({}, mockedReadableLogRecord)]; - collectorExporter.export(logRecords, responseSpy); - setTimeout(() => { - assert.ok( - typeof exportedData !== 'undefined', - 'resource' + " doesn't exist" - ); - const logs = exportedData.scopeLogs[0].logRecords; - const resource = exportedData.resource; - - assert.ok(typeof logs !== 'undefined', 'log records do not exist'); - ensureExportedLogRecordIsCorrect(logs[0]); + await loggerProvider.shutdown(); - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - ensureResourceIsCorrect(resource); - - ensureMetadataIsCorrect(reqMetadata, metadata); - - done(); - }, 500); - }); - }); + // assert + assert.strictEqual(serverTestContext.requests.length, 1); }); -}; - -testCollectorExporter({ useTLS: true }); -testCollectorExporter({ useTLS: false }); -testCollectorExporter({ metadata }); -// skip UDS tests on windows -process.platform !== 'win32' && testCollectorExporter({ address: udsAddr }); +}); diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.crt b/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.crt deleted file mode 100644 index 62270748a6e..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFozCCA4ugAwIBAgIUAlsD9Gz58PTwA00z7LcmYLcREgswDQYJKoZIhvcNAQEL -BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs -ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE -AwwCY2EwHhcNMjQwNjA4MTkxODQ4WhcNMjUwNjA4MTkxODQ4WjBhMQswCQYDVQQG -EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w -CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ -KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMv6RFj5bgfSnj27LJMUwceaVI8Rz6Ks -BKRyJlM/cE3MQg+58BjoelLxfRsCxHFLvwuo/S6l0leRYAvzCexsnFnqd5Ie0tMi -1pB6YMPcmzUwbJCywLUGBin85TDFpEd1L1cSxKvi4DoC6EDYdBge0yp3T1my3mlu -8LaMVYr22RQvofwaTqFwmOQSqxK3wR9LRWTMDoUioMdolkIv7y1lpQ59ORWlASfP -SMUhh4KAYmDCtH9M40iY7kwCMv8ZwB2DIiw1qZxkk3MFJoyI5HZuvb586Pp5GfHI -Wry2KaTZskGCDB/8mURhMyFQnsO+kN9moYLm+NVk+8jzTTus4DUI6sEnpSgF05hU -O9lIL+HAFl/6N5d/W5wbSfOulPwJCd+c49ylIAUu38ZmNmRpmGPalBlluDYu8Exw -d/uoXBmt5vyeE9d14uTYYt+xef942s66Qnoq9wLFJymSsMb1v41Pv/zjeV53NIRE -xJ1sSH+5xcRaAdvjdmN2q5zuKddkD/2FyIl0NkWwNYefKaFdLEy9MfdbBgKBHOkh -neTWIZwI8Kkff6v5MTW022MK7v3nis1wUjrvEn0CyI8USCh/wcNBmiJsrEPltN+S -CsriZLwT1x4mce+43+bibxinL+RZogWxZ/Q+TkeUsluBNjn8hwWy5n/750HKgRAa -D+KxGkn92B9tAgMBAAGjUzBRMB0GA1UdDgQWBBQjlis82orRLmms4w1dbJFf9NDO -6zAfBgNVHSMEGDAWgBQjlis82orRLmms4w1dbJFf9NDO6zAPBgNVHRMBAf8EBTAD -AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQARxfWyzqU9aUrSt50daVayVezg3gJQh4XI -V0p+LGEF6rlGVlX3lnhyf1g/nd1jdiBxMGnROXTFotdw4h1yQjlNrPp5Gh7ZJets -NPvo0xYfCckEmwUFX1+ikwteSciOmBKypAsEYlPjUuGxhMm7WT18WyogjUZOz8k9 -Q3DSAsf3KR516uYeK+U/RTOiYc6HzCPxBy5fG80aI4rxcdJkA60RxHEM2ZqdhlYY -+DkE6843xEbrF4TjmoDeOq471D4Zl3DqLg9v7YbOARV2G8MYUsBkeSTcSz+DWEXA -MSoQMgv2Z6G7ToUeYhRXOLHHILHmu5Hc2ldVvLmbhkfDICjYnNqsiuSnKkZ2WqBn -1GXTjTEPl+FNt0Gwy/+ygiG4Z2S5Cc2ULPLMs9E9N2Iiq+LNjmgw3dUy8pwOTfDo -heluT4NeGmHxh4sFQpg96z0K1JCZZpzJCsSAJRXxLdSl7VVFXTGbmRjD8BrBWn4k -9euT4UHgWj+xSYkJWpIkuTMJ6M4+B/JQQNVwKok/xqTHadOJ2f4V6j4cy517hMu6 -oFo/XF6zG3N0sGfkFTlcE7xsruRbir7utAEQwuUGQsy1SeGRrLCwBcvhetq1jVR8 -mjXEADzaP1a9+nMG+LFD+PeHcpYbuxaOwAinFbA1SwwGmAwWFhXudSiFpIM2btrE -f9n1KYObAw== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.key b/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.key deleted file mode 100644 index 6d444ffdab8..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/ca.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDL+kRY+W4H0p49 -uyyTFMHHmlSPEc+irASkciZTP3BNzEIPufAY6HpS8X0bAsRxS78LqP0updJXkWAL -8wnsbJxZ6neSHtLTItaQemDD3Js1MGyQssC1BgYp/OUwxaRHdS9XEsSr4uA6AuhA -2HQYHtMqd09Zst5pbvC2jFWK9tkUL6H8Gk6hcJjkEqsSt8EfS0VkzA6FIqDHaJZC -L+8tZaUOfTkVpQEnz0jFIYeCgGJgwrR/TONImO5MAjL/GcAdgyIsNamcZJNzBSaM -iOR2br2+fOj6eRnxyFq8timk2bJBggwf/JlEYTMhUJ7DvpDfZqGC5vjVZPvI8007 -rOA1COrBJ6UoBdOYVDvZSC/hwBZf+jeXf1ucG0nzrpT8CQnfnOPcpSAFLt/GZjZk -aZhj2pQZZbg2LvBMcHf7qFwZreb8nhPXdeLk2GLfsXn/eNrOukJ6KvcCxScpkrDG -9b+NT7/843ledzSERMSdbEh/ucXEWgHb43Zjdquc7inXZA/9hciJdDZFsDWHnymh -XSxMvTH3WwYCgRzpIZ3k1iGcCPCpH3+r+TE1tNtjCu7954rNcFI67xJ9AsiPFEgo -f8HDQZoibKxD5bTfkgrK4mS8E9ceJnHvuN/m4m8Ypy/kWaIFsWf0Pk5HlLJbgTY5 -/IcFsuZ/++dByoEQGg/isRpJ/dgfbQIDAQABAoICACVqCWFclx8eNeJS09FCrGyl -VT9M4A4RiWR0f60jZMEQZ0mlLHIVKmLOYskyj7/MSgWkgJQu3E8tnjVy5e4U2fTw -OfB2cOtDZ6HmoJssetedwzwjXY+WxEitV4jDp+dnikBpc+OnYMOjRuCmE11dQhR2 -//oPAhbKv6JsSUCNGLJILmkklimsko67EeAEDotj7h2YBE3NVTpeZ7lKO4/TJhxr -Qa5DrtuTfOCTztxUGjdvX1Y+Ty5AxuzwNlRub7u6EumTCkJifF1Lo4+BiI5kr68i -EEXpMqYTvvkAXNEdEUJMzVaMqbxOK+e/du+mo8ImfBebsCbMOBba8d6xTgrMUOq7 -Kxt6L+Jw3BwykWROL6JYBJ0I3BvbRS9L1iVZsSWsnzdREtrTIsgKXaYbtdeCr24y -e4poW43/QTa0ouFk2l2VsGFps2M5+F5fBHNy4aE89pKmnSBiymDHl5ELbq3IrB8r -W76dBDgmioCe64JSa1oTWQh6zhVAKduAlwXXTnLZOsN7FasuJdWpdwJQ4XdItECA -nV/CdnCRgTh06PS1wOVu8+zVNwqXfToOCHgvalB9uXcD1245zFTkPUuF5BslPZ3u -A+5sTTPjjXo1ODHA6lyLbxgEGiXNMCAkQattli+iNQU8Q0ADm40dh9/JOl9e87Eq -fqwAyZp0bLhwKNxZTlHtAoIBAQDtj4Pc5PF2prFFcJZmOEXBs71lJ59Cv79l+SbB -OHqyKyV8d8tp/eMOvlQbl8xW2uyxs4cAI0ThDaVCOBDCy5rhcEYbySmI/xtAOcmD -UwYQ7nAsyvzqOucWJ+FiJA/HD5VEmLZrIZ29R8xkX324ODx2Ij3ZYfrAHGhD6jkF -L5ZEDO55ug0nRtj4wvPc0X1xKMcpkI1mSJ9n34CmYOaMhc1okk5OHfy2AMbLUXLB -co7YOExWaLuUa42iQhQaffn8Xi8xlcBQfkuUBtnJ8xok83obrMcKGaH+ITfLCHDj -KScpmru+usJnP0Ajik65NQ9QLvpac0NYAsFn01pDO7HCRql3AoIBAQDbz2+H8pQG -I9FB5hk1MnHh/XONPco3j+DS6tD1/OTutMxdECcSQmXnm32A1ksM6fHy/xCCDErn -Bd0OpOAZeT7aThrAn7/Wq8MXrvC9ZG4It6YhstO0Z0Dut4WIBzj5dClcq4CG2WXH -QWAyAn57q+NyxI3AVzwinQM/poiI/nhX0zqYf7UvRo3IpvQ06EwcENRCy+Pj8e5z -qbFBFDgJfa4UjvGWdpKpdek0+j2cvujVhSRXUTn2Q07Suac06MmPq0LScSl5aJPD -YSjlyxOb9buOqhUAP++CPMVF/+PAYLGLeNCho73vQMpKP/DyZEkdKZ+xbbjn4rwH -llzWtCQJrbc7AoIBAQDHjAfNoxoY+ohptdr/3kDqJpruv0uN/BdABvtAzrpxssB4 -PwBE9himJ8Xqr6XbR2YPFqhNu1J+YMHyT7n0hqaAu5iIen9DLlarql7UywaLbl4X -oiK0denquHEfyP7fzP0rc8O3VbN0bT0JCxVFiydua/DcCutgN/x1H+fprUFhxCMF -aPzngyF6Q/goAmiGhyRUi7HauyH7VMhx+W9vlm0ma88O2y2NjDVwT+g/CoVmplOp -OaxnTbjZFPxiDHPSQyMNWacDdjLyEpcahfPuGf72BDnlCAcEus5s45g/mC/nSKxv -19y4cW7k66aY+DL2vZ9aHvvwj8/58JUfaKM2d7idAoIBAQCfctYA0+K0oX7GQte+ -Ux1xRZ1ws4Xg0CnSVivGhPC8h8JHL9Rn1mp9m7lqoAhJEdtE3elnrOsYspQsb0Vw -tRb23PljCX7rhiU7JNfVSujWwgFtKH+RueTMRaxDhJm7upvWcUIGj+TYqX/SRyTh -KUsQkawR/jXNFgCpR3B7j7xUWRGEVf9kj9WB3DoBtxCeu0Z+PdDOJU1H8ax2/Oe5 -WsXQe/CbqN+ytam5mFzhO0tCuBYokO9uyFyBV9MG+mZcJWuPpC7ltwqZC/3S04Eh -/RtU3ePmDnr7CoI/yOO5RWsFNVqCJnk8+M7FFaT+7+hpkywYVPNwonSrPFOUG5CY -xL7JAoIBABpSHOLrmGvcBnYL9IabcacNC2fWx0fs+1Nq8i8gknb0uXforz4mj1W+ -Y1mvdfOxLAc8wY4y+2gbcQa2racjAR5uIE3/zl1W8/TzwymoHbxRdXscYcH1bdPV -aDheDbeV5Hwg9Mee7/Tpd/bs0oms+gh/vebND3AZG/E7v+QjTRVbKHkOq1kUHM0v -vci7xEl1X2TYMkMZbXkGsx21HOkfS0qi5gNjH6RDZC6G51Cx4nfy76hIwjIVtDXa -ui79Ftf71GfGkz8C7Vvg7XTuiZEUv+gnQTaQudguL7ERjt0z912S3lXMD2HkobO/ -Z4y6eNlrPgWPTUHp+YTgMmZ/c1kwHGo= ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.crt b/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.crt deleted file mode 100644 index ff9555042c9..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NDlaFw0yNTA2MDgxOTE4NDlaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBkNsaWVudDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAwmlAXHz7CE3EQ7XEMNwYymj193+C3Mo6V210X2BKjCuZ -SRdq0c/VpAWeFy5f1SHzFEkvpmfXKjePrnQL9fT5bFwUusx1pepI1c+9eHMxiSxc -rpO5SPfEPfZPHOhZBUYEYI2MRektn0UaE/a9qiQpBh5fFtyMedLkyNkfJ2OAbwCJ -XRwmUpt5pWAFORXDecVLWtTSVMQsWsOI/2gae6dgbTbJdXaLUV/UFsBOlp6m1mwb -PsHiQDawxM5aks2AjRA79aBSF1IxwO9Duqv3ZjqFd8C1nXr7oqVyEujQFtjIAvNJ -I1aP9Mu5Pybcp928VkQT8PdRcaLDt8iuOyggI86CITxVFOur8GxASHF1EF4ymkfG -jS5jCLh8BLqAGqNERQpoNyD879yTlq8ho/k/F0in9WyaEjbuEKo6wPhJUgZ1JV0q -CpqxmTlGgcWBg1Mnl8RdmHkq68zsmTpLbPzpuXlv51KmJCahc31jWHJjN1ORPGPg -hLrKkbcylW/6HTpI5i2kkn+k5owUAkst7K0njRH5TF4p7iYuC4zwSnTgxlvio9E5 -Ci6BinMgkDOjwNovXy60mR+RnKP9yxlpuJ/jbZvR9a2SYpMbu1CrBFyZ4JkTLCEC -A6rh6arjXVW6rTwEjKpMoqhZXg7CNux7gxq/czo9S6Ja0xVOnomTRCHLTgCoAOcC -AwEAAaNCMEAwHQYDVR0OBBYEFMI7y2a70iF6O+SLnWA2FXbjIlhkMB8GA1UdIwQY -MBaAFCOWKzzaitEuaazjDV1skV/00M7rMA0GCSqGSIb3DQEBCwUAA4ICAQADNVle -3YVLZs/MULoWXTwVWgriM/o5/j0iYQ4xAWlTkaT38gLov16EmwOZJbXSfDVyom1p -M818j1IwqUKdMNJyCAiXE3IriBLLSjtk6tpi4sQ2Es/QnyINGoMcAugfoymjJPhA -Pr0fJK06fs/8BDcPhlbZl3DfMF4heXh/6wlgGfjwRoXmRwtzw1Iavw9ThbolhJTm -RiE4WE2Grh0AGtqe4EJHVDslhq2oe0UHU55BbwBPWvpUYb7VWR5dd3B04TgnOnR2 -ESzUgb4suQmNEIQsO/k2O7aIQj9jJzPCULzkmcUppAP9ig9lipmi/Fa0+1nFVJrT -lAnlDm8EW5g/S+XdFTEd22mSaWM5hjTQqDlGi2Ni6R4jDcPE7uyFS0FwTk6e72YE -CP+wLIDd8s8Q8Bp5jP5JgJm3f1MCXGDtoGVR4fgMF+N36eKVGFIeFN/jQaLAE4pO -3qaVCEpQCPC4NoCW+lIOLtYQ+nTg6RVCHf26uZqkuHKqh/gGP9MCSEkg9b78iC8D -ciKxp4gz7CUUV+cmDMcDJxqAaBZnA+V0brVqDcYtul1UyanPN4WsJbBRG5s705vy -m7Fk4k2GWdfyEiOjrRd2EuezmemeSD4S9aIgtAGhggcIMtkJaSdS6zfjo/nuu2kO -A0+Bw3OOUbvnnJ0MlmLHeCSMPBCu4xVaKda8Lw== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.csr b/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.csr deleted file mode 100644 index 1fe2d47932e..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp -ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDCaUBcfPsITcRDtcQw3BjKaPX3f4LcyjpXbXRfYEqMK5lJF2rRz9Wk -BZ4XLl/VIfMUSS+mZ9cqN4+udAv19PlsXBS6zHWl6kjVz714czGJLFyuk7lI98Q9 -9k8c6FkFRgRgjYxF6S2fRRoT9r2qJCkGHl8W3Ix50uTI2R8nY4BvAIldHCZSm3ml -YAU5FcN5xUta1NJUxCxaw4j/aBp7p2BtNsl1dotRX9QWwE6WnqbWbBs+weJANrDE -zlqSzYCNEDv1oFIXUjHA70O6q/dmOoV3wLWdevuipXIS6NAW2MgC80kjVo/0y7k/ -Jtyn3bxWRBPw91FxosO3yK47KCAjzoIhPFUU66vwbEBIcXUQXjKaR8aNLmMIuHwE -uoAao0RFCmg3IPzv3JOWryGj+T8XSKf1bJoSNu4QqjrA+ElSBnUlXSoKmrGZOUaB -xYGDUyeXxF2YeSrrzOyZOkts/Om5eW/nUqYkJqFzfWNYcmM3U5E8Y+CEusqRtzKV -b/odOkjmLaSSf6TmjBQCSy3srSeNEflMXinuJi4LjPBKdODGW+Kj0TkKLoGKcyCQ -M6PA2i9fLrSZH5Gco/3LGWm4n+Ntm9H1rZJikxu7UKsEXJngmRMsIQIDquHpquNd -VbqtPASMqkyiqFleDsI27HuDGr9zOj1LolrTFU6eiZNEIctOAKgA5wIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAHfjpZwmJgizjCW89+pYI0vhYH9LH22YhN7qzV6y -smS9JNRe/N3jCOadpKgsmx7W52+RZHkdst69dvg775cMJjQ6qNouXALydUHTloXj -2k562BeUCfDBFlBR06dRGdGNkAuntAEdn/uV7+wU2SyptPGpXW8HP5xHyYoqdIlA -tEqcb/Ue9WqG7oiP4X6FI56/4HjVt9PiFtCWZS1uU06eJSRufMDSzKzS12jNfm6C -TGHD0vnzzJdW2YkaGwAUa2Iluzm7lo3eD0QJOaa9RvquxPCjbIKnzJQuzOpcI6Lm -m/fd3fGxyAl6T8kCMnItzjFTgux7NuPps3oF/FKaiNqeL/HZXWLRRI74agzlvUP7 -10HqmUvw+diVka4+ve/8zmStn7pUb5IHd8C0OGbU/N2Y+UX++jYlI5W6vXGpjo76 -R2FMaG+crPAlOKZ9/7t9+NeoqYM5iW8zLiGTXX1Zx0UKMV2om3b8CXVsGrB3y7WG -j3ZYs/4apg9sNqsIs8+udOPkfx8a3a+ZvBlrCl3XavYCaUHoNH5+dThQWvMpaFAQ -Z2wKwuSkD9kTQqeTJUj684ztf2kDopM+nt9j54ZhrkfsDiGMUtz8Xk4SPYTdN/Yc -KKVBOnm/4Hr1bASAukkQmF7AEUyUG6eJVGrEP/5MWuWc6ddONFj+eiwyAd2OzVq7 -3tvv ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.key b/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.key deleted file mode 100644 index 4cfd6bcdb31..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/client.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDCaUBcfPsITcRD -tcQw3BjKaPX3f4LcyjpXbXRfYEqMK5lJF2rRz9WkBZ4XLl/VIfMUSS+mZ9cqN4+u -dAv19PlsXBS6zHWl6kjVz714czGJLFyuk7lI98Q99k8c6FkFRgRgjYxF6S2fRRoT -9r2qJCkGHl8W3Ix50uTI2R8nY4BvAIldHCZSm3mlYAU5FcN5xUta1NJUxCxaw4j/ -aBp7p2BtNsl1dotRX9QWwE6WnqbWbBs+weJANrDEzlqSzYCNEDv1oFIXUjHA70O6 -q/dmOoV3wLWdevuipXIS6NAW2MgC80kjVo/0y7k/Jtyn3bxWRBPw91FxosO3yK47 -KCAjzoIhPFUU66vwbEBIcXUQXjKaR8aNLmMIuHwEuoAao0RFCmg3IPzv3JOWryGj -+T8XSKf1bJoSNu4QqjrA+ElSBnUlXSoKmrGZOUaBxYGDUyeXxF2YeSrrzOyZOkts -/Om5eW/nUqYkJqFzfWNYcmM3U5E8Y+CEusqRtzKVb/odOkjmLaSSf6TmjBQCSy3s -rSeNEflMXinuJi4LjPBKdODGW+Kj0TkKLoGKcyCQM6PA2i9fLrSZH5Gco/3LGWm4 -n+Ntm9H1rZJikxu7UKsEXJngmRMsIQIDquHpquNdVbqtPASMqkyiqFleDsI27HuD -Gr9zOj1LolrTFU6eiZNEIctOAKgA5wIDAQABAoICAADrNIfwswut8fZW2IQEJyhI -1wkwH1wI/GiZQTbRENkgLoLh3PL75Gjb+ijJ/19j4BKahpuDOAILH7unYqJrNwT+ -sNqcemvbz8H5ltwkXeRJWHDJN2HlSWu/i04PR7ak1VghBq29PInnbqS6u2bYY3V3 -cZyZqJCE0wUxiCiMcMc5EtCsADfrZBJIZZwk9FpgI2CHrp6Qto2ds7r9RiCLXVh2 -yYrWSvkJ+mY6rouCdeFG+9lP6V6m3/XEXlXEfzFreQ31SJ4I0eiYyqffd6Agjld5 -0brME356AZO6hdRYenu6a2Oth/6GAYHy11is26XV1RWggSWkR6sQvR4OHsTDqc1u -1pnDlkXGnJYoSGW0ZtpkvNBJwnILbqe5/C/0KOlVgDgf7YyHKmR9LxPp6j8KSZXw -T+urHlFUSG5y4EzeWZ9AP78eub3uA3F1nHfE4QcRUrJBota704y5oZg4Pnt6k+RT -6UikfOFlXnWZtgADmgeZuEO58EuW1d6AEsVbmJCoJTEWNdBhzxE5WUnWn+3iVn/M -MF/WjvDd328nBUU5d4TUo5SNCuFG7yl1VQqJqeVlDjqa6TSg0hfo8vn5k7Aivy7I -22usB4HF9969VgyLKG4rhVaFCLY2cO4v1Uf22UUI+MK7v3U+mey7/Rc0+HsASJ9t -DPT0es3vpdYiZWTRvRqRAoIBAQD8uBpbAAmUgWRL8nu8U5RdSX/L3De2j7jZF+Ei -UcFfIa/KfmB1g9GlpyIbQ7V8Sy0E4CrUWUOccTFhATebY0wUDvnt28b4WW/IUTCL -G6uUyBSadgbyUmhNgM9BvaOjSl9mSYR+ZtAfDWJXnJwxqcO7oTbVV19qIiw9hUh+ -SejBpcNyyppYKmBosit29zs7JuGG5UFUulbRwlHkG3OSnPRio7ClahEr47Urq7IE -vvDMcb0TCx6Bpw2SOd6lzYgWBpIUNkaVGgbw0b+xkCp42z2Zr/nC0U/28pWfHAqy -7ngDv3VMfZgwM27SZTgHjws0K6zZH+nlZ0KIbCFf3XbUucO3AoIBAQDE712A+5fd -jaxHZjZ67gY1WXGQ8Q1DSOBQPFSVrS5safdlpFed9HUqh/kImb+s5UBuRWwyg+Zo -84X4GnDaEHrAoroj7RydjvVKWOxTB1QtwjiEZYPrZ3QjlZxZYX0mtDv/av9zLFyJ -2VyX6iUsbfCHqhCznBZpbkSZ3zyq+lOrB6nAwTIE4yFtDrm07zLl+tohpzIKKUlv -Hj7nwoDgcajfb08xrCv3S/XC0KECW2XWPi5EPoE8JV7C7hDl7hesp4vKmW72vcT4 -x3akO6IeILN4hyJB95mfV6AYxpGHpzCZft1QfvnwU4s9FaBjZJgRCHJgZsJYjraB -RZ9fuve174xRAoIBAQC97wPn1rxcf27I4aJ7ZPmBrya8KXM54wSTLK5Io9dIT0IW -VyrZx0t+S4GHqjixBLL+Ehg+ZiQ5ZJ0vAcIwJ83a2XKfgOkmZ9lqXRK1ygMHm+RY -PlJ0NtkrPp8GEqf0poXSk3hfo5fRbra1j/+YF7YCw2Q5rSQJ2UsUpaJZP+UN/S5K -jNi5YIf6x8WA8Mj0aQFg59ZU/oMXvQrc/IC89Pd7VvkBKRlkugvEmZL+nB7QGL94 -m4e++7Voa9PZGwKnQyLwy+X6U4hZ39pJckdpc6T1Z9u3vqZxu9oVrfagijdq4a8f -4NjLiSxGNkqI68oI2LZcrO6WOig37cSbjw+rSz47AoIBAQCzKe2QVdRQ/P36KxRv -fDLrwEbgjVz6lMd2V5zAW0D74t/vebc4fdlGa1P2LiJCgoK+j6wivPsXCk4cbLm0 -uf9jV+gunR5GfXPNQt8lnmpIAwV19gExXfo8EXWfn2DDoH9hHQ/v0TETPEvP7XYK -WK7WTbNKJDwDiQ0iTAUerAUIeT1HnrwJ1DVpyVbMND3DGxfuO/T7Z5pmXEbwhHTJ -PL5dICAVWcTaBCI/LZz9zvb0Fbfz4EWk2X6/quR2usiRDBDSrgpUsksL5jOasKIJ -9MgyZAaXq1H4tDhzsdteZY2CZ/eirxJmQStQ1GcJZdAu1tdvuq0e8h85toSLDEcm -HxwxAoIBAQDDL3FaiF3Pco3/4kpEzaWVJvi4s1rTyjrkjr0ctqQBfPy1igEQGltZ -/pxPCcJKq8SXTtCzszXIXpaP3rYKtsDzmlnaiF3DjQDoIbcUP5rq8dBBVtwuGKSj -+hyY3o0V8srO67woKCtsjYL+oHf8FFDtjh/VQjL5Cf65rLebX/sqiYjCz2U86QM+ -z306IHwAzlUTgWfXYyKkY8oFu/Jpw9k+aiVg+KPNIy4qnzimMcDjI3efU4ZxJHF1 -CwCTq2h46R5GzsLl6AasE//wi9qyepbS0zl2ZZ5S8/qPKqE110LaQFqc/6jmpqdM -GCjn3ccqyYWia5VCpKUwdjE0k/SMU8/D ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/regenerate.sh b/experimental/packages/exporter-logs-otlp-grpc/test/certs/regenerate.sh deleted file mode 100755 index cc052a4effe..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/regenerate.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh -# -# Regenerate certificates that are used for tests using TLS. -# Certs are generated with a one year expiry, so periodic regen is required. -# -# Usage: npm run maint:regenerate-test-certs - -rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key - -openssl genrsa -out ca.key 4096 -openssl req -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" - -openssl genrsa -out server.key 4096 -openssl req -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -in server.key -out server.key - -openssl genrsa -out client.key 4096 -openssl req -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -in client.key -out client.key diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.crt b/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.crt deleted file mode 100644 index 99877d77596..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NDhaFw0yNTA2MDgxOTE4NDhaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBlNlcnZlcjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAs4sfkgZBkGLNdsv1i2tcfrMOfqm/7xfGHTC05mBDatv3 -3k0RL+9KhR7xblAR3VadAN8HhdtmzlB+kdVYsSZHeZDJFjOnwXoxMRFxoNWxc4t/ -RTyj7JfWtYVL+2AXqOvXeMBCY5N3otS6i/6evoeBf4rEKs4h2bBoRTzEhBKlF7zR -HkqnhBrTR/vjOJYvasUte8KRFbsJeoxAsn5oCLQHA5+DBggBfFX8pO/JIGRYbdpr -oZ7AU0l9hdTMP7iakL1pZIuddROwk6kF5mc22T2Jey/sQp5OqxqT9mtbyZqDdQsF -V/jmuMs6H/fBfOkeJaAPyNeJ+Pa23WsuODzefWzCMDTCEwGsHddi5vWCbJaFWqu1 -9C9uy6iSP5aAnmW+RTi/bVv/KZavl+NGF8RFMaOr8hCtkvh8JqW19D9SmtU8Ky45 -qHSqz2q7awfbWLy8xMM8IYM6L5jCB27g2XeA/SjCb2ryab0OP6a8LSezXMBzQuml -f1C3kNnm2pSFFfLNimPs7A01zqo6eowGm3yneRBlTTyHgTFOFzuP7sEtY6p/GI6F -+jKBtSXUiKqAAwpObcMXS9a5td8wpAs87IEKKAb58BcSkzslU1fuY28At9kEUIWR -z1dyQRBPxiu4NaSxcIpI9cEBvHYSAf454noTuehlZvL6tCaAobZZMqsXSfvnVvkC -AwEAAaNCMEAwHQYDVR0OBBYEFFRmQkQkZmb8ER1Cx/6FOWmKXKlXMB8GA1UdIwQY -MBaAFCOWKzzaitEuaazjDV1skV/00M7rMA0GCSqGSIb3DQEBCwUAA4ICAQAYQHvf -s1hrdDUDzn6LQiAMbDh3VwEVOg3O/8uomn6+J/TCBkTAD6avMO3hZH28Kc5H4c8P -9db7rBkmqyOzOo7JG8xJz7vg90oh0sqo5+G73h9PQb7G8f6wCGJTD9IbRDcgCspW -Z8zIBZGxpeHHitdB2Jik1DxUkqViwxlBzBkiNpqixDde5U5EqxbecTBIuMqJkkxG -7JV61Mbb6r8xCNPqd1qYDQ6fggV1MFb6yf9TEuLmV2mKn1ypo/MzMBoTMGgKoHS8 -RgiN0bztRayaEqnmMZ5TQOYkmuGbW1oBwXeA7lorOu7/Yi4/IP0/H0rt/mSUhh5K -ubtZkWrsZV3xPeERYL9UiuOdEJ58tI3u3yDFvnULczH8bzapZisxQIfaMasq9aHg -LO8lqMk4+Kyb09vz+DPuMGdDkl4hchHlySUCrhmMmrCJTgQHmEmQMF+1TBP1cFXe -B9grn4zr+sVsqKNMArnQoUff42cFi1E5pZq7Z4DfGltcv81ay51OgTVxMJYOUB9Q -1PJcO0hkLrV66kSbTd5//6uyYuAOy5ZVXOFHOO/tDBlKlgOqYXe5tj90uZQh0AnJ -NeH73pwS3x9dF0JZBcviaH/yTK2ggi9lmzJ0EkwqUXyfYfJZGBgnLVDnNpXSUUha -v1h7xzhfZgYbWEgwV+AWiXlHTrZCXSmY3sM2QA== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.csr b/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.csr deleted file mode 100644 index b459ff45ffd..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy -dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCzix+SBkGQYs12y/WLa1x+sw5+qb/vF8YdMLTmYENq2/feTREv70qF -HvFuUBHdVp0A3weF22bOUH6R1VixJkd5kMkWM6fBejExEXGg1bFzi39FPKPsl9a1 -hUv7YBeo69d4wEJjk3ei1LqL/p6+h4F/isQqziHZsGhFPMSEEqUXvNEeSqeEGtNH -++M4li9qxS17wpEVuwl6jECyfmgItAcDn4MGCAF8Vfyk78kgZFht2muhnsBTSX2F -1Mw/uJqQvWlki511E7CTqQXmZzbZPYl7L+xCnk6rGpP2a1vJmoN1CwVX+Oa4yzof -98F86R4loA/I14n49rbday44PN59bMIwNMITAawd12Lm9YJsloVaq7X0L27LqJI/ -loCeZb5FOL9tW/8plq+X40YXxEUxo6vyEK2S+HwmpbX0P1Ka1TwrLjmodKrPartr -B9tYvLzEwzwhgzovmMIHbuDZd4D9KMJvavJpvQ4/prwtJ7NcwHNC6aV/ULeQ2eba -lIUV8s2KY+zsDTXOqjp6jAabfKd5EGVNPIeBMU4XO4/uwS1jqn8YjoX6MoG1JdSI -qoADCk5twxdL1rm13zCkCzzsgQooBvnwFxKTOyVTV+5jbwC32QRQhZHPV3JBEE/G -K7g1pLFwikj1wQG8dhIB/jniehO56GVm8vq0JoChtlkyqxdJ++dW+QIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAB5lc1i6TI58ZkV8dxlqw2OJaTuj2064GzQvwekc -iRSg8QaeVaGhA+jnet/UvBCDBqFAh4nMY/THKWB7721agRbSJS3RtyiZbBFNBDQt -dLPXO6HY6HGM1Z2ov71HNeDBQnqYSmOld3RkO9Co9nGhjOLkBtvoiAWmMHS3pnpq -o2ssCd2GmbMmiAdSJspgWJnCJUQneV0hW+l7b79oW8E0j4aZLQ7g0B3y2iTg2Ngk -0R301hh3Fs9B5PYa/TlOJsd4icgxvMjCvsIxHaihKjvNLDu3GhYRyHlxyAnZVvaG -GAqHn2WyvLeg2bMswy7FV9J6qI5PQVaApLb2g5TPbG6y52XgLMCl06fM25UbTaym -GCAEeylvXwIClPNlmnvLnytABHA5tLkfHt+E7UPJmPv8BuOeRTYtlp3UB/aI6rKG -HOMZnhUNZTVCnxid6gLEI7xMxdAKP6N1sWdcDD8bkcVEk8IjOJrpQzuYUchQwzZ+ -hZIact21gTuN5xhxq1f1gvEN0th1vUSjfZ0K67M9mgqNdza8fXOaUNc3XwRUxhfB -1kpXxDuH2dzjsy3CGeobry8nHmUB/P2KEy8u7ue7Ra3J4stFCPDRJqroRM3V8xNK -1+I2KBM8UeybFzYya9xqT9q0FNe/ukS2ohV5C1YjnxrMQ2Mx+CqJOVqpA/nP55ZE -cuZ8 ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.key b/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.key deleted file mode 100644 index 8af97da4a70..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/certs/server.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCzix+SBkGQYs12 -y/WLa1x+sw5+qb/vF8YdMLTmYENq2/feTREv70qFHvFuUBHdVp0A3weF22bOUH6R -1VixJkd5kMkWM6fBejExEXGg1bFzi39FPKPsl9a1hUv7YBeo69d4wEJjk3ei1LqL -/p6+h4F/isQqziHZsGhFPMSEEqUXvNEeSqeEGtNH++M4li9qxS17wpEVuwl6jECy -fmgItAcDn4MGCAF8Vfyk78kgZFht2muhnsBTSX2F1Mw/uJqQvWlki511E7CTqQXm -ZzbZPYl7L+xCnk6rGpP2a1vJmoN1CwVX+Oa4yzof98F86R4loA/I14n49rbday44 -PN59bMIwNMITAawd12Lm9YJsloVaq7X0L27LqJI/loCeZb5FOL9tW/8plq+X40YX -xEUxo6vyEK2S+HwmpbX0P1Ka1TwrLjmodKrPartrB9tYvLzEwzwhgzovmMIHbuDZ -d4D9KMJvavJpvQ4/prwtJ7NcwHNC6aV/ULeQ2ebalIUV8s2KY+zsDTXOqjp6jAab -fKd5EGVNPIeBMU4XO4/uwS1jqn8YjoX6MoG1JdSIqoADCk5twxdL1rm13zCkCzzs -gQooBvnwFxKTOyVTV+5jbwC32QRQhZHPV3JBEE/GK7g1pLFwikj1wQG8dhIB/jni -ehO56GVm8vq0JoChtlkyqxdJ++dW+QIDAQABAoICAFT9CbQ3RujghC70TCazawTE -oJtfoi28/LhLmo4kyjT2rCXsKDMfHBDYvWNA/rvd6JMFgAuieE84Njm1Gnc8zf+j -BDUAvautukRmY/nEveuagGPXWSdBFs81KmrzKS/6d7Q+mg6Fu092UFm9bQp2nVuw -5bv3eHmR8kG4CrQUGVcbt4eVwiccBaBhAUWDfi2V6bpYNxJox4tdgbCceoWIJnvW -EZEU0BM5ps6yfOva5CsYBfPq8FJcitEDkq2lJnFWX+HK3v2RFPhIvbS7bfC2mvIX -lMhSJJ4FBj5Swo+zlv+b+GsUtK6L8Nc6EbqdpPodgutI8BRMQPKd7jKLyavohCC9 -fDqIr+O/8qd8NeoPeyteh2UCn6OOzh66DdaDwWSkbuPns5duvNpfascRtrHJnVwF -PEq7c2kv5dcQCD/kM2H8noyF9wNnBxbOwW7s5HRrEAYDPVBH79d7urxIugna4gey -RhtUfj+vusr6+yWXoltGahsOJ2ts6lhslinCYTRTD8M2xBavn7tHOQqjkp8V9+T7 -DowgDkKhgFg7+X2VPl17LcuRS3wLEGis2ZGTZ56nWd3fGBhVgu+ujvHEJv8F0Z/u -5DRT+7Et42yl9wCklyZBGEzq5m9J/5M3lltHWuVqTsH9r+BeoMcjzyFF+JEM3M1B -tYTnnaar7Cz4aW5CnaZTAoIBAQD3m9oEgqtHpTDFAWbojeBnCyB1MF2Qm5RXVAil -wemIC3t/5M+og3oBUY96NpFg7yLrVVOILWfsp7+q1GmvToJCVJxRX7DGOXPImM8M -498JYKjk/wo1YM9eNuSg1vz2RBe1KHla/LlunhBlyQFYZV0RlakS63GRFs/HmEsl -uNYUB3D8thhXNcwiZmIiav7NhOsdtNs24JrtaCSy0P8j0s+obGU6jWYvnJhpFuHE -1qwh4uq7vRXyyS41StMzjD4j0Cuhn0RwOtBmE0cqkVZJeaqdoSveZbNCRvbjO2Tt -AlVFt1fsSI/1Z9+tBQxDjQfclmGswJHJW1gIyON/XkB7kdKfAoIBAQC5oMQJfbsI -VWO2Cjb+rJqIPtgeEnYk2x+M0k+RxEP5p7VRUt1RMvHE2VEwtF+BDUc1asx6H0xu -5vE9c5v8+aT6GbHJKOuJg+Te+yCEAUWvY9k02n1EQH3vUMFnVjd+uzSEQeLceZb4 -mgDNIyF3YPnxnYqxBoFGaceYnUW4MwVSDblMF8YJ4owiRH2w7BFsCKypa5t49Ss0 -s70IHLtIRn1Lhh6SOOnVC6oFHFlhrhZpaYM5VHkGw17M03wusWSLKWxBoFIv046Y -lHjsK22x0oqbK6UZ2aZBmxi5rCNPj9/ShQNdbJcJbuo6Jdq9CUrrp9rzCBFlfw0v -f34O8Ly5PsdnAoIBAC8ZNCU7fb0JDPfMRnjh09eF5EymQIXrMhJSZ7qv4e4A0SMI -sP9K0wBBNVt32btogWnmNxdmG6iGWAz0jo3MDzbyxTEtVIDAGOgFOQ0ooxoziqzU -Xmq82XUAWAjIHCHz3daVtk+6VsNVyaSy0VCxJzzbDOgOZPHGNwuuSk0IlaAFslY/ -hO3By+yXMP9+/qy1JcvmxPPxUUbrUl+5JW75AIr242J51wAjd1I2CgfZFbD0atX/ -J5eg8OsuKnJZsNA7HrGFjA0VAuMHs7fDIXikbfHB4IhTK//lY7zhZVc35GR4dX76 -Zne1pHRSy3xl7SLmb/neP1zfxSUWoT9u/DEFEd0CggEAZkUfnIcL45SAAgxwrjFU -VlohYbgUJUwgfspkElBKjyKJ8AsyagkiUKzWYXoO4B/7qn9ztpjF2JgeMxgdyeuU -rEI5xDVqR3JGR1+eU3wL84yUX908hLzvZUldtNw4aPclAPT30zaeKctXQ63mQ0pH -iomcntmRocSntfp4LfrWJJXxD+5NKqcJQ9vuT+pP0vCYiCMEHkkdC8U3EWAbAr/r -Sg/TigYXNkxd2MD8sadjK6J5LL3QjBxZf4nI8kTDuzQQM7vra/QnrQKn+J4Yqo7v -1HvgU3Spd53Gqo0fSzdePjMQXol0UTstiunOMLYM8/af16QLSZsNHa0lO4AAyiK/ -YwKCAQB/5KSWIXXK050vrPvC67szVxMcV1hf5xequzadYHu0n89Abek6BtLLijkd -GLwy5uJS4lY0l8+gaTBf0geMvzo0Svkf+3V1NvnOLIC/+ebw+LKFlizYrFNbU7bQ -L9pnq0txJhmNSnyb0O0G4QopZLATxKVZIT+fTCZePcmPVQm7nlxOfzbEdxRLGeYo -gaWnKJ6rUag0dOTITmmh9L15sme3H6PnXzCHvee6T4FZLNTWZbBewXrTqeZLJa+S -8JhEszuAHjbMIG3MCfy5GdApLNaztKtlPlxnnrB7323QIbrWlL/60w1rKoiZs2y7 -LPnexONaL/II1DilmyNT5mZMXCXP ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts b/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts deleted file mode 100644 index 21e151d2277..00000000000 --- a/experimental/packages/exporter-logs-otlp-grpc/test/logsHelper.ts +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import * as grpc from '@grpc/grpc-js'; -import { VERSION } from '@opentelemetry/core'; -import { - IAnyValue, - IKeyValue, - ILogRecord, - IResource, -} from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; - -const traceIdArr = [ - 31, 16, 8, 220, 142, 39, 14, 133, 196, 10, 13, 124, 57, 57, 178, 120, -]; -const spanIdArr = [94, 16, 114, 97, 246, 79, 165, 62]; - -export const mockedReadableLogRecord: ReadableLogRecord = { - resource: Resource.default().merge( - new Resource({ - 'resource-attribute': 'some resource-attr value', - }) - ), - instrumentationScope: { - name: 'scope_name_1', - version: '0.1.0', - schemaUrl: 'http://url.to.schema', - }, - hrTime: [1680253513, 123241635] as HrTime, - hrTimeObserved: [1683526948, 965142784] as HrTime, - attributes: { - 'some-attribute': 'some attribute value', - }, - droppedAttributesCount: 0, - severityNumber: SeverityNumber.ERROR, - severityText: 'error', - body: 'some_log_body', - spanContext: { - traceFlags: TraceFlags.SAMPLED, - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - }, -}; - -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'some-attribute', - value: { - stringValue: 'some attribute value', - value: 'stringValue', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedBodyIsCorrect(body?: IAnyValue) { - assert.deepStrictEqual( - body, - { stringValue: 'some_log_body', value: 'stringValue' }, - 'exported attributes are incorrect' - ); -} - -export function ensureExportedLogRecordIsCorrect(logRecord: ILogRecord) { - ensureExportedBodyIsCorrect(logRecord.body); - ensureExportedAttributesAreCorrect(logRecord.attributes); - assert.strictEqual( - logRecord.timeUnixNano, - '1680253513123241635', - 'timeUnixNano is wrong' - ); - assert.strictEqual( - logRecord.observedTimeUnixNano, - '1683526948965142784', - 'observedTimeUnixNano is wrong' - ); - assert.strictEqual( - logRecord.severityNumber, - 'SEVERITY_NUMBER_ERROR', - 'severityNumber is wrong' - ); - assert.strictEqual(logRecord.severityText, 'error', 'severityText is wrong'); - assert.strictEqual( - logRecord.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(logRecord.flags, TraceFlags.SAMPLED, 'flags is wrong'); - assert.deepStrictEqual( - logRecord.traceId, - Buffer.from(traceIdArr), - 'traceId is wrong' - ); - assert.deepStrictEqual( - logRecord.spanId, - Buffer.from(spanIdArr), - 'spanId is wrong' - ); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'resource-attribute', - value: { - stringValue: 'some resource-attr value', - value: 'stringValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureMetadataIsCorrect( - actual?: grpc.Metadata, - expected?: grpc.Metadata -) { - //ignore user agent - expected?.remove('user-agent'); - actual?.remove('user-agent'); - assert.deepStrictEqual(actual?.getMap(), expected?.getMap() ?? {}); -} diff --git a/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts b/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts new file mode 100644 index 00000000000..8dc6ae14e0c --- /dev/null +++ b/experimental/packages/exporter-logs-otlp-grpc/test/utils.ts @@ -0,0 +1,72 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + Metadata, + Server, + ServerCredentials, + ServiceDefinition, +} from '@grpc/grpc-js'; + +export interface ExportedData { + request: Buffer; + metadata: Metadata; +} + +export interface ServerTestContext { + requests: ExportedData[]; + serverResponseProvider: () => { error: Error | null; buffer?: Buffer }; +} + +/** + * Starts a customizable server that saves all responses to context.responses + * Returns data as defined in context.ServerResponseProvider + * + * @return shutdown handle, needs to be called to ensure that mocha exits + * @param address address to bind to + * @param service service to start + * @param context context for storing responses and to define server behavior. + */ +export function startServer( + address: string, + service: ServiceDefinition, + context: ServerTestContext +): Promise<() => void> { + const server = new Server(); + server.addService(service, { + export: (data: ExportedData, callback: any) => { + context.requests.push(data); + const response = context.serverResponseProvider(); + callback(response.error, response.buffer); + }, + }); + + return new Promise<() => void>((resolve, reject) => { + server.bindAsync( + address, + ServerCredentials.createInsecure(), + (error, port) => { + server.start(); + if (error != null) { + reject(error); + } + resolve(() => { + server.forceShutdown(); + }); + } + ); + }); +} diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index e60e0fbf8f3..7ed8bc3717d 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "publishConfig": { "access": "public" }, @@ -70,11 +70,11 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -88,12 +88,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -101,10 +101,10 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" } } diff --git a/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts index 3f4f5c60ff1..01a0d1f26a7 100644 --- a/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts @@ -19,27 +19,25 @@ import type { LogRecordExporter, } from '@opentelemetry/sdk-logs'; import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import type { IExportLogsServiceResponse } from '@opentelemetry/otlp-transformer'; -import { OTLPExporterBrowserBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { JsonLogsSerializer } from '@opentelemetry/otlp-transformer'; +import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; /** * Collector Logs Exporter for Web */ export class OTLPLogExporter - extends OTLPExporterBrowserBase + extends OTLPExporterBase implements LogRecordExporter { constructor(config: OTLPExporterConfigBase = {}) { super( - { - ...config, - }, - JsonLogsSerializer, - { - 'Content-Type': 'application/json', - }, - 'v1/logs' + createLegacyOtlpBrowserExportDelegate( + config, + JsonLogsSerializer, + 'v1/logs', + { 'Content-Type': 'application/json' } + ) ); } } diff --git a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts index 93efa8fed9c..28bb25319d6 100644 --- a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts @@ -19,35 +19,30 @@ import type { LogRecordExporter, } from '@opentelemetry/sdk-logs'; import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import type { IExportLogsServiceResponse } from '@opentelemetry/otlp-transformer'; -import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { JsonLogsSerializer } from '@opentelemetry/otlp-transformer'; - import { VERSION } from '../../version'; - -const USER_AGENT = { - 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, -}; +import { + convertLegacyHttpOptions, + createOtlpHttpExportDelegate, +} from '@opentelemetry/otlp-exporter-base/node-http'; /** * Collector Logs Exporter for Node */ export class OTLPLogExporter - extends OTLPExporterNodeBase + extends OTLPExporterBase implements LogRecordExporter { constructor(config: OTLPExporterNodeConfigBase = {}) { super( - { - ...config, - }, - JsonLogsSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/json', - }, - 'LOGS', - 'v1/logs' + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config, 'LOGS', 'v1/logs', { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + 'Content-Type': 'application/json', + }), + JsonLogsSerializer + ) ); } } diff --git a/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts index 69f93c6ea9f..4870b6681c3 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts @@ -17,97 +17,77 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { OTLPLogExporter } from '../../src/platform/browser'; -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { mockedReadableLogRecord } from '../logHelper'; -import { ExportResultCode } from '@opentelemetry/core'; +import { + LoggerProvider, + SimpleLogRecordProcessor, +} from '@opentelemetry/sdk-logs'; -describe('OTLPLogExporter', () => { - let collectorExporter: OTLPLogExporter; - let collectorExporterConfig: OTLPExporterConfigBase; +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ +describe('OTLPLogExporter', function () { afterEach(() => { sinon.restore(); }); - describe('constructor', () => { - it('should create an instance', () => { - const exporter = new OTLPLogExporter(); - assert.ok(exporter instanceof OTLPLogExporter); - }); - }); - - describe('export - common', () => { - let spySend: any; - beforeEach(() => { - spySend = sinon.stub(OTLPLogExporter.prototype, 'send'); - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - }); + describe('export', function () { + describe('when sendBeacon is available', function () { + it('should successfully send data using sendBeacon', async function () { + // arrange + const stubBeacon = sinon.stub(navigator, 'sendBeacon'); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); - it('should export spans as otlpTypes.Spans', done => { - const logs: ReadableLogRecord[] = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); + // act + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + await loggerProvider.shutdown(); - collectorExporter.export(logs, () => {}); - setTimeout(() => { - const log = spySend.args[0][0][0] as ReadableLogRecord; - assert.deepStrictEqual(logs[0], log); - done(); + // assert + const args = stubBeacon.args[0]; + const blob: Blob = args[1] as unknown as Blob; + const body = await blob.text(); + assert.doesNotThrow( + () => JSON.parse(body), + 'expected requestBody to be in JSON format, but parsing failed' + ); }); - assert.strictEqual(spySend.callCount, 1); }); - describe('when exporter is shutdown', () => { - it( - 'should not export anything but return callback with code' + - ' "FailedNotRetryable"', - async () => { - const spans: ReadableLogRecord[] = []; - spans.push(Object.assign({}, mockedReadableLogRecord)); - await collectorExporter.shutdown(); - spySend.resetHistory(); + describe('when sendBeacon is not available', function () { + beforeEach(function () { + // fake sendBeacon not being available + (window.navigator as any).sendBeacon = false; + }); - const callbackSpy = sinon.spy(); - collectorExporter.export(spans, callbackSpy); - const returnCode = callbackSpy.args[0][0]; + it('should successfully send data using XMLHttpRequest', async function () { + // arrange + const server = sinon.fakeServer.create(); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual(spySend.callCount, 0, 'should not call send'); - } - ); - }); - describe('when an error occurs', () => { - it('should return failed export result', done => { - const spans: ReadableLogRecord[] = []; - spans.push(Object.assign({}, mockedReadableLogRecord)); - spySend.throws({ - code: 100, - details: 'Test error', - metadata: {}, - message: 'Non-retryable', - stack: 'Stack', - }); - const callbackSpy = sinon.spy(); - collectorExporter.export(spans, callbackSpy); - setTimeout(() => { - const returnCode = callbackSpy.args[0][0]; - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual( - returnCode.error.message, - 'Non-retryable', - 'return error message is wrong' - ); - assert.strictEqual(spySend.callCount, 1, 'should call send'); - done(); + // act + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + queueMicrotask(() => { + // simulate success response + server.requests[0].respond(200, {}, ''); }); + await loggerProvider.shutdown(); + + // assert + const request = server.requests[0]; + const body = request.requestBody as unknown as Uint8Array; + assert.doesNotThrow( + () => JSON.parse(new TextDecoder().decode(body)), + 'expected requestBody to be in JSON format, but parsing failed' + ); }); }); }); diff --git a/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts deleted file mode 100644 index 11facc4402e..00000000000 --- a/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import { VERSION } from '@opentelemetry/core'; -import { - IAnyValue, - IExportLogsServiceRequest, - IKeyValue, - ILogRecord, - IResource, -} from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; - -export const mockedReadableLogRecord: ReadableLogRecord = { - resource: Resource.default().merge( - new Resource({ - 'resource-attribute': 'some resource-attr value', - }) - ), - instrumentationScope: { - name: 'scope_name_1', - version: '0.1.0', - schemaUrl: 'http://url.to.schema', - }, - hrTime: [1680253513, 123241635] as HrTime, - hrTimeObserved: [1680253513, 123241635] as HrTime, - attributes: { - 'some-attribute': 'some attribute value', - }, - droppedAttributesCount: 0, - severityNumber: SeverityNumber.ERROR, - severityText: 'error', - body: 'some_log_body', - spanContext: { - traceFlags: TraceFlags.SAMPLED, - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - }, -}; -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'some-attribute', - value: { - stringValue: 'some attribute value', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedBodyIsCorrect(body?: IAnyValue) { - assert.deepStrictEqual( - body, - { stringValue: 'some_log_body' }, - 'exported attributes are incorrect' - ); -} - -export function ensureExportedLogRecordIsCorrect(logRecord: ILogRecord) { - ensureExportedBodyIsCorrect(logRecord.body); - ensureExportedAttributesAreCorrect(logRecord.attributes); - assert.deepStrictEqual( - logRecord.timeUnixNano, - '1680253513123241635', - 'timeUnixNano is wrong' - ); - assert.deepStrictEqual( - logRecord.observedTimeUnixNano, - '1680253513123241635', - 'observedTimeUnixNano is wrong' - ); - assert.strictEqual( - logRecord.severityNumber, - SeverityNumber.ERROR, - 'severityNumber is wrong' - ); - assert.strictEqual(logRecord.severityText, 'error', 'severityText is wrong'); - assert.strictEqual( - logRecord.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(logRecord.flags, TraceFlags.SAMPLED, 'flags is wrong'); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'resource-attribute', - value: { - stringValue: 'some resource-attr value', - value: 'stringValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureExportLogsServiceRequestIsSet( - json: IExportLogsServiceRequest -) { - const resourceLogs = json.resourceLogs; - assert.strictEqual(resourceLogs?.length, 1, 'resourceLogs is missing'); - - const resource = resourceLogs?.[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeLogs = resourceLogs?.[0].scopeLogs; - assert.strictEqual(scopeLogs?.length, 1, 'scopeLogs is missing'); - - const scope = scopeLogs?.[0].scope; - assert.ok(scope, 'scope is missing'); - - const logRecords = scopeLogs?.[0].logRecords; - assert.strictEqual(logRecords?.length, 1, 'logs are missing'); -} diff --git a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts index 726be702fa3..b746f83db2b 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts @@ -14,182 +14,31 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; import { OTLPLogExporter } from '../../src/platform/node'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; import { - ensureExportLogsServiceRequestIsSet, - ensureExportedLogRecordIsCorrect, - mockedReadableLogRecord, -} from '../logHelper'; -import { PassThrough, Stream } from 'stream'; -import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { ExportResultCode } from '@opentelemetry/core'; -import { VERSION } from '../../src/version'; + LoggerProvider, + SimpleLogRecordProcessor, +} from '@opentelemetry/sdk-logs'; +import { Stream } from 'stream'; -let fakeRequest: PassThrough; - -class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ describe('OTLPLogExporter', () => { - let envSource: Record; - let collectorExporter: OTLPLogExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let logs: ReadableLogRecord[]; - - afterEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.restore(); - }); - - if (global.process?.versions?.node === undefined) { - envSource = globalThis as unknown as Record; - } else { - envSource = process.env as Record; - } - - describe('constructor', () => { - it('should create an instance', () => { - const exporter = new OTLPLogExporter(); - assert.ok(exporter instanceof OTLPLogExporter); - }); - - it('should include user-agent header by default', () => { - const exporter = new OTLPLogExporter(); - assert.strictEqual( - exporter['_transport']['_transport']['_parameters']['headers'][ - 'User-Agent' - ], - `OTel-OTLP-Exporter-JavaScript/${VERSION}` - ); - }); - - it('should use headers defined via env', () => { - envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS = 'foo=bar'; - const exporter = new OTLPLogExporter(); - assert.strictEqual( - exporter['_transport']['_transport']['_parameters']['headers']['foo'], - 'bar' - ); - delete envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS; - }); - - it('should override headers defined via env with headers defined in constructor', () => { - envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar,bar=foo'; - const exporter = new OTLPLogExporter({ - headers: { - foo: 'constructor', - }, - }); - assert.strictEqual( - exporter['_transport']['_transport']['_parameters']['headers']['foo'], - 'constructor' - ); - assert.strictEqual( - exporter['_transport']['_transport']['_parameters']['headers']['bar'], - 'foo' - ); - envSource.OTEL_EXPORTER_OTLP_HEADERS = ''; - }); - }); - describe('export', () => { - beforeEach(() => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); - }); afterEach(() => { sinon.restore(); }); - it('should open the connection', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - collectorExporter.export(logs, () => {}); - }); - - it('should set custom headers', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.headers['foo'], 'bar'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - - collectorExporter.export(logs, () => {}); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.agent.keepAlive, true); - assert.strictEqual(options.agent.options.keepAliveMsecs, 2000); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - - collectorExporter.export(logs, () => {}); - }); - - it('should successfully send the logs', done => { + it('successfully exports data', done => { const fakeRequest = new Stream.PassThrough(); Object.defineProperty(fakeRequest, 'setTimeout', { value: function (_timeout: number) {}, @@ -198,64 +47,28 @@ describe('OTLPLogExporter', () => { sinon.stub(http, 'request').returns(fakeRequest as any); let buff = Buffer.from(''); fakeRequest.on('finish', () => { - const responseBody = buff.toString(); - const json = JSON.parse(responseBody) as IExportLogsServiceRequest; - const log1 = json.resourceLogs?.[0].scopeLogs?.[0].logRecords?.[0]; - assert.ok(typeof log1 !== 'undefined', "log doesn't exist"); - ensureExportedLogRecordIsCorrect(log1); - - ensureExportLogsServiceRequestIsSet(json); - - done(); + try { + const requestBody = buff.toString(); + assert.doesNotThrow(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in JSON format, but parsing failed'); + done(); + } catch (e) { + done(e); + } }); fakeRequest.on('data', chunk => { buff = Buffer.concat([buff, chunk]); }); - const clock = sinon.useFakeTimers(); - collectorExporter.export(logs, () => {}); - clock.tick(200); - clock.restore(); - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const spyLoggerError = sinon.stub(diag, 'error'); - - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - }); - return fakeRequest as any; - }); - - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.SUCCESS); - assert.strictEqual(spyLoggerError.args.length, 0); - done(); - }); - }); - - it('should log the error message', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - cb(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - return fakeRequest as any; - }); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - // @ts-expect-error verify error code - assert.strictEqual(result.error.code, 400); - done(); - }); + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + loggerProvider.shutdown(); }); }); }); diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 03cbfef2001..67ecc7af792 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -63,10 +63,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -78,12 +78,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -91,13 +91,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts index 470a40f5fb5..91293ce4730 100644 --- a/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts @@ -16,28 +16,28 @@ import { OTLPExporterConfigBase, - OTLPExporterBrowserBase, + OTLPExporterBase, } from '@opentelemetry/otlp-exporter-base'; -import { - IExportLogsServiceResponse, - ProtobufLogsSerializer, -} from '@opentelemetry/otlp-transformer'; +import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; /** * Collector Trace Exporter for Web */ export class OTLPLogExporter - extends OTLPExporterBrowserBase + extends OTLPExporterBase implements LogRecordExporter { constructor(config: OTLPExporterConfigBase = {}) { super( - config, - ProtobufLogsSerializer, - { 'Content-Type': 'application/x-protobuf' }, - 'v1/logs' + createLegacyOtlpBrowserExportDelegate( + config, + ProtobufLogsSerializer, + 'v1/logs', + { 'Content-Type': 'application/x-protobuf' } + ) ); } } diff --git a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts index d897208389e..5afa6cb17a5 100644 --- a/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts @@ -15,38 +15,34 @@ */ import { - OTLPExporterNodeBase, + OTLPExporterBase, OTLPExporterNodeConfigBase, } from '@opentelemetry/otlp-exporter-base'; +import { ProtobufLogsSerializer } from '@opentelemetry/otlp-transformer'; import { - IExportLogsServiceResponse, - ProtobufLogsSerializer, -} from '@opentelemetry/otlp-transformer'; + convertLegacyHttpOptions, + createOtlpHttpExportDelegate, +} from '@opentelemetry/otlp-exporter-base/node-http'; import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; import { VERSION } from '../../version'; -const USER_AGENT = { - 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, -}; - /** - * Collector Trace Exporter for Node + * OTLP Log Protobuf Exporter for Node.js */ export class OTLPLogExporter - extends OTLPExporterNodeBase + extends OTLPExporterBase implements LogRecordExporter { constructor(config: OTLPExporterNodeConfigBase = {}) { super( - config, - ProtobufLogsSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/x-protobuf', - }, - 'LOGS', - 'v1/logs' + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config, 'LOGS', 'v1/logs', { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + 'Content-Type': 'application/x-protobuf', + }), + ProtobufLogsSerializer + ) ); } } diff --git a/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogExporter.test.ts index 29ed48ff4a8..dc6ffc2665c 100644 --- a/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogExporter.test.ts @@ -13,26 +13,82 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import * as assert from 'assert'; import * as sinon from 'sinon'; -import { OTLPLogExporter } from '../../src/platform/browser/index'; - -describe('OTLPLogExporter - web', () => { - let collectorLogsExporter: OTLPLogExporter; - describe('constructor', () => { - beforeEach(() => { - const collectorExporterConfig = { - hostname: 'foo', - url: 'http://foo.bar.com', - }; - collectorLogsExporter = new OTLPLogExporter(collectorExporterConfig); - }); - afterEach(() => { - sinon.restore(); + +import { OTLPLogExporter } from '../../src/platform/browser'; +import { + LoggerProvider, + SimpleLogRecordProcessor, +} from '@opentelemetry/sdk-logs'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ + +describe('OTLPLogExporter', function () { + afterEach(() => { + sinon.restore(); + }); + + describe('export', function () { + describe('when sendBeacon is available', function () { + it('should successfully send data using sendBeacon', async function () { + // arrange + const stubBeacon = sinon.stub(navigator, 'sendBeacon'); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); + + // act + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + await loggerProvider.shutdown(); + + // assert + const args = stubBeacon.args[0]; + const blob: Blob = args[1] as unknown as Blob; + const body = await blob.text(); + assert.throws( + () => JSON.parse(body), + 'expected requestBody to be in protobuf format, but parsing as JSON succeeded' + ); + }); }); - it('should create an instance', () => { - assert.ok(typeof collectorLogsExporter !== 'undefined'); + + describe('when sendBeacon is not available', function () { + beforeEach(function () { + // fake sendBeacon not being available + (window.navigator as any).sendBeacon = false; + }); + + it('should successfully send data using XMLHttpRequest', async function () { + // arrange + const server = sinon.fakeServer.create(); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); + + // act + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + queueMicrotask(() => { + // simulate success response + server.requests[0].respond(200, {}, ''); + }); + await loggerProvider.shutdown(); + + // assert + const request = server.requests[0]; + const body = request.requestBody as unknown as Uint8Array; + assert.throws( + () => JSON.parse(new TextDecoder().decode(body)), + 'expected requestBody to be in protobuf format, but parsing as JSON succeeded' + ); + }); }); }); }); diff --git a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts deleted file mode 100644 index c5a110ca1ac..00000000000 --- a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import { VERSION } from '@opentelemetry/core'; -import { - IAnyValue, - IExportLogsServiceRequest, - IKeyValue, - ILogRecord, - IResource, -} from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { Stream } from 'stream'; - -export const mockedReadableLogRecord: ReadableLogRecord = { - resource: Resource.default().merge( - new Resource({ - 'resource-attribute': 'some resource-attr value', - }) - ), - instrumentationScope: { - name: 'scope_name_1', - version: '0.1.0', - schemaUrl: 'http://url.to.schema', - }, - hrTime: [1680253513, 123241635] as HrTime, - hrTimeObserved: [1680253513, 123241635] as HrTime, - attributes: { - 'some-attribute': 'some attribute value', - }, - droppedAttributesCount: 0, - severityNumber: SeverityNumber.ERROR, - severityText: 'error', - body: 'some_log_body', - spanContext: { - traceFlags: TraceFlags.SAMPLED, - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - }, -}; -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'some-attribute', - value: { - stringValue: 'some attribute value', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedBodyIsCorrect(body?: IAnyValue) { - assert.deepStrictEqual( - body, - { stringValue: 'some_log_body' }, - 'exported attributes are incorrect' - ); -} - -export function ensureExportedLogRecordIsCorrect(logRecord: ILogRecord) { - ensureExportedBodyIsCorrect(logRecord.body); - ensureExportedAttributesAreCorrect(logRecord.attributes); - assert.strictEqual( - logRecord.timeUnixNano, - '1680253513123241635', - 'timeUnixNano is wrong' - ); - assert.strictEqual( - logRecord.observedTimeUnixNano, - '1680253513123241635', - 'observedTimeUnixNano is wrong' - ); - assert.strictEqual( - logRecord.severityNumber, - 'SEVERITY_NUMBER_ERROR', - 'severityNumber is wrong' - ); - assert.strictEqual(logRecord.severityText, 'error', 'severityText is wrong'); - assert.strictEqual( - logRecord.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(logRecord.flags, TraceFlags.SAMPLED, 'flags is wrong'); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'resource-attribute', - value: { - stringValue: 'some resource-attr value', - value: 'stringValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureExportLogsServiceRequestIsSet( - json: IExportLogsServiceRequest -) { - const resourceLogs = json.resourceLogs; - assert.strictEqual(resourceLogs?.length, 1, 'resourceLogs is missing'); - - const resource = resourceLogs?.[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeLogs = resourceLogs?.[0].scopeLogs; - assert.strictEqual(scopeLogs?.length, 1, 'scopeLogs is missing'); - - const scope = scopeLogs?.[0].scope; - assert.ok(scope, 'scope is missing'); - - const logRecords = scopeLogs?.[0].logRecords; - assert.strictEqual(logRecords?.length, 1, 'logs are missing'); -} - -export class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} diff --git a/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts index 475b00ad741..7bb6b9ee4e3 100644 --- a/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts @@ -14,333 +14,61 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; -import { Stream, PassThrough } from 'stream'; -import * as zlib from 'zlib'; -import { OTLPLogExporter } from '../../src'; -import { - ensureExportLogsServiceRequestIsSet, - ensureExportedLogRecordIsCorrect, - mockedReadableLogRecord, - MockedResponse, -} from '../logHelper'; -import { - CompressionAlgorithm, - OTLPExporterNodeConfigBase, - OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { Root } from 'protobufjs'; -import * as path from 'path'; - -let fakeRequest: PassThrough; -const dir = path.resolve(__dirname, '../../../otlp-transformer/protos'); -const root = new Root(); -root.resolvePath = function (origin, target) { - return `${dir}/${target}`; -}; -const proto = root.loadSync([ - 'opentelemetry/proto/common/v1/common.proto', - 'opentelemetry/proto/resource/v1/resource.proto', - 'opentelemetry/proto/logs/v1/logs.proto', - 'opentelemetry/proto/collector/logs/v1/logs_service.proto', -]); -const exportRequestServiceProto = proto?.lookupType('ExportLogsServiceRequest'); - -describe('OTLPLogExporter - node with proto over http', () => { - let collectorExporter: OTLPLogExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let logs: ReadableLogRecord[]; +import { OTLPLogExporter } from '../../src/platform/node'; +import { + LoggerProvider, + SimpleLogRecordProcessor, +} from '@opentelemetry/sdk-logs'; +import { Stream } from 'stream'; - afterEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.restore(); - }); +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ +describe('OTLPLogExporter', () => { describe('export', () => { - beforeEach(() => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); - }); afterEach(() => { sinon.restore(); }); - it('should open the connection', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - collectorExporter.export(logs, () => {}); - }); - - it('should set custom headers', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.headers['foo'], 'bar'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - collectorExporter.export(logs, () => {}); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.agent.keepAlive, true); - assert.strictEqual(options.agent.options.keepAliveMsecs, 2000); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - collectorExporter.export(logs, () => {}); - }); - - it('should successfully send the logs', done => { + it('successfully exports data', done => { const fakeRequest = new Stream.PassThrough(); Object.defineProperty(fakeRequest, 'setTimeout', { value: function (_timeout: number) {}, }); - sinon.stub(http, 'request').returns(fakeRequest as any); - - let buff = Buffer.from(''); - fakeRequest.on('end', () => { - const data = exportRequestServiceProto.decode(buff); - const json = data?.toJSON() as IExportLogsServiceRequest; - const log1 = json.resourceLogs?.[0].scopeLogs?.[0].logRecords?.[0]; - assert.ok(typeof log1 !== 'undefined', "log doesn't exist"); - ensureExportedLogRecordIsCorrect(log1); - - ensureExportLogsServiceRequestIsSet(json); - - done(); - }); - fakeRequest.on('data', chunk => { - buff = Buffer.concat([buff, chunk]); - }); - - const clock = sinon.useFakeTimers(); - collectorExporter.export(logs, () => {}); - clock.tick(200); - clock.restore(); - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const spyLoggerError = sinon.stub(diag, 'error'); - - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - }); - return fakeRequest as any; - }); - - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.SUCCESS); - assert.strictEqual(spyLoggerError.args.length, 0); - done(); - }); - }); - - it('should log the error message', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - cb(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - // @ts-expect-error verify error code - assert.strictEqual(result.error.code, 400); - done(); - }); - }); - }); - describe('export - with compression', () => { - beforeEach(() => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - compression: CompressionAlgorithm.GZIP, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); - }); - afterEach(() => { - sinon.restore(); - }); - - it('should successfully send the logs', done => { - const fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); sinon.stub(http, 'request').returns(fakeRequest as any); - const spySetHeader = sinon.spy(); - (fakeRequest as any).setHeader = spySetHeader; - let buff = Buffer.from(''); - fakeRequest.on('end', () => { - const unzippedBuff = zlib.gunzipSync(buff); - const data = exportRequestServiceProto.decode(unzippedBuff); - const json = data?.toJSON() as IExportLogsServiceRequest; - const log1 = json.resourceLogs?.[0].scopeLogs?.[0].logRecords?.[0]; - assert.ok(typeof log1 !== 'undefined', "log doesn't exist"); - ensureExportedLogRecordIsCorrect(log1); - - ensureExportLogsServiceRequestIsSet(json); - assert.ok(spySetHeader.calledWith('Content-Encoding', 'gzip')); - - done(); + fakeRequest.on('finish', () => { + try { + const requestBody = buff.toString(); + assert.throws(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in protobuf format, but parsing as JSON succeeded'); + done(); + } catch (e) { + done(e); + } }); fakeRequest.on('data', chunk => { buff = Buffer.concat([buff, chunk]); }); - const clock = sinon.useFakeTimers(); - collectorExporter.export(logs, () => {}); - clock.tick(200); - clock.restore(); - }); - }); -}); - -describe('export - real http request destroyed before response received', () => { - let collectorExporter: OTLPLogExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let logs: ReadableLogRecord[]; - const server = http.createServer((_, res) => { - setTimeout(() => { - res.statusCode = 200; - res.end(); - }, 1000); - }); - before(done => { - server.listen(8082, done); - }); - after(done => { - server.close(done); - }); - it('should log the timeout request error message when timeout is 1', done => { - collectorExporterConfig = { - url: 'http://localhost:8082', - timeoutMillis: 1, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); - - collectorExporter.export(logs, result => { - try { - assert.strictEqual(result.code, ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); - } catch (e) { - done(e); - } - }); - }); - it('should log the timeout request error message when timeout is 100', done => { - collectorExporterConfig = { - url: 'http://localhost:8082', - timeoutMillis: 100, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); - - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); - }); - }); -}); - -describe('export - real http request destroyed after response received', () => { - let collectorExporter: OTLPLogExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let logs: ReadableLogRecord[]; - - const server = http.createServer((_, res) => { - res.write('writing something'); - }); - before(done => { - server.listen(8082, done); - }); - after(done => { - server.close(done); - }); - it('should log the timeout request error message', done => { - collectorExporterConfig = { - url: 'http://localhost:8082', - timeoutMillis: 300, - }; - collectorExporter = new OTLPLogExporter(collectorExporterConfig); - logs = []; - logs.push(Object.assign({}, mockedReadableLogRecord)); + const loggerProvider = new LoggerProvider(); + loggerProvider.addLogRecordProcessor( + new SimpleLogRecordProcessor(new OTLPLogExporter()) + ); - collectorExporter.export(logs, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); + loggerProvider.getLogger('test-logger').emit({ body: 'test-body' }); + loggerProvider.shutdown(); }); }); }); diff --git a/experimental/packages/exporter-trace-otlp-grpc/README.md b/experimental/packages/exporter-trace-otlp-grpc/README.md index 09bb155c657..a18a7a787bf 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/README.md +++ b/experimental/packages/exporter-trace-otlp-grpc/README.md @@ -33,9 +33,10 @@ const collectorOptions = { url: 'http://:', }; -const provider = new BasicTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); +const provider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(exporter)] +}); provider.register(); ['SIGINT', 'SIGTERM'].forEach(signal => { @@ -59,9 +60,10 @@ const collectorOptions = { credentials: grpc.credentials.createSsl(), }; -const provider = new BasicTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); +const provider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(exporter)] +}); provider.register(); ['SIGINT', 'SIGTERM'].forEach(signal => { @@ -100,9 +102,10 @@ const collectorOptions = { metadata, // // an optional grpc.Metadata object to be sent with each request }; -const provider = new BasicTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); +const provider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(exporter)] +}); provider.register(); ['SIGINT', 'SIGTERM'].forEach(signal => { diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index dda793159e9..efa366d787a 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -18,8 +18,7 @@ "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../../scripts/peer-api-check.js", - "align-api-deps": "node ../../../scripts/align-api-deps.js", - "maint:regenerate-test-certs": "cd test/certs && ./regenerate.sh" + "align-api-deps": "node ../../../scripts/align-api-deps.js" }, "keywords": [ "opentelemetry", @@ -50,13 +49,13 @@ "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -67,11 +66,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts index e785475a1d2..daca6f8987d 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts @@ -16,28 +16,28 @@ import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; import { + convertLegacyOtlpGrpcOptions, + createOtlpGrpcExportDelegate, OTLPGRPCExporterConfigNode, - OTLPGRPCExporterNodeBase, } from '@opentelemetry/otlp-grpc-exporter-base'; -import { - IExportTraceServiceResponse, - ProtobufTraceSerializer, -} from '@opentelemetry/otlp-transformer'; +import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; +import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; /** * OTLP Trace Exporter for Node */ export class OTLPTraceExporter - extends OTLPGRPCExporterNodeBase + extends OTLPExporterBase implements SpanExporter { constructor(config: OTLPGRPCExporterConfigNode = {}) { super( - config, - ProtobufTraceSerializer, - 'TraceExportService', - '/opentelemetry.proto.collector.trace.v1.TraceService/Export', - 'TRACES' + createOtlpGrpcExportDelegate( + convertLegacyOtlpGrpcOptions(config, 'TRACES'), + ProtobufTraceSerializer, + 'TraceExportService', + '/opentelemetry.proto.collector.trace.v1.TraceService/Export' + ) ); } } diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts index 801f85a36b9..85b6725c5eb 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts @@ -14,295 +14,85 @@ * limitations under the License. */ -import * as protoLoader from '@grpc/proto-loader'; -import { diag } from '@opentelemetry/api'; +import { OTLPTraceExporter } from '../src'; +import { ServerTestContext, startServer } from './utils'; +import * as assert from 'assert'; import { - BasicTracerProvider, SimpleSpanProcessor, + BasicTracerProvider, } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as crypto from 'crypto'; -import * as fs from 'fs'; -import * as grpc from '@grpc/grpc-js'; -import * as path from 'path'; -import * as sinon from 'sinon'; -import { OTLPTraceExporter } from '../src'; - -import { - ensureExportedSpanIsCorrect, - ensureMetadataIsCorrect, - ensureResourceIsCorrect, - mockedReadableSpan, -} from './traceHelper'; -import * as core from '@opentelemetry/core'; -import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; -import { - IExportTraceServiceRequest, - IResourceSpans, -} from '@opentelemetry/otlp-transformer'; - -const traceServiceProtoPath = - 'opentelemetry/proto/collector/trace/v1/trace_service.proto'; -const includeDirs = [path.resolve(__dirname, '../../otlp-transformer/protos')]; - -const httpAddr = 'https://localhost:1501'; -const udsAddr = 'unix:///tmp/otlp-traces.sock'; - -type TestParams = { - address?: string; - useTLS?: boolean; - metadata?: grpc.Metadata; +const testServiceDefinition = { + export: { + path: '/opentelemetry.proto.collector.trace.v1.TraceService/Export', + requestStream: false, + responseStream: false, + requestSerialize: (arg: Buffer) => { + return arg; + }, + requestDeserialize: (arg: Buffer) => { + return arg; + }, + responseSerialize: (arg: Buffer) => { + return arg; + }, + responseDeserialize: (arg: Buffer) => { + return arg; + }, + }, }; -const metadata = new grpc.Metadata(); -metadata.set('k', 'v'); - -const testCollectorExporter = (params: TestParams) => { - const { address = httpAddr, useTLS, metadata } = params; - return describe(`OTLPTraceExporter - node ${ - useTLS ? 'with' : 'without' - } TLS, ${metadata ? 'with' : 'without'} metadata, target ${address}`, () => { - let collectorExporter: OTLPTraceExporter; - let server: grpc.Server; - let exportedData: IResourceSpans | undefined; - let reqMetadata: grpc.Metadata | undefined; - - before(done => { - server = new grpc.Server(); - protoLoader - .load(traceServiceProtoPath, { - keepCase: false, - longs: String, - enums: String, - defaults: true, - oneofs: true, - includeDirs, - }) - .then((packageDefinition: protoLoader.PackageDefinition) => { - const packageObject: any = - grpc.loadPackageDefinition(packageDefinition); - server.addService( - packageObject.opentelemetry.proto.collector.trace.v1.TraceService - .service, - { - Export: (data: { - request: IExportTraceServiceRequest; - metadata: grpc.Metadata; - }) => { - if (data.request.resourceSpans != null) { - exportedData = data.request.resourceSpans[0]; - } - reqMetadata = data.metadata; - }, - } - ); - const credentials = useTLS - ? grpc.ServerCredentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - [ - { - cert_chain: fs.readFileSync('./test/certs/server.crt'), - private_key: fs.readFileSync('./test/certs/server.key'), - }, - ] - ) - : grpc.ServerCredentials.createInsecure(); - const serverAddr = new URL(address); - server.bindAsync( - serverAddr.protocol === 'https:' ? serverAddr.host : address, - credentials, - () => { - server.start(); - done(); - } - ); - }); - }); - - after(() => { - server.forceShutdown(); - }); - - beforeEach(done => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); - collectorExporter = new OTLPTraceExporter({ - url: address, - credentials, - metadata: metadata, - }); - - const provider = new BasicTracerProvider(); - provider.addSpanProcessor(new SimpleSpanProcessor(collectorExporter)); - done(); - }); - - afterEach(() => { - exportedData = undefined; - reqMetadata = undefined; - sinon.restore(); - }); - - if (useTLS && crypto.X509Certificate) { - it('test certs are valid', () => { - const certPaths = [ - './test/certs/ca.crt', - './test/certs/client.crt', - './test/certs/server.crt', - ]; - certPaths.forEach(certPath => { - const cert = new crypto.X509Certificate(fs.readFileSync(certPath)); - const now = new Date(); - assert.ok( - new Date(cert.validTo) > now, - `TLS cert "${certPath}" is still valid: cert.validTo="${cert.validTo}" (if this fails use 'npm run maint:regenerate-test-certs')` - ); - }); - }); - } - - describe('instance', () => { - it('should warn about headers when using grpc', () => { - // Need to stub/spy on the underlying logger as the 'diag' instance is global - const spyLoggerWarn = sinon.stub(diag, 'warn'); - collectorExporter = new OTLPTraceExporter({ - url: address, - headers: { - foo: 'bar', - }, - }); - const args = spyLoggerWarn.args[0]; - assert.strictEqual(args[0], 'Headers cannot be set when using grpc'); - }); - it('should warn about path in url', () => { - if (new URL(address).protocol === 'unix:') { - // Skip this test for UDS - return; - } - const spyLoggerWarn = sinon.stub(diag, 'warn'); - collectorExporter = new OTLPTraceExporter({ - url: `${address}/v1/trace`, - }); - const args = spyLoggerWarn.args[0]; - assert.strictEqual( - args[0], - 'URL path should not be set when using grpc, the path part of the URL will be ignored.' - ); - }); - }); - - describe('export', () => { - it('should export spans', done => { - const responseSpy = sinon.spy(); - const spans = [Object.assign({}, mockedReadableSpan)]; - collectorExporter.export(spans, responseSpy); - setTimeout(() => { - assert.ok( - typeof exportedData !== 'undefined', - 'resource' + " doesn't exist" - ); - - const spans = exportedData.scopeSpans[0].spans; - const resource = exportedData.resource; - - assert.ok(typeof spans !== 'undefined', 'spans do not exist'); - - ensureExportedSpanIsCorrect(spans[0]); - - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - - ensureResourceIsCorrect(resource); - - ensureMetadataIsCorrect(reqMetadata, params?.metadata); - - done(); - }, 500); - }); - it('should log deadline exceeded error', done => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...) + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + * - `@opentelemetry/otlp-grpc-exporter-base`: gRPC transport + */ +describe('OTLPTraceExporter', function () { + let shutdownHandle: () => void | undefined; + const serverTestContext: ServerTestContext = { + requests: [], + serverResponseProvider: () => { + return { error: null, buffer: Buffer.from([]) }; + }, + }; + + beforeEach(async function () { + shutdownHandle = await startServer( + 'localhost:1501', + testServiceDefinition, + serverTestContext + ); + }); - const collectorExporterWithTimeout = new OTLPTraceExporter({ - url: address, - credentials, - metadata: metadata, - timeoutMillis: 100, - }); + afterEach(function () { + shutdownHandle(); - const responseSpy = sinon.spy(); - const spans = [Object.assign({}, mockedReadableSpan)]; - collectorExporterWithTimeout.export(spans, responseSpy); + // clear context + serverTestContext.requests = []; + serverTestContext.serverResponseProvider = () => { + return { error: null, buffer: Buffer.from([]) }; + }; + }); - setTimeout(() => { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - assert.match( - responseSpy.args[0][0].error.details, - /Deadline exceeded.*/ - ); - done(); - }, 300); - }); + it('successfully exports data', async () => { + // arrange + const tracerProvider = new BasicTracerProvider({ + spanProcessors: [ + new SimpleSpanProcessor( + new OTLPTraceExporter({ + url: 'http://localhost:1501', + }) + ), + ], }); - describe('export - with gzip compression', () => { - beforeEach(() => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); - collectorExporter = new OTLPTraceExporter({ - url: address, - credentials, - metadata: metadata, - compression: CompressionAlgorithm.GZIP, - }); - - const provider = new BasicTracerProvider(); - provider.addSpanProcessor(new SimpleSpanProcessor(collectorExporter)); - }); - it('should successfully send the spans', done => { - const responseSpy = sinon.spy(); - const spans = [Object.assign({}, mockedReadableSpan)]; - collectorExporter.export(spans, responseSpy); - setTimeout(() => { - assert.ok( - typeof exportedData !== 'undefined', - 'resource' + " doesn't exist" - ); - const spans = exportedData.scopeSpans[0].spans; - const resource = exportedData.resource; - assert.ok(typeof spans !== 'undefined', 'spans do not exist'); - ensureExportedSpanIsCorrect(spans[0]); + // act + tracerProvider.getTracer('test-tracer').startSpan('test-span').end(); + await tracerProvider.shutdown(); - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - ensureResourceIsCorrect(resource); - - ensureMetadataIsCorrect(reqMetadata, metadata); - - done(); - }, 500); - }); - }); + // assert + assert.strictEqual(serverTestContext.requests.length, 1); }); -}; - -testCollectorExporter({ useTLS: true }); -testCollectorExporter({ useTLS: false }); -testCollectorExporter({ metadata }); -// skip UDS tests on windows -process.platform !== 'win32' && testCollectorExporter({ address: udsAddr }); +}); diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.crt b/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.crt deleted file mode 100644 index 08075df43be..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFozCCA4ugAwIBAgIUFk1cYj0iRoo2KlsL519xVhA3k/gwDQYJKoZIhvcNAQEL -BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs -ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE -AwwCY2EwHhcNMjQwNjA4MTkxODUwWhcNMjUwNjA4MTkxODUwWjBhMQswCQYDVQQG -EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w -CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ -KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0NqK2IeL6fBwdEyHewWEdpBjCf1QxH -S8ejgJTXcI8mUCijn/Q4Wox3ZNiVAad/y2ETYNRWExo4Z0LUq/KFRrdz4oBcxU0L -lifw5Kbpw4HZk6WzvGw1FhOaOOuCbaBRYJLnVy42AprYfmknvJ1b/iAoOLmYrlJU -JOhtSiOc3rZDq/A301TwLJ96vOVnoJohGf9aqYoP6EVEYSILpaPvRN5dN8HfPbrE -WFElLw1heMEivXajxQ4wEdH3j50lU50NcmUC81629Ca+Dia9yLN+leYjZWhelhv2 -le4k/pqC14CfZ91Xbbb/WfVTnzgSmXdjCDpXKzV6YdGKa3t3uYAcvx2RylMdeco3 -JK9y86dFb2pH/5rAjnKxyE7Hgvs2m9+kD8qP2GT2idcwb7/6jbQm7ivxY8LvGvN6 -G5MhhoSecLFcyLatDhGcsNFAV81GQVZQzj+8riz681zEl7zNmCQEQcyyFaHfYMBm -eD5lzeDUsKXJTwg/toT9ZTSQadjMy4KMFZqsoVpFdf/rpYM8HGuRRJiZwsLAGnNf -Azlua4ctFMJftS4TJrBzEEf6W9nGRdfslLKI56dssULfC5wwtDgYOg1PrQdYrw7m -xa8uBGBDpI5czZfnn8Z3MdMng7yP43f/SyplTk87VuZImGO9nDE9OKdcLj7W2UHH -pD6PfHMR3D4DAgMBAAGjUzBRMB0GA1UdDgQWBBQWSFyaQ5G8Zr9jvMcByugHxZ27 -BjAfBgNVHSMEGDAWgBQWSFyaQ5G8Zr9jvMcByugHxZ27BjAPBgNVHRMBAf8EBTAD -AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBQxq6vBqs+Hoie4syroOc11JeFZYqKpWsA -BxTmjFSVs3RCVk1sf4VW6znX2G5CeBeQHhjnC9j7L45hjeWjbTtx6MT5lPUhRz6D -OU1e+mTl2uAiH+bFV9QGU6UtQmSMmWfSL11wtnGVJnkQyzGc0kTLiDLZpVTYs9eO -9upTexE+C8DsCd7uJ37zp9Od6Oh0MthfB98ab7Hkdts9cc7edZuYdWfWaqwkP6Vp -Icx4asgi8rdG4bdRU1EL87J1ReXheXf+jRLu/bWbNBWC/o6C21abK7DZHrpKv8xf -WeCNw3wczbdQrAQ96FgJwxloIvCjOZKWNI3vAAcB9aEYMTxcCO2iV0Q+ihIIAg7M -kTbkjoKbVWAFDbtdwSDvOVv+G/tfb8E7k5rZrBDvsKCbdaR238LIZITgZ8mtLvS7 -DeWlDL9GlFKxNkz64dgSSxpYTOdZKO2/Dty/0LydmlsSz85GeSYXIPlzAp5Zcg+x -Rs1/zkrWGlnaos9uQj7xKj8B0ltrDLkI0mrX5TFuc9/lbGaJMT3n5jMlcfMUOwgV -3jCo3i2plrxhLE22tK9M26a0NywkCrygRGiu2fgrunQgLTAbC4EyK1crZYoFXyhI -Tq//oOEjNgGF8yvDUDh2R2CndsH+w3+P+Z0IrM3xRCqSWFOEvyOJ7pBfiesUwSbI -nkERQqdGug== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.key b/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.key deleted file mode 100644 index fa1f66e65fc..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/ca.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC9DaitiHi+nwcH -RMh3sFhHaQYwn9UMR0vHo4CU13CPJlAoo5/0OFqMd2TYlQGnf8thE2DUVhMaOGdC -1KvyhUa3c+KAXMVNC5Yn8OSm6cOB2ZOls7xsNRYTmjjrgm2gUWCS51cuNgKa2H5p -J7ydW/4gKDi5mK5SVCTobUojnN62Q6vwN9NU8CyferzlZ6CaIRn/WqmKD+hFRGEi -C6Wj70TeXTfB3z26xFhRJS8NYXjBIr12o8UOMBHR94+dJVOdDXJlAvNetvQmvg4m -vcizfpXmI2VoXpYb9pXuJP6agteAn2fdV222/1n1U584Epl3Ywg6Vys1emHRimt7 -d7mAHL8dkcpTHXnKNySvcvOnRW9qR/+awI5yschOx4L7NpvfpA/Kj9hk9onXMG+/ -+o20Ju4r8WPC7xrzehuTIYaEnnCxXMi2rQ4RnLDRQFfNRkFWUM4/vK4s+vNcxJe8 -zZgkBEHMshWh32DAZng+Zc3g1LClyU8IP7aE/WU0kGnYzMuCjBWarKFaRXX/66WD -PBxrkUSYmcLCwBpzXwM5bmuHLRTCX7UuEyawcxBH+lvZxkXX7JSyiOenbLFC3wuc -MLQ4GDoNT60HWK8O5sWvLgRgQ6SOXM2X55/GdzHTJ4O8j+N3/0sqZU5PO1bmSJhj -vZwxPTinXC4+1tlBx6Q+j3xzEdw+AwIDAQABAoICAA0vNyzHADi3CXvxyZNDSpzM -T8CzXN3K2ReWqQB4V+K71spGwwB6r6HtL6zFE4T1bh8ahV25lQJ2nYj1IPq8Xbas -j8bI8X+Sh8nITIHxeo+DN39OXh0jxKLgVgjiozeThUspdBSGcr8Oyx4VRdupjzr5 -4x7abYnTUXGeMZXzOjr21DZgBk59o3cJzcOn6vTkyxXaYkl9G4M9JhMEQeyBYsmp -MZrFMV5llA0wrSvfONcrT5BHEpaPNqbwf2UDteWViv1Na+CWnMdY6M693JHcCaMv -o8JYGlrf4wvlK5Zl+pZ/R3SRxNaGz2TDDK8R6P8A+pFrA9nqa4j8AMvvCRJMru1H -mvYLaZSQA5sirFH4g4lSz6rlqnVkjhbrDe87mlNcMISAyYmH28OGk6fvmDKJ6EUK -CKl1vCGeib+hGbsAWPskjYj0qvmJFGiPgByuJj1j3da9tRBz9U7FToIge/BQwEOz -nAF7IpxXDuzs9eanLePAf8LvO+/+5QF3pBRpJ6LqF/rAkRTxLgSg5Ebiu9jCIJM0 -Ds8gytM0i5ivHs6JMWTVc0pHGdF9hh9WqgDW1cJGEV8kXzd8w4r46qcoV7C5gTCa -98FE+Chy6k2NyHJD56B8v0HSCJ1+u5uRB6/hXxBJ4P72reaThPhIfsW9AiKI7Fsp -knm56wD8S7vS1tRdxmJRAoIBAQD2vmqfaIXVJeCcNZBYgPUMrJTwVqk7dA/V42hf -ElTsSolxaR5ikKuxb0VYdYDsYWa21N2V8L0kmilNkjhRMW+75bJ20hMLnUeKBCmP -1AjaHoMlmvXE1vKBwDZJgNybh8uo/qCmuVQ1WZJ0mryn+IDJ/OpknTfxBVXV628J -exRAGqHMaeQ2BemidIla1CFiqsH17BOIXFFdWFz9KydmM6LbWSkHg/1wP5MMnpNt -mfCCate7/9quijjitmYzdWM6A/5FFgZEuy7LVFGEtJ2GsrwSx+oelgf6/deYKr6b -qFVBzkRObZX+QDGJA8SCJV3ImQnlHO8jiApUtNtIWAeLcwtTAoIBAQDEJTeIFiQ6 -GxXYeztexjHi94Q2XNz7Pr0vd9hvGc0eVY6Qx5Z77Y3VP8yXgDvZPahIKF4PAC8S -L+96w5coFaP0XJ3eIeG3wVyEIX/Lb4p0PLYXGZeMt85Kf/SUKZsbgqree0m/hjWS -QbUplb4zlAyN+yJ6H08vqV1crA88RKL2bc3bRNjvCZjTUhdekRrhwz2GhBXTLUmd -I1tS8ydYbctQCbK+KpsTMTjY8KMVD24akCz7xFMPJKxda+tatXzkJzWnAmu2Bo9O -gtfYasiSU3SPqJy2q4DaaI+BnFKcqQyQGkyxQLZ4dUrVMqUgMZfwsd647eU6kmQo -QnlXoQiou1yRAoIBAFveX/KERzgqRyvCIcFiGlsisr2ddpslRnQbnJOxTp8/zVbF -jcOjG9oPlOEvttXMGiM+tFYMcU/8eh5gr8lDP9fU2RK2etLbN3SiwhrEFpunuqq4 -vIMSiO5Yc54AdaMO93wvef85h6npdMcnidB8jO8n1NmrU9XQZ7ojU49THSIVCGME -liyrHOcYvr9rthZ3f4oh4M/nl3/K06yLcbryxNMoqkcbFLTDZuvO6xNmuo7EWxir -VW+hFTcMNJc6QLysGfL9FU5n5y9bcJKZcQFi8PWJK5lBwSzpcGk+mQN5tGyw8OvG -j48/tXHPTk4qvXVfzbhZgoxXLYmGYRLZe82nAvMCggEAOWXSrEYeb8qBSAo3w3Io -IwzfabEfEX64ie1+LnTUa24J/CALz1QizyaOTj8+REIgvozhiW46WA4i/D/EOfyr -L9TydZBgpw80bY4IAZYwY/doKbZZfNpEydRL1BegxhokulpFqIAzqQsFYpfpQtqu -GdZFror+9ymOopHPG4nSTl6vgNzSxpB+YkiBgjDgNvSVSonYgSWdhxhTnyB8gQoQ -FunfnnqFSsZ6pjE05/LN+4P5ReubirDmp6fvBWpak8FNmAPDVU7yHL15QGFvNDKr -x2ZGBcaGPGOgqwL9wc5OWNT5YF1ZiEJ6lYzueU9J8St7y44CKHOyT320WIpNKGM7 -oQKCAQEAhNUlKUP6fKrw9sW6q3KSpezQEnwIgFraGMR7t3Mzyy4Hmin+Sh6b4FKy -hklbCbMM2q9hXUQMlKCxpmcOx4VhHWg1gJ5vh9DqofJ9BtLrDeAqxZtiL3kr3xHR -/BKsKopPUgm0zayGXYChnT36m58aFNqSt2OyNee9x3Zdd5YUDkk4rN4cIoxF9yfv -qdEHX0CB8vLw91BHFXUt6vKm9UGpYvT9mg82wyCWI7IR0MU6vGFmmcc6NYaMK52W -fwGQWe8SjbKPYYuXwHzjninSPdsB50Drs1oMttz1kSM7AhbicymRZM9AOKkLlzOh -MKrxFkhV1ynkDphHDFz5xXbumyvCNw== ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.crt b/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.crt deleted file mode 100644 index 80f6c147e74..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NTBaFw0yNTA2MDgxOTE4NTBaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBkNsaWVudDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAp8Llrbwz9XLaS2vrbo8vQB/Ks/kYE7Efh4x3hZFD1IVj -/7scNhBJJTsO3KGmfuKHcJqhCp7zgGeEaF/ciB2V3JmF1+PcmjOGZyWm8etioS3u -qfTkS376b6aZ0Vyl4J10gCYEaiacmYPxXbKTz3T1/iD9cNmATNyiJFiVRHP2ERTW -ROCUnVVguyrHCJVoXEACa7c7lVGfvjMJa56w3X+Ot/JtG1oobhynG33UO9/3S/mJ -qierFt7Q7bvxvn5paBktUO59qTEvDsTmL28Buj4EHjBEpEJvrr5IDGp7Z30/PXxW -Y62l6nifMEa/QX/ExxYtzHl6xLk4Ob38oA8i/rz4N6gJFnVq2dY/lip6L4aKfg9+ -inUkqydrG0188EJbQ8/vd0K4wfdeOITNGSL3IGBNABvJsX0sOx9qJxSTFdNz+PZs -p0reZVcT7AN1yYzYSamvtoI9Sg23ZCVnXTYiUUaLOAoqLxghKLE8sTu3AcNNAuZv -TDoQdMcvyYvvoyYpJNxeY9nPqDrGE5vMGMS3jYzvCtTGtFR0g23/LLC+2B5STjxx -ixMdmGERUz9c5uJjGWw/6oooK85KaQg2ly5QW36xnz84oAiw6ZI9Pw9AnnbC+Uix -+WKjxDn0ZcUtlutxQpn663gkaHnEbS9wfR7sTkMOO94Wb0cLnNdXvbkbgnQQ5oEC -AwEAAaNCMEAwHQYDVR0OBBYEFAJfQgFDvpBqDPTL1enA7y9DQv/UMB8GA1UdIwQY -MBaAFBZIXJpDkbxmv2O8xwHK6AfFnbsGMA0GCSqGSIb3DQEBCwUAA4ICAQA/e4xK -wNft7yqDiY3CXjnyaL2n4m6J736UoM0ijmkJlBYiv1CGmn+CE97CWSoIz3gxPWJs -fe8crVlQXflOm3fvWFzLXqK2026v/Ql1s6GcoG2YCBJLvJYtSrMRUecP48K1qkAA -m0b7nxM5nKx2pvMYMN+TqBEhjOCCAKgRqCZbhO+oN36n1LcGUpjWy2aCg9N3QBq/ -jlZrOC019eiB97HZOmM27hGKmLflIqLklDBG28ANBSk18Nh7AvH9PZ4QWAZBcAmB -RJ5/DncdFooHeQVJYyH28lkdvAruFA8YONWgP4rmwBLGBmaKKw3ZxkghV1XKDfCj -tAlxSLj+WutnKo1E5EML7PAVLhhTfHKx+C7JLjjonyJhr+vozdNSWaYWcaTHMN2l -s+Hadsi1AmLaYbL/9lVVV1+v+IiPlisMAm+T5PBxnxuiuwARBh3UCeFEkSWmpmA4 -EE9RQ3/JKhqGZRMyRg2tlodgOvSyAlXe+h6MbUF8IRgdvXfgrlGEDYVbLOqW6D8K -KNO+1hqNdXKC7am7nDH41JlU5CUxSQISOgRV92IJ3jeGMUF35lfYERlR4E9K2TrT -NXsvLp3Vf7nqfQNhSji3r/hsEEs/ni7fo1SbuaZjX1bGyAGZnMSQMJWyBCeucxsd -WRHY+ANKPbPWedOdaMn3uGBXndUHFMPu6cyk6w== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.csr b/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.csr deleted file mode 100644 index cee04b8bd64..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp -ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCnwuWtvDP1ctpLa+tujy9AH8qz+RgTsR+HjHeFkUPUhWP/uxw2EEkl -Ow7coaZ+4odwmqEKnvOAZ4RoX9yIHZXcmYXX49yaM4ZnJabx62KhLe6p9ORLfvpv -ppnRXKXgnXSAJgRqJpyZg/FdspPPdPX+IP1w2YBM3KIkWJVEc/YRFNZE4JSdVWC7 -KscIlWhcQAJrtzuVUZ++MwlrnrDdf4638m0bWihuHKcbfdQ73/dL+YmqJ6sW3tDt -u/G+fmloGS1Q7n2pMS8OxOYvbwG6PgQeMESkQm+uvkgMantnfT89fFZjraXqeJ8w -Rr9Bf8THFi3MeXrEuTg5vfygDyL+vPg3qAkWdWrZ1j+WKnovhop+D36KdSSrJ2sb -TXzwQltDz+93QrjB9144hM0ZIvcgYE0AG8mxfSw7H2onFJMV03P49mynSt5lVxPs -A3XJjNhJqa+2gj1KDbdkJWddNiJRRos4CiovGCEosTyxO7cBw00C5m9MOhB0xy/J -i++jJikk3F5j2c+oOsYTm8wYxLeNjO8K1Ma0VHSDbf8ssL7YHlJOPHGLEx2YYRFT -P1zm4mMZbD/qiigrzkppCDaXLlBbfrGfPzigCLDpkj0/D0CedsL5SLH5YqPEOfRl -xS2W63FCmfrreCRoecRtL3B9HuxOQw473hZvRwuc11e9uRuCdBDmgQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAIfdI8Jw6v7jkdfyelY4NCq00cSryok0m4AqRcOx -9oYclU7+vYsqiUU7IWGaU4POfPTJEj4iRK76fR2uoTSxrggRuXlKw7BWHZAL2O2r -14/e6M4dZuGTGoEJX6K+N4OBA0BhB8NreQZ90uGXmD/tp0wutSHVizpiP+JStUhY -UzMt7jv/iRiCeOMBXecU7KgymCyfIcTxdYo2yXZUnnveBGIobFTWHB1N27rO5iao -69RJWIM16btOISmIRdy6kpTNuYRentmas+6oFZnrIN7EOjhZL1NnUsUkv+6URADS -Z+z+8Xac2M10GLNXJaqoOHXN/zks0LPX2ewEEUaeTVajs93urMGw+w9waeIU5YpE -Smp3KGehthb7Mpu7/CeaowVSekeOTR4xcAvCeLJ1pf+UJscXnCYSPkajzCxAXMzR -76Aruzoigk4DGVAYfPQuTdD+Ap397LUI8MbhoZQ6UEfvslubblOAoHzTqLxJ3WWt -/QhuDBQVWoHtIArkPP9kI6PFstwUw+HW5nctO7HQeCBQ7FKHlFEgCUSFedbZNy9A -daGXHM53IqDA2jpnkujLoGOxLQV3IsymoKGTyFOxP2AJMeAiKYG+xTUxHYCp4Z99 -cM/bPRQJKCYECb+ZQ13dLT9uBJdjIH2lve1UYXdyUC9Y8dNwV5Bvht5P87rDZChX -8IR+ ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.key b/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.key deleted file mode 100644 index 7681e0a5e7e..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/client.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCnwuWtvDP1ctpL -a+tujy9AH8qz+RgTsR+HjHeFkUPUhWP/uxw2EEklOw7coaZ+4odwmqEKnvOAZ4Ro -X9yIHZXcmYXX49yaM4ZnJabx62KhLe6p9ORLfvpvppnRXKXgnXSAJgRqJpyZg/Fd -spPPdPX+IP1w2YBM3KIkWJVEc/YRFNZE4JSdVWC7KscIlWhcQAJrtzuVUZ++Mwlr -nrDdf4638m0bWihuHKcbfdQ73/dL+YmqJ6sW3tDtu/G+fmloGS1Q7n2pMS8OxOYv -bwG6PgQeMESkQm+uvkgMantnfT89fFZjraXqeJ8wRr9Bf8THFi3MeXrEuTg5vfyg -DyL+vPg3qAkWdWrZ1j+WKnovhop+D36KdSSrJ2sbTXzwQltDz+93QrjB9144hM0Z -IvcgYE0AG8mxfSw7H2onFJMV03P49mynSt5lVxPsA3XJjNhJqa+2gj1KDbdkJWdd -NiJRRos4CiovGCEosTyxO7cBw00C5m9MOhB0xy/Ji++jJikk3F5j2c+oOsYTm8wY -xLeNjO8K1Ma0VHSDbf8ssL7YHlJOPHGLEx2YYRFTP1zm4mMZbD/qiigrzkppCDaX -LlBbfrGfPzigCLDpkj0/D0CedsL5SLH5YqPEOfRlxS2W63FCmfrreCRoecRtL3B9 -HuxOQw473hZvRwuc11e9uRuCdBDmgQIDAQABAoICAAC8DJiDFicRhRSECYXgprLh -ZP3rywOhPGTz4T8RkljWak3oEgxEHRAdOOc1i8l2V3rvfGVfLbskYz+Z1p6jhJV2 -Vk4++67WfhS0BvOStqg0pj7Qk4rUs92gc3SS9PLlLdbgIduJdKvdNLTU0QsmoVid -gyTvZ+5+Oggk3z3NXa88ENm8m4G/LgJNcWvEPNRihOzmc3FvPMKsEY1hhKDuIWam -wBMCSOJuuNFzNjGRIQZKpY2DncLKlsD6NHTJGZPVx9uRYnluSrlNkwOZWQwYkQ2m -/g6KKH2qMGkeJ3L8GAkzGYWmdlxlZ0VVSweUmtcgpj3DIjRUTFJ0srVbcfaVgxRl -i2OBx13bGJ4ZrP3NJBx1uOrldrlRFjANIvBIo5zGF+tUbLkB7wMn5oBfgmdE50+o -yOVKj2Io7SW5Wmc1tSU9fcEFvs40A79UgAO/BBo8/n8GFxmtOq/WPo/aGy9btj2H -vP1fWzLRs6zXwpnFvz13+frihsj/7WNcrK75j/EGk7BmCVLzVandTqP9ReiTLSTv -aipJF/5qVqEF9ytyr1cw4BJNNyl9JfM0BpqxLMYo33JtFc8mg1zlJKPooihuToaK -3aPCMMOT5ACRDpyr5gumLHTDKRKjFdX7esAroUUAs+nbfH/dVm8nJIQJtoz9IRpc -oWIpig38if+LaWpKzgQpAoIBAQDjaxBUNKW3zE4VppR9L2BT152rLSu5IM/9DDy4 -1MojD9MlZtfUx7MEt7zib//1c6q5PMByB1GY8MWcsBywRCANYuJg9ffRn3QdrmRc -6KiBRyah9Zu0Ytg+4GfHQuvFq8YhzBkvDDR/EgQ0Lekwaf1waE/oh/q0UKzrXt1U -KgajMp6DMfL/Vag00hVYlgnGfwpW8o9oMOJpHMF/nj7ayQWNLKgQvkDgw3M9anwy -ibmr/BxNCvIql0LUCzvN1WRsgtEcqDOLwYnxIYXrTSU88IWeL19Oj2fSsuZeJx9J -vnKd5qR2pmyAW6wQoTl8DujThmr68V08w1L0jvf3hqAmJ0a5AoIBAQC82G/WqeEi -Y9ykm+wZeNvnzWOphwbMhwfclnNazxUBeHf4WyAobzqEYkh3Hn7vjlJDJ0J1/pXT -DUhiVHaK7/o9+6xyd66daJ2yME/wkWXJTVfxv7nB2PAqasWHjlvNTwe24KPg80PT -elq5q+XunG6EF0JKQfvtcBG90DimMbtcYaCFj5+Ce33XT6cgrqDiCOrTPIgVGPbK -bOcmHmZSHCiG/tSLlb3a8j7u07a+yFrxaZCQMpODWWrnPXYDh+pUwVy+t02KaHC1 -0wJdSUkA7XsFRdUHuwr+8z9So+M+JtMUSVssi60GPfmMn6a3sOgDf3roAMpz1Doc -oIOVu+bnNboJAoIBAQC6RSQ/xEuECuxeIW34R0jAA5gZ78qjPLP/EPnfbjMOmtSY -Cu93UgZYM+KbGZ9tvMq2JIOAImx8N6G0YC9vVK1oKXlAb9cGtHMYKJH943a5RLzo -5VIeYuO6RHXcKP0SkEqdvh1Wgsmw1uHolz4rsHSskFP7Iv1+maG4u5/PYwjCvSBG -VzAwYUl/0h83ytTA56dhZhV+AqQ/8hSvYb8b1pEce9pAtIRRVOVcBY8qmdIhg0Lu -+6s0pWZQZc8bHdC+bDu5HC/0JZbFkW6uNybsDhlzYlvO7fjdBDlaHvMqpLoeiR5m -LJQsYmnByTxbV57uOmf/mJiEv3t/4mZKMNOVzI/JAoIBACYZbIbcgyVTDGLRalLB -RWyAzYiYS1DcNUPVvrQlb1F6oomiqNw/hIjM413U8zsVdZdCxm/TyxpnZaEg9UGW -pN/4dJQrfTkYsCgRAy+/xc9VIVcOnUV0pQ+JtwxgNjk3ppDIxYdOzPJPjxpCigMX -4FwZ7S/aHB+NKqcm6SbuhaRftej8TuweSgc0dL1tPdwcfHPdlH7dKH0yd3gDThVm -xO5nXy5CKamQkg3Q/N+EwIRQDfBpo8UuNxksFzEjLK2ozTNU+/nelE66oZF8hZQA -VX981TvYCqHhJXdgxSn230MKgbB9BY1q13v9gb8xm72I7Jz9+9peiNLZt3JwFGe1 -OTECggEBAI2p9rMyLqiWz0WuUtFtTwAeNbGeapijieqKe2TCqsYeNXGRd2usXg94 -DyR0EfyBquHazH3pmfHE4yMFr/S2vnszWdQ4ZBluqOQk3E4GXxP/ucHdCrI/3pdk -6EE6Pgj/esQKrzB150UVsNWozYKD/MSog76FkdGcLc6Z+JjiIGUEJYhonuhrV+S3 -U82giIeb7chjCd73CU8P/xr6Dcu13odQLRASMZyeh9mBUZf/Bc6tXbkGZmJpFb1h -NFBm7idC907JEWv4tXP9LM5zO5PmsExQu8J26S0LxZSQSvW4mOmhNpQ1CBOQrvPE -oZy6rwoqrtLFacr41Jy5fq4MvMmkxwo= ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/regenerate.sh b/experimental/packages/exporter-trace-otlp-grpc/test/certs/regenerate.sh deleted file mode 100755 index cc052a4effe..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/regenerate.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh -# -# Regenerate certificates that are used for tests using TLS. -# Certs are generated with a one year expiry, so periodic regen is required. -# -# Usage: npm run maint:regenerate-test-certs - -rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key - -openssl genrsa -out ca.key 4096 -openssl req -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" - -openssl genrsa -out server.key 4096 -openssl req -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -in server.key -out server.key - -openssl genrsa -out client.key 4096 -openssl req -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -in client.key -out client.key diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.crt b/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.crt deleted file mode 100644 index db941affc40..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NTBaFw0yNTA2MDgxOTE4NTBaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBlNlcnZlcjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAho9Odc3xj0yN5rlGePl4NG5FAhLeoG4zsPm8Wq/F8tYV -RGNuBv4FbfIwscWc21vN5vxIazlNe+wR9gs+JPXQqetJNBzoKyCnY5JWbUxhD69o -5CqYUifWBML2+9fJlfPDRyLjZ63PaXw1lM+25F46qLC5VYaXcR8+OUf7SIOJnS6n -1ZT1s5038tJdHw3pkep/hwaFuMAXEkAgemL/OOYJw4RSGAIGjXdsbDhTzIHovIwu -LmyAAOivF/FPdTFoMdy08au7t21GMQKSa/eoJ6luMfy67DsqJ5FRFc570ZTjejOq -VeLrxjjEGOHndZy550nIB50+ukmjGwdgEyQZ4Gie2nLckQMfgAPG6LsxixBoAg1B -fm2nRDeEA87+5VWPCBxAJ4WrD24HjxTS0P7gXnAnYC8CxBolw6eGhYE4zrAoC0GQ -tyU5iLdb3J9jbvV/OjHmNcMAbQrOtF+LC+O0YR6TScFyMUQy1DzCPNSjB6LA+bor -Qwu+ixyFlSAWTbd0CbBep1kzBKGbw4WP7oqU06FAibg5TDizZIey6peq3ia+0gaJ -08Y9BiJs0IClDP1zhTtXanjRsIfios9ucYzZiB2yfEKZhblBq8eq/z77ssL/4qDf -czbFm9wcq22Pvsn/sY60UqNkxgfZvUDzhDdXd5EBouUd67KEEW3v6AOy2AG/YYkC -AwEAAaNCMEAwHQYDVR0OBBYEFLqPQPHvLHjqNkPF9ol0NmzXvNqjMB8GA1UdIwQY -MBaAFBZIXJpDkbxmv2O8xwHK6AfFnbsGMA0GCSqGSIb3DQEBCwUAA4ICAQB/E9UK -vxQ6QSjjvwevEAwXcxkGbWNuFhOZGBey+IA9HrZvsvJJa65MMAcuarFbAu9NRVHK -B+xQcEoZaumTv1ehtp/wRcaPQeixnr9ikwrreHho9bWbcLNc1r9zGAV94Mswq8XY -Vu3ZNPYGrrI/m7GBu0piMtgK/PiVcn6CnzfQXrBJmP5zgrJNQjiMVbTXYrD3d521 -Pn0ptnvThWEFJhNlFHZ6arYZslU/rLAiWUiWkEiuTKAPiBNSNrQjqnljVBQA7Q/+ -CguQvSWt174tdMgeesvIHnDSvoC6Esk6P97uFi5fEafTE8fhhkOZeoRfKubj6Pwa -WqU4iRQMEU8NR8BMdHsTweCKL2Rs2mwJFP9fXBW2pKQpfortAIPwO7mW9WUSm92g -KoYG0rh/zkgYpH9KnnZa6yyauD1V2+lx/7y937puiMkUIqHeXVvTv0brDYmg21j/ -oRwO0BIVqwVItL1E9Ir+uas38bq6ij3Nylkn1cqUfuof+FXTj8BIHpvWwA3RRfzC -YZQQu3yd3p2GvSmjHtkP3cDdci8OyxXMcCedYWB0Xnw63XaG2li6RRzGfY0kfxrH -yRGbvxLgpTD3rgFTR2mTDz2Q6UODWriQ7cgmQ8OV+t61v92Di0OnXWVRUCNI+/P9 -xmNKrMU+gfM7amKc4N3oMKZgVtQexHNm7+Geng== ------END CERTIFICATE----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.csr b/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.csr deleted file mode 100644 index 6ac87e971b2..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy -dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCGj051zfGPTI3muUZ4+Xg0bkUCEt6gbjOw+bxar8Xy1hVEY24G/gVt -8jCxxZzbW83m/EhrOU177BH2Cz4k9dCp60k0HOgrIKdjklZtTGEPr2jkKphSJ9YE -wvb718mV88NHIuNnrc9pfDWUz7bkXjqosLlVhpdxHz45R/tIg4mdLqfVlPWznTfy -0l0fDemR6n+HBoW4wBcSQCB6Yv845gnDhFIYAgaNd2xsOFPMgei8jC4ubIAA6K8X -8U91MWgx3LTxq7u3bUYxApJr96gnqW4x/LrsOyonkVEVznvRlON6M6pV4uvGOMQY -4ed1nLnnScgHnT66SaMbB2ATJBngaJ7actyRAx+AA8bouzGLEGgCDUF+badEN4QD -zv7lVY8IHEAnhasPbgePFNLQ/uBecCdgLwLEGiXDp4aFgTjOsCgLQZC3JTmIt1vc -n2Nu9X86MeY1wwBtCs60X4sL47RhHpNJwXIxRDLUPMI81KMHosD5uitDC76LHIWV -IBZNt3QJsF6nWTMEoZvDhY/uipTToUCJuDlMOLNkh7Lql6reJr7SBonTxj0GImzQ -gKUM/XOFO1dqeNGwh+Kiz25xjNmIHbJ8QpmFuUGrx6r/Pvuywv/ioN9zNsWb3Byr -bY++yf+xjrRSo2TGB9m9QPOEN1d3kQGi5R3rsoQRbe/oA7LYAb9hiQIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAA6azFPc6LFR3wm8VkPXwQuAEMk8MwTWdSL/7NGf -tW1AwlXaTVfzD+Q+lDqFCIBeDz783jC8CUzlLwToncQFIKJINE4Df16uX/UDe4Ez -yyKeuyBKGiPPktmgtYKGnzQNXoJmJ4QjWUyZNxR1qojyj/niVc11WJbKjF1xOl9H -RAf0W6HGLwjov68ZcHeaShE7utMPLTxa13LQh66bUGkIW9mtu20y9YRjRf9j3Y3n -56qfRk0f8e/qqnG8EZr+KITm8W3abfDG2onozVYFTWZQ8dJhlYrKmBBoMjnpmG/7 -1DP59Ar+59ikpAtvtbdohhunlcMAcYKfZ/AIb4YcUdjbdMxPgfTEwMso4NL2p1at -B/B26xqjolUz92oqByYn6G+t6MH9O5jDFvgazg1vVRIDXScxWj26VS37JE5qs7o6 -L5mWCc9XJpMocEX3goeFPERvFs6Ar6RH+j+wQQrHB7mIMBoLbxMQz+ZM6xbkwkv9 -JpRTCbbDUNZSC7FzNRDhlj22x4FnDhNOIwsUu8jH+Hm6c4Nudj+uxowdPvjFkF32 -0o4INWpBLY01SNKhkHuzsbbPvSzx3wx7fB2zHZFvQ558bRBc8j8SrxGegOtEiBkF -tMTNObLaMHUAQ0y7izjcqFe2DBq8knc/kY9/QCkD5/0Zb/hYz8VnSvdmY2VrXcOn -bdO+ ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.key b/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.key deleted file mode 100644 index 66969c7f7ca..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/certs/server.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCGj051zfGPTI3m -uUZ4+Xg0bkUCEt6gbjOw+bxar8Xy1hVEY24G/gVt8jCxxZzbW83m/EhrOU177BH2 -Cz4k9dCp60k0HOgrIKdjklZtTGEPr2jkKphSJ9YEwvb718mV88NHIuNnrc9pfDWU -z7bkXjqosLlVhpdxHz45R/tIg4mdLqfVlPWznTfy0l0fDemR6n+HBoW4wBcSQCB6 -Yv845gnDhFIYAgaNd2xsOFPMgei8jC4ubIAA6K8X8U91MWgx3LTxq7u3bUYxApJr -96gnqW4x/LrsOyonkVEVznvRlON6M6pV4uvGOMQY4ed1nLnnScgHnT66SaMbB2AT -JBngaJ7actyRAx+AA8bouzGLEGgCDUF+badEN4QDzv7lVY8IHEAnhasPbgePFNLQ -/uBecCdgLwLEGiXDp4aFgTjOsCgLQZC3JTmIt1vcn2Nu9X86MeY1wwBtCs60X4sL -47RhHpNJwXIxRDLUPMI81KMHosD5uitDC76LHIWVIBZNt3QJsF6nWTMEoZvDhY/u -ipTToUCJuDlMOLNkh7Lql6reJr7SBonTxj0GImzQgKUM/XOFO1dqeNGwh+Kiz25x -jNmIHbJ8QpmFuUGrx6r/Pvuywv/ioN9zNsWb3ByrbY++yf+xjrRSo2TGB9m9QPOE -N1d3kQGi5R3rsoQRbe/oA7LYAb9hiQIDAQABAoICACUhPiE7psBH+5AC5/NRw12U -X+5mjo/uWM0o3FSZ1CFh+ZRZa276gT0Ja25ifRn6hyKJ0uHjegIL7hjamVdRjTaV -+ikrINVluUq8gqS+Qro1SNhM+KMS4veFZOmxbaq3DNeARQfC6kzNPWvGtUzmw4Dw -4vM6pGdOm7jqp+gmg76ftSg2ZmYdp+aVLaT4Dc95yZ7UqemE99jNYSjkUFC/CUqu -JIkDZhN7NKvYDyeLYVFFzSh6QAgALPCKYcaQz5OSt0tIfA/tU0UK1KR+PiRTmFiq -yFmPKd6pNpqx03DNiMebohD5AN49o77J9zh4+sNblJqlRT3aO+ulaVleyNUniU2P -ndSlBnCy6bfUd0KEFNCpL4gN+mfgMrzlEvwv1O/k0MinNIY1qKDGBsqHbokpQQiC -DVZzM/pfG8meJ4ttTWp8HrVHae/QgqVyR8dNW9F03SHe3dxD3dhMqJ76R8SIkuwI -zRhYRu5f/t8Ptmox/xTeK+08aDQD2ksEnDayxH7ux8ULvM+99oBxRJPrVRrBGXuQ -sVQD3aH/U0hBA+uqAE1N4zryfZWng6Uqqh3AP4EmSwNejcqg9edTVVlYPkhTStxW -mtNFWhXsVwlaqyqG0HVKfYi62E0ut8HmuwVgUkUYn6pH9jMIzOjVfeTN15+iqM5x -Cv2fa4SIlxUK8HuFlVTRAoIBAQC6+7nyHCTzLXHFVzS5XL1oUFLLeEPlncMSK7DI -TQQ1xwiB7nAF4IytBckJYWdF5iSswkfMsOfEcri/cEMAPmyUzAfl27UGUCwurE8Y -5B01OhiQIkMwSGu7SVULwH0x22EtM19FJiPXMwvkmNVoQ7gVSmH5xQNDSQnMfZ5P -bx9djrlThmUigZqzL4ZsnymywTj4AQlbj6DrPZmGoWPMwcHFKcbdWvfkN6S8ZABV -29sAvXgo5Mi+bMrRyK6qNgjbgQr86PkcMQr3NCV/2HIIL8Fc19MAkmQ/8TIA5ser -aUlbpOPQD9QbUnUknm3JdtlQuLIM71kfaPy78mNy5whomYOfAoIBAQC4OgUs1Cm5 -wnqNrSpLnYTijAVyeIfJK6jCfTsxkREuqPK7+gpXAvYxj4djuqO0DFHx8jkjWZmm -LN/P3dBq4A2jLo2GnIV1VBWdi3HIEElQfywIzK3Du0g1tl27YADpYp+JhwAgPeo5 -xVZxdn38hhsfHqpAue9qDLZgdgpqoqXC5AizCFzA3kXuG7RHR/draG3+uIGHyHV0 -og5bx3GpJndH/iJ1lnWuP90GkltF1y2Sl/9tTBMfWjTzcg2p9nGz9qvbpL6qzje9 -w7kM0cDJYUHle7emIePDSL2Qt4QuRw5LkWbnQcNzA0Q56I/zDXGnu10Vp/AkGvff -LqUYnfd9RsnXAoIBAQCkdUdFBTASmsPYWC1NY55MI2nPAEZnrOyoDLl+Uw8C5b47 -2aW55ZiVjeMWVw9oUVWshWx1Qpt3E5ge+PRVQJJsBVBlAWsk1Fsn6fHf6LMv35s/ -GoOR8gCfR45/uZvjwBqmkOqYfUVEv+cT9sCs5fMA9t1Zu8h048a0j0AwiYJC3Ydv -SWOmh+uy8nf/Dba1PHGI4BCE8b0Naq6f1U9cBocRjP8WLi6eEbrY3/PTkH39Fqia -/y75HeL9xM6rcr8zoToy3A5Ol2wXpUveOFeDj804hbNWa2u1OcVLObAguYgGDO86 -TtG1/j5+KMJTUi8tamVgLxxqHgM8o6KIq1+f8HXtAoIBAQC0GlTQ3KHmLtCtDSua -POaarBTvMhJdg0c6zD9AV/gaS6TyTKIrKoQRM6ZCw0YjUSATjqB5hLEHmjs79jg5 -I81xSKOnhAGdEJUJLjgQRIvIHGuqNp9yCPexOxYrhtGdWINragWff6gqzleSGStV -4q1FIS+Ek8IRRVhOuVe5pES1YUV38absDuECxSbbwOmLoc5XBX3shvb9DSlIZJUj -rq1SPorltjBaJ6knMZH1l0XAWMSnz4WqUwANN+VP0dSbAX5F/qtARNaNuHiCpdT5 -ixFnDioeSmdmlQhuIFsi+uhozD9zugEfwYPDsS55iR0hw7Re5Y2JXqwRDoLsrBI1 -8SyFAoIBAAMTg8zOCS8IYs00pMRTnWHRqpXDHLOMYZcl2oRdR+/Ijb1KK5oFgBIU -oPu9BrMxK/tiBM/EjymGgedokaNG/IAy91k0HCg4PSdnV6AR7AQvjBRt/1vLaWF6 -XLOBvQc6O5grr8MOVZeJWffsz4rMOxT/2kXAdCDWQp5ym7I215clUh7zq0TfC3XP -x8vpWJ2J6qdxtiiw9HU4WKJbW+VqgWomykdGlYnm6JUXlIKnRrGbHTJGgs8XbObQ -SOVhcNKUL7xh3zpBszDqkviU88/VunRJTvqdAklo6vzwL+Z9fLTFQczR+cn8r485 -nwltH7Jc/hdFyg6QG3p7/28gMdP+oxE= ------END PRIVATE KEY----- diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/traceHelper.ts b/experimental/packages/exporter-trace-otlp-grpc/test/traceHelper.ts deleted file mode 100644 index 62157741a89..00000000000 --- a/experimental/packages/exporter-trace-otlp-grpc/test/traceHelper.ts +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as grpc from '@grpc/grpc-js'; -import { VERSION } from '@opentelemetry/core'; -import { - IEvent, - IKeyValue, - ILink, - IResource, - ISpan, -} from '@opentelemetry/otlp-transformer'; - -const traceIdArr = [ - 31, 16, 8, 220, 142, 39, 14, 133, 196, 10, 13, 124, 57, 57, 178, 120, -]; -const spanIdArr = [94, 16, 114, 97, 246, 79, 165, 62]; -const parentIdArr = [120, 168, 145, 80, 152, 134, 67, 136]; - -export const mockedReadableSpan: ReadableSpan = { - name: 'documentFetch', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: '78a8915098864388', - startTime: [1574120165, 429803070], - endTime: [1574120165, 438688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: { component: 'document-load' }, - links: [ - { - context: { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '78a8915098864388', - traceFlags: TraceFlags.SAMPLED, - }, - attributes: { component: 'document-load' }, - }, - ], - events: [ - { - name: 'fetchStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupEnd', - time: [1574120165, 429803070], - }, - { - name: 'connectStart', - time: [1574120165, 429803070], - }, - { - name: 'connectEnd', - time: [1574120165, 429803070], - }, - { - name: 'requestStart', - time: [1574120165, 435513070], - }, - { - name: 'responseStart', - time: [1574120165, 436923070], - }, - { - name: 'responseEnd', - time: [1574120165, 438688070], - }, - ], - duration: [0, 8885000], - resource: Resource.default().merge( - new Resource({ - service: 'ui', - version: 1, - cost: 112.12, - }) - ), - instrumentationLibrary: { name: 'default', version: '0.0.1' }, - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, -}; - -export function ensureExportedEventsAreCorrect(events: IEvent[]) { - assert.deepStrictEqual( - events, - [ - { - attributes: [], - timeUnixNano: '1574120165429803070', - name: 'fetchStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803070', - name: 'domainLookupStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803070', - name: 'domainLookupEnd', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803070', - name: 'connectStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803070', - name: 'connectEnd', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165435513070', - name: 'requestStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165436923070', - name: 'responseStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165438688070', - name: 'responseEnd', - droppedAttributesCount: 0, - }, - ], - 'exported events are incorrect' - ); -} - -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - value: 'stringValue', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedLinksAreCorrect(attributes: ILink[]) { - assert.deepStrictEqual( - attributes, - [ - { - attributes: [ - { - key: 'component', - value: { - stringValue: 'document-load', - value: 'stringValue', - }, - }, - ], - traceId: Buffer.from(traceIdArr), - spanId: Buffer.from(parentIdArr), - traceState: '', - droppedAttributesCount: 0, - }, - ], - 'exported links are incorrect' - ); -} - -export function ensureExportedSpanIsCorrect(span: ISpan) { - if (span.attributes) { - ensureExportedAttributesAreCorrect(span.attributes); - } - if (span.events) { - ensureExportedEventsAreCorrect(span.events); - } - if (span.links) { - ensureExportedLinksAreCorrect(span.links); - } - assert.deepStrictEqual( - span.traceId, - Buffer.from(traceIdArr), - 'traceId is wrong' - ); - assert.deepStrictEqual( - span.spanId, - Buffer.from(spanIdArr), - 'spanId is wrong' - ); - assert.strictEqual(span.traceState, '', 'traceState is wrong'); - assert.deepStrictEqual( - span.parentSpanId, - Buffer.from(parentIdArr), - 'parentIdArr is wrong' - ); - assert.strictEqual(span.name, 'documentFetch', 'name is wrong'); - assert.strictEqual(span.kind, 'SPAN_KIND_INTERNAL', 'kind is wrong'); - assert.strictEqual( - span.startTimeUnixNano, - '1574120165429803070', - 'startTimeUnixNano is wrong' - ); - assert.strictEqual( - span.endTimeUnixNano, - '1574120165438688070', - 'endTimeUnixNano is wrong' - ); - assert.strictEqual( - span.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(span.droppedEventsCount, 0, 'droppedEventsCount is wrong'); - assert.strictEqual(span.droppedLinksCount, 0, 'droppedLinksCount is wrong'); - assert.deepStrictEqual( - span.status, - { - code: 'STATUS_CODE_OK', - message: '', - }, - 'status is wrong' - ); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'service', - value: { - stringValue: 'ui', - value: 'stringValue', - }, - }, - { - key: 'version', - value: { - intValue: '1', - value: 'intValue', - }, - }, - { - key: 'cost', - value: { - doubleValue: 112.12, - value: 'doubleValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureMetadataIsCorrect( - actual?: grpc.Metadata, - expected?: grpc.Metadata -) { - //ignore user agent - expected?.remove('user-agent'); - actual?.remove('user-agent'); - assert.deepStrictEqual(actual?.getMap(), expected?.getMap() ?? {}); -} diff --git a/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts b/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts new file mode 100644 index 00000000000..8dc6ae14e0c --- /dev/null +++ b/experimental/packages/exporter-trace-otlp-grpc/test/utils.ts @@ -0,0 +1,72 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + Metadata, + Server, + ServerCredentials, + ServiceDefinition, +} from '@grpc/grpc-js'; + +export interface ExportedData { + request: Buffer; + metadata: Metadata; +} + +export interface ServerTestContext { + requests: ExportedData[]; + serverResponseProvider: () => { error: Error | null; buffer?: Buffer }; +} + +/** + * Starts a customizable server that saves all responses to context.responses + * Returns data as defined in context.ServerResponseProvider + * + * @return shutdown handle, needs to be called to ensure that mocha exits + * @param address address to bind to + * @param service service to start + * @param context context for storing responses and to define server behavior. + */ +export function startServer( + address: string, + service: ServiceDefinition, + context: ServerTestContext +): Promise<() => void> { + const server = new Server(); + server.addService(service, { + export: (data: ExportedData, callback: any) => { + context.requests.push(data); + const response = context.serverResponseProvider(); + callback(response.error, response.buffer); + }, + }); + + return new Promise<() => void>((resolve, reject) => { + server.bindAsync( + address, + ServerCredentials.createInsecure(), + (error, port) => { + server.start(); + if (error != null) { + reject(error); + } + resolve(() => { + server.forceShutdown(); + }); + } + ); + }); +} diff --git a/experimental/packages/exporter-trace-otlp-http/README.md b/experimental/packages/exporter-trace-otlp-http/README.md index 770c8dc22dc..427792eff5a 100644 --- a/experimental/packages/exporter-trace-otlp-http/README.md +++ b/experimental/packages/exporter-trace-otlp-http/README.md @@ -36,18 +36,21 @@ const collectorOptions = { concurrencyLimit: 10, // an optional limit on pending requests }; -const provider = new WebTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new BatchSpanProcessor(exporter, { - // The maximum queue size. After the size is reached spans are dropped. - maxQueueSize: 100, - // The maximum batch size of every export. It must be smaller or equal to maxQueueSize. - maxExportBatchSize: 10, - // The interval between two consecutive exports - scheduledDelayMillis: 500, - // How long the export can run before it is cancelled - exportTimeoutMillis: 30000, -})); +const provider = new WebTracerProvider({ + spanProcessors: [ + new BatchSpanProcessor(exporter, { + // The maximum queue size. After the size is reached spans are dropped. + maxQueueSize: 100, + // The maximum batch size of every export. It must be smaller or equal to maxQueueSize. + maxExportBatchSize: 10, + // The interval between two consecutive exports + scheduledDelayMillis: 500, + // How long the export can run before it is cancelled + exportTimeoutMillis: 30000, + }) + ] +}); provider.register(); @@ -67,14 +70,17 @@ const collectorOptions = { concurrencyLimit: 10, // an optional limit on pending requests }; -const provider = new BasicTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new BatchSpanProcessor(exporter, { - // The maximum queue size. After the size is reached spans are dropped. - maxQueueSize: 1000, - // The interval between two consecutive exports - scheduledDelayMillis: 30000, -})); +const provider = new BasicTracerProvider({ + spanProcessors: [ + new BatchSpanProcessor(exporter, { + // The maximum queue size. After the size is reached spans are dropped. + maxQueueSize: 1000, + // The interval between two consecutive exports + scheduledDelayMillis: 30000, + }) + ] +}); provider.register(); diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index d1570027ba9..ff107ad15bf 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,10 +62,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -79,12 +79,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -92,11 +92,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts index 2e03ef845e0..47dff844a06 100644 --- a/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts @@ -17,28 +17,26 @@ import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; import { OTLPExporterConfigBase, - OTLPExporterBrowserBase, + OTLPExporterBase, } from '@opentelemetry/otlp-exporter-base'; -import { - IExportTraceServiceResponse, - JsonTraceSerializer, -} from '@opentelemetry/otlp-transformer'; - -const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; +import { JsonTraceSerializer } from '@opentelemetry/otlp-transformer'; +import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; /** * Collector Trace Exporter for Web */ export class OTLPTraceExporter - extends OTLPExporterBrowserBase + extends OTLPExporterBase implements SpanExporter { constructor(config: OTLPExporterConfigBase = {}) { super( - config, - JsonTraceSerializer, - { 'Content-Type': 'application/json' }, - DEFAULT_COLLECTOR_RESOURCE_PATH + createLegacyOtlpBrowserExportDelegate( + config, + JsonTraceSerializer, + 'v1/traces', + { 'Content-Type': 'application/json' } + ) ); } } diff --git a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts index 8d41df8f0db..9d8b4900a56 100644 --- a/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts @@ -15,33 +15,33 @@ */ import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { IExportTraceServiceResponse } from '@opentelemetry/otlp-transformer'; +import { + OTLPExporterNodeConfigBase, + OTLPExporterBase, +} from '@opentelemetry/otlp-exporter-base'; import { VERSION } from '../../version'; import { JsonTraceSerializer } from '@opentelemetry/otlp-transformer'; - -const USER_AGENT = { - 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, -}; +import { + convertLegacyHttpOptions, + createOtlpHttpExportDelegate, +} from '@opentelemetry/otlp-exporter-base/node-http'; /** * Collector Trace Exporter for Node */ export class OTLPTraceExporter - extends OTLPExporterNodeBase + extends OTLPExporterBase implements SpanExporter { constructor(config: OTLPExporterNodeConfigBase = {}) { super( - config, - JsonTraceSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/json', - }, - 'TRACES', - 'v1/traces' + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config, 'TRACES', 'v1/traces', { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + 'Content-Type': 'application/json', + }), + JsonTraceSerializer + ) ); } } diff --git a/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts deleted file mode 100644 index 9049caf60dc..00000000000 --- a/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts +++ /dev/null @@ -1,633 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as core from '@opentelemetry/core'; -import { diag, DiagLogger, DiagLogLevel } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as sinon from 'sinon'; -import { OTLPTraceExporter } from '../../src/platform/browser/index'; -import { - ensureSpanIsCorrect, - ensureExportTraceServiceRequestIsSet, - ensureWebResourceIsCorrect, - ensureHeadersContain, - mockedReadableSpan, -} from '../traceHelper'; -import { - OTLPExporterConfigBase, - OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; - -describe('OTLPTraceExporter - web', () => { - let collectorTraceExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterConfigBase; - let stubOpen: sinon.SinonStub; - let stubBeacon: sinon.SinonStub; - let spans: ReadableSpan[]; - - beforeEach(() => { - stubOpen = sinon.stub(XMLHttpRequest.prototype, 'open'); - sinon.stub(XMLHttpRequest.prototype, 'send'); - stubBeacon = sinon.stub(navigator, 'sendBeacon'); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); - - afterEach(() => { - sinon.restore(); - }); - - describe('constructor', () => { - beforeEach(() => { - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should create an instance', () => { - assert.ok(typeof collectorTraceExporter !== 'undefined'); - }); - }); - - describe('export', () => { - beforeEach(() => { - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - }); - - describe('when "sendBeacon" is available', () => { - beforeEach(() => { - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should successfully send the spans using sendBeacon', done => { - collectorTraceExporter.export(spans, () => {}); - - setTimeout(async () => { - try { - const args = stubBeacon.args[0]; - const url = args[0]; - const blob: Blob = args[1]; - const body = await blob.text(); - const json = JSON.parse(body) as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureSpanIsCorrect(span1); - - const resource = json.resourceSpans?.[0].resource; - assert.ok( - typeof resource !== 'undefined', - "resource doesn't exist" - ); - ensureWebResourceIsCorrect(resource); - - assert.strictEqual(url, 'http://foo.bar.com'); - assert.strictEqual(stubBeacon.callCount, 1); - - assert.strictEqual(stubOpen.callCount, 0); - - ensureExportTraceServiceRequestIsSet(json); - done(); - } catch (err) { - done(err); - } - }); - }); - - it('should log the successful message', done => { - const spyLoggerDebug = sinon.stub(); - const spyLoggerError = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: spyLoggerDebug, - error: spyLoggerError, - info: nop, - verbose: nop, - warn: nop, - }; - - diag.setLogger(diagLogger, DiagLogLevel.ALL); - - stubBeacon.returns(true); - - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(() => { - try { - const response: any = spyLoggerDebug.args[2][0]; - assert.strictEqual(response, 'SendBeacon success'); - assert.strictEqual(spyLoggerError.args.length, 0); - - done(); - } catch (e) { - done(e); - } - }); - }); - - it('should log the error message', done => { - stubBeacon.returns(false); - - collectorTraceExporter.export(spans, result => { - try { - assert.deepStrictEqual(result.code, ExportResultCode.FAILED); - assert.ok( - result.error, - 'Expected Error, but no Error was present on the result' - ); - assert.match(result.error?.message, /SendBeacon failed/); - done(); - } catch (e) { - done(e); - } - }); - }); - }); - - describe('when "sendBeacon" is NOT available', () => { - let server: any; - let clock: sinon.SinonFakeTimers; - beforeEach(() => { - // fakeTimers is used to replace the next setTimeout which is - // located in sendWithXhr function called by the export method - clock = sinon.useFakeTimers(); - - (window.navigator as any).sendBeacon = false; - server = sinon.fakeServer.create(); - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - afterEach(() => { - server.restore(); - }); - - it('should successfully send the spans using XMLHttpRequest', done => { - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(async () => { - try { - const request = server.requests[0]; - assert.strictEqual(request.method, 'POST'); - assert.strictEqual(request.url, 'http://foo.bar.com'); - - const body = request.requestBody as Blob; - const decoder = new TextDecoder(); - const json = JSON.parse( - decoder.decode(await body.arrayBuffer()) - ) as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureSpanIsCorrect(span1); - - const resource = json.resourceSpans?.[0].resource; - assert.ok( - typeof resource !== 'undefined', - "resource doesn't exist" - ); - ensureWebResourceIsCorrect(resource); - - assert.strictEqual(stubBeacon.callCount, 0); - ensureExportTraceServiceRequestIsSet(json); - - clock.restore(); - done(); - } catch (e) { - done(e); - } - }); - }); - - it('should log the successful message', done => { - const spyLoggerDebug = sinon.stub(); - const spyLoggerError = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: spyLoggerDebug, - error: spyLoggerError, - info: nop, - verbose: nop, - warn: nop, - }; - - diag.setLogger(diagLogger, DiagLogLevel.ALL); - - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(200); - try { - const response: any = spyLoggerDebug.args[2][0]; - assert.strictEqual(response, 'XHR success'); - assert.strictEqual(spyLoggerError.args.length, 0); - assert.strictEqual(stubBeacon.callCount, 0); - clock.restore(); - done(); - } catch (e) { - done(e); - } - }); - }); - - it('should log the error message', done => { - collectorTraceExporter.export(spans, result => { - try { - assert.deepStrictEqual(result.code, ExportResultCode.FAILED); - assert.deepStrictEqual( - result.error?.message, - 'XHR request failed with non-retryable status' - ); - } catch (e) { - done(e); - } - done(); - }); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(400); - }); - }); - - it('should send custom headers', done => { - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(200); - - assert.strictEqual(stubBeacon.callCount, 0); - clock.restore(); - done(); - }); - }); - }); - }); - - describe('export - common', () => { - let spySend: any; - beforeEach(() => { - spySend = sinon.stub(OTLPTraceExporter.prototype, 'send'); - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should export spans as otlpTypes.Spans', done => { - const spans: ReadableSpan[] = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - collectorTraceExporter.export(spans, () => {}); - setTimeout(() => { - const span1 = spySend.args[0][0][0] as ReadableSpan; - assert.deepStrictEqual(spans[0], span1); - done(); - }); - assert.strictEqual(spySend.callCount, 1); - }); - - describe('when exporter is shutdown', () => { - it( - 'should not export anything but return callback with code' + - ' "FailedNotRetryable"', - async () => { - const spans: ReadableSpan[] = []; - spans.push(Object.assign({}, mockedReadableSpan)); - await collectorTraceExporter.shutdown(); - spySend.resetHistory(); - - const callbackSpy = sinon.spy(); - collectorTraceExporter.export(spans, callbackSpy); - const returnCode = callbackSpy.args[0][0]; - - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual(spySend.callCount, 0, 'should not call send'); - } - ); - }); - describe('when an error occurs', () => { - it('should return failed export result', done => { - const spans: ReadableSpan[] = []; - spans.push(Object.assign({}, mockedReadableSpan)); - spySend.throws({ - code: 100, - details: 'Test error', - metadata: {}, - message: 'Non-retryable', - stack: 'Stack', - }); - const callbackSpy = sinon.spy(); - collectorTraceExporter.export(spans, callbackSpy); - setTimeout(() => { - const returnCode = callbackSpy.args[0][0]; - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual( - returnCode.error.message, - 'Non-retryable', - 'return error message is wrong' - ); - assert.strictEqual(spySend.callCount, 1, 'should call send'); - done(); - }); - }); - }); - }); - - describe('export with custom headers', () => { - let server: any; - const customHeaders = { - foo: 'bar', - bar: 'baz', - }; - - beforeEach(() => { - collectorExporterConfig = { - headers: customHeaders, - }; - server = sinon.fakeServer.create(); - }); - - afterEach(() => { - server.restore(); - }); - - describe('when "sendBeacon" is available', () => { - let clock: sinon.SinonFakeTimers; - beforeEach(() => { - // fakeTimers is used to replace the next setTimeout which is - // located in sendWithXhr function called by the export method - clock = sinon.useFakeTimers(); - - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - it('should successfully send custom headers using XMLHTTPRequest', done => { - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(() => { - const [{ requestHeaders }] = server.requests; - - ensureHeadersContain(requestHeaders, customHeaders); - assert.strictEqual(stubBeacon.callCount, 0); - assert.strictEqual(stubOpen.callCount, 0); - - clock.restore(); - done(); - }); - }); - }); - - describe('when "sendBeacon" is NOT available', () => { - let clock: sinon.SinonFakeTimers; - beforeEach(() => { - // fakeTimers is used to replace the next setTimeout which is - // located in sendWithXhr function called by the export method - clock = sinon.useFakeTimers(); - - (window.navigator as any).sendBeacon = false; - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should successfully send spans using XMLHttpRequest', done => { - collectorTraceExporter.export(spans, () => {}); - - queueMicrotask(() => { - const [{ requestHeaders }] = server.requests; - - ensureHeadersContain(requestHeaders, customHeaders); - assert.strictEqual(stubBeacon.callCount, 0); - assert.strictEqual(stubOpen.callCount, 0); - - clock.restore(); - done(); - }); - }); - it('should log the timeout request error message', done => { - const responseSpy = sinon.spy(); - collectorTraceExporter.export(spans, responseSpy); - clock.tick(20000); - clock.restore(); - - setTimeout(() => { - try { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'XHR request timed out'); - done(); - } catch (e) { - done(e); - } - }); - }); - }); - }); - - describe('export - concurrency limit', () => { - it('should error if too many concurrent exports are queued', done => { - const collectorExporterWithConcurrencyLimit = new OTLPTraceExporter({ - ...collectorExporterConfig, - concurrencyLimit: 3, - }); - const spans: ReadableSpan[] = [{ ...mockedReadableSpan }]; - const callbackSpy = sinon.spy(); - for (let i = 0; i < 7; i++) { - collectorExporterWithConcurrencyLimit.export(spans, callbackSpy); - } - - const failures = callbackSpy.args.filter( - ([result]) => result.code === ExportResultCode.FAILED - ); - - setTimeout(() => { - // Expect 4 failures - try { - assert.strictEqual(failures.length, 4); - failures.forEach(([result]) => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - assert.strictEqual( - result.error!.message, - 'Concurrent export limit reached' - ); - }); - done(); - } catch (e) { - done(e); - } - }); - }); - }); -}); - -describe('export with retry - real http request destroyed', () => { - let server: any; - let collectorTraceExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterConfigBase; - let spans: ReadableSpan[]; - - beforeEach(() => { - server = sinon.fakeServer.create({ - autoRespond: true, - }); - collectorExporterConfig = { - timeoutMillis: 1500, - }; - }); - - afterEach(() => { - server.restore(); - }); - - describe('when "sendBeacon" is NOT available', () => { - beforeEach(() => { - (window.navigator as any).sendBeacon = false; - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - it('should log the retryable request error message when retrying with exponential backoff with jitter', done => { - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - let calls = 0; - server.respondWith( - 'http://localhost:4318/v1/traces', - function (xhr: any) { - calls++; - xhr.respond(503); - } - ); - - collectorTraceExporter.export(spans, result => { - try { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual( - error.message, - 'Export failed with retryable status' - ); - assert.strictEqual(calls, 2); - done(); - } catch (e) { - done(e); - } - }); - }).timeout(3000); - - it('should log the timeout request error message when retry-after header is set to 3 seconds', done => { - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - let calls = 0; - server.respondWith( - 'http://localhost:4318/v1/traces', - function (xhr: any) { - calls++; - xhr.respond(503, { 'Retry-After': 0.1 }); - } - ); - - collectorTraceExporter.export(spans, result => { - try { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual( - error.message, - 'Export failed with retryable status' - ); - assert.strictEqual(calls, 6); - done(); - } catch (e) { - done(e); - } - }); - }).timeout(3000); - it('should log the timeout request error message when retry-after header is a date', done => { - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - let retry = 0; - server.respondWith( - 'http://localhost:4318/v1/traces', - function (xhr: any) { - retry++; - const d = new Date(); - d.setSeconds(d.getSeconds() + 0.1); - xhr.respond(503, { 'Retry-After': d }); - } - ); - - collectorTraceExporter.export(spans, result => { - try { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual( - error.message, - 'Export failed with retryable status' - ); - assert.strictEqual(retry, 6); - done(); - } catch (e) { - done(e); - } - }); - }).timeout(3000); - it('should log the timeout request error message when retry-after header is a date with long delay', done => { - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - let retry = 0; - server.respondWith( - 'http://localhost:4318/v1/traces', - function (xhr: any) { - retry++; - const d = new Date(); - d.setSeconds(d.getSeconds() + 120); - xhr.respond(503, { 'Retry-After': d }); - } - ); - - collectorTraceExporter.export(spans, result => { - try { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual( - error.message, - 'Export failed with retryable status' - ); - assert.strictEqual(retry, 1); - done(); - } catch (e) { - done(e); - } - }); - }).timeout(3000); - }); -}); diff --git a/experimental/packages/exporter-trace-otlp-http/test/browser/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/browser/OTLPTraceExporter.test.ts new file mode 100644 index 00000000000..a5ef3ad0023 --- /dev/null +++ b/experimental/packages/exporter-trace-otlp-http/test/browser/OTLPTraceExporter.test.ts @@ -0,0 +1,93 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + BasicTracerProvider, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-base'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import { OTLPTraceExporter } from '../../src/platform/browser/index'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...) + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + * - `@opentelemetry/otlp-grpc-exporter-base`: gRPC transport + */ + +describe('OTLPTraceExporter', () => { + afterEach(() => { + sinon.restore(); + }); + + describe('export', function () { + describe('when sendBeacon is available', function () { + it('should successfully send data using sendBeacon', async function () { + // arrange + const stubBeacon = sinon.stub(navigator, 'sendBeacon'); + const tracerProvider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }); + + // act + tracerProvider.getTracer('test-tracer').startSpan('test-span').end(); + await tracerProvider.shutdown(); + + // assert + const args = stubBeacon.args[0]; + const blob: Blob = args[1] as unknown as Blob; + const body = await blob.text(); + assert.doesNotThrow( + () => JSON.parse(body), + 'expected requestBody to be in JSON format, but parsing failed' + ); + }); + }); + + describe('when sendBeacon is not available', function () { + beforeEach(function () { + // fake sendBeacon not being available + (window.navigator as any).sendBeacon = false; + }); + + it('should successfully send data using XMLHttpRequest', async function () { + // arrange + const server = sinon.fakeServer.create(); + const tracerProvider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }); + + // act + tracerProvider.getTracer('test-tracer').startSpan('test-span').end(); + queueMicrotask(() => { + // simulate success response + server.requests[0].respond(200, {}, ''); + }); + await tracerProvider.shutdown(); + + // assert + const request = server.requests[0]; + const body = request.requestBody as unknown as Uint8Array; + assert.doesNotThrow( + () => JSON.parse(new TextDecoder().decode(body)), + 'expected requestBody to be in JSON format, but parsing failed' + ); + }); + }); + }); +}); diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts deleted file mode 100644 index b36be295346..00000000000 --- a/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts +++ /dev/null @@ -1,447 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { diag, DiagLogger } from '@opentelemetry/api'; -import * as core from '@opentelemetry/core'; -import { - CompressionAlgorithm, - OTLPExporterError, - OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as http from 'http'; -import * as sinon from 'sinon'; -import { PassThrough, Stream } from 'stream'; -import * as zlib from 'zlib'; -import { OTLPTraceExporter } from '../../src/platform/node'; -import { - ensureExportTraceServiceRequestIsSet, - ensureSpanIsCorrect, - mockedReadableSpan, -} from '../traceHelper'; -import { MockedResponse } from './nodeHelpers'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; - -let fakeRequest: PassThrough; - -const address = 'localhost:1501'; - -describe('OTLPTraceExporter - node with json over http', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let stubRequest: sinon.SinonStub; - let spySetHeader: sinon.SinonSpy; - let spans: ReadableSpan[]; - - afterEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.restore(); - }); - - describe('instance', () => { - it('should warn about metadata when using json', () => { - const metadata = 'foo'; - // Need to stub/spy on the underlying logger as the "diag" instance is global - const warnStub = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: nop, - error: nop, - info: nop, - verbose: nop, - warn: warnStub, - }; - diag.setLogger(diagLogger); - - collectorExporter = new OTLPTraceExporter({ - metadata, - url: address, - } as any); - const args = warnStub.args[0]; - assert.strictEqual(args[0], 'Metadata cannot be set when using http'); - }); - }); - - describe('export', () => { - beforeEach(() => { - stubRequest = sinon.stub(http, 'request').returns(fakeRequest as any); - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); - - it('should open the connection', done => { - collectorExporter.export(spans, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - const options = args[0]; - - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - done(); - }); - }); - - it('should set custom headers', done => { - collectorExporter.export(spans, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - const options = args[0]; - assert.strictEqual(options.headers['foo'], 'bar'); - done(); - }); - }); - - it('should not have Content-Encoding header', done => { - collectorExporter.export(spans, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - const options = args[0]; - assert.strictEqual(options.headers['Content-Encoding'], undefined); - done(); - }); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - collectorExporter.export(spans, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - const options = args[0]; - const agent = options.agent; - assert.strictEqual(agent.keepAlive, true); - assert.strictEqual(agent.options.keepAliveMsecs, 2000); - done(); - }); - }); - - it('different http export requests should use the same agent', done => { - const clock = sinon.useFakeTimers(); - collectorExporter.export(spans, () => {}); - - const args = stubRequest.args[0]; - const callback = args[1]; - const mockRes = new MockedResponse(200); - - queueMicrotask(() => { - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - clock.restore(); - - queueMicrotask(() => { - const clock = sinon.useFakeTimers(); - collectorExporter.export(spans, () => {}); - - const mockRes2 = new MockedResponse(200); - const args2 = stubRequest.args[1]; - const callback2 = args2[1]; - - callback2(mockRes); - mockRes2.send(Buffer.from('success')); - - const [firstExportAgent, secondExportAgent] = stubRequest.args.map( - a => a[0].agent - ); - - assert.strictEqual(firstExportAgent, secondExportAgent); - clock.restore(); - done(); - }); - }); - - it('should successfully send the spans', done => { - let buff = Buffer.from(''); - - fakeRequest.on('finish', () => { - const responseBody = buff.toString(); - const json = JSON.parse(responseBody) as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureSpanIsCorrect(span1); - - ensureExportTraceServiceRequestIsSet(json); - - done(); - }); - - fakeRequest.on('data', chunk => { - buff = Buffer.concat([buff, chunk]); - }); - - collectorExporter.export(spans, () => {}); - - const mockRes = new MockedResponse(200); - const args = stubRequest.args[0]; - const callback = args[1]; - - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const stubLoggerError = sinon.stub(diag, 'error'); - const responseSpy = sinon.spy(); - collectorExporter.export(spans, responseSpy); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - setTimeout(() => { - assert.strictEqual(stubLoggerError.args.length, 0); - assert.strictEqual( - responseSpy.args[0][0].code, - core.ExportResultCode.SUCCESS - ); - done(); - }); - }); - }); - - it('should log the error message', done => { - const responseSpy = sinon.spy(); - collectorExporter.export(spans, responseSpy); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - callback(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - setTimeout(() => { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.code, 400); - done(); - }); - }); - }); - }); - - describe('export - with compression', () => { - beforeEach(() => { - stubRequest = sinon.stub(http, 'request').returns(fakeRequest as any); - spySetHeader = sinon.spy(); - (fakeRequest as any).setHeader = spySetHeader; - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - compression: CompressionAlgorithm.GZIP, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); - - it('should successfully send the spans', done => { - let buff = Buffer.from(''); - - fakeRequest.on('finish', () => { - const responseBody = zlib.gunzipSync(buff).toString(); - - const json = JSON.parse(responseBody) as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureSpanIsCorrect(span1); - - ensureExportTraceServiceRequestIsSet(json); - assert.ok(spySetHeader.calledWith('Content-Encoding', 'gzip')); - done(); - }); - - fakeRequest.on('data', chunk => { - buff = Buffer.concat([buff, chunk]); - }); - - collectorExporter.export(spans, () => {}); - - const mockRes = new MockedResponse(200); - const args = stubRequest.args[0]; - const callback = args[1]; - - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - }); - - describe('export - with timeout', () => { - beforeEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - stubRequest = sinon.stub(http, 'request').returns(fakeRequest as any); - spySetHeader = sinon.spy(); - (fakeRequest as any).setHeader = spySetHeader; - (fakeRequest as any).abort = sinon.spy(); - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - timeoutMillis: 100, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); - - it('should log the timeout request error message', done => { - const responseSpy = sinon.spy(); - collectorExporter.export(spans, responseSpy); - - setTimeout(() => { - fakeRequest.emit('error', { code: 'ECONNRESET' }); - - setTimeout(() => { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.deepEqual(error, { code: 'ECONNRESET' }); - - done(); - }); - }, 300); - }); - }); -}); - -describe('export - real http request destroyed before response received', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let spans: ReadableSpan[]; - - const server = http.createServer((_, res) => { - setTimeout(() => { - res.statusCode = 200; - res.end(); - }, 200); - }); - before(done => { - server.listen(8081, done); - }); - after(done => { - server.close(done); - }); - it('should log the timeout request error message when timeout is 1', done => { - collectorExporterConfig = { - url: 'http://localhost:8081', - timeoutMillis: 1, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - setTimeout(() => { - collectorExporter.export(spans, result => { - try { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - } catch (e) { - done(e); - } - done(); - }); - }, 0); - }); - it('should log the timeout request error message when timeout is 100', done => { - collectorExporterConfig = { - url: 'http://localhost:8081', - timeoutMillis: 100, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - setTimeout(() => { - collectorExporter.export(spans, result => { - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); - }); - }, 0); - }); -}); diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/node/OTLPTraceExporter.test.ts new file mode 100644 index 00000000000..d4ee19ca85a --- /dev/null +++ b/experimental/packages/exporter-trace-otlp-http/test/node/OTLPTraceExporter.test.ts @@ -0,0 +1,73 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import * as http from 'http'; +import * as sinon from 'sinon'; +import { Stream } from 'stream'; + +import { + BasicTracerProvider, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-base'; +import { OTLPTraceExporter } from '../../src/platform/node'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ + +describe('OTLPTraceExporter', () => { + describe('export', () => { + afterEach(() => { + sinon.restore(); + }); + + it('successfully exports data', done => { + const fakeRequest = new Stream.PassThrough(); + Object.defineProperty(fakeRequest, 'setTimeout', { + value: function (_timeout: number) {}, + }); + + sinon.stub(http, 'request').returns(fakeRequest as any); + let buff = Buffer.from(''); + fakeRequest.on('finish', () => { + try { + const requestBody = buff.toString(); + assert.doesNotThrow(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in JSON format, but parsing failed'); + done(); + } catch (e) { + done(e); + } + }); + + fakeRequest.on('data', chunk => { + buff = Buffer.concat([buff, chunk]); + }); + + new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }) + .getTracer('test-tracer') + .startSpan('test-span') + .end(); + }); + }); +}); diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts deleted file mode 100644 index e63d21b17c9..00000000000 --- a/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Stream } from 'stream'; - -export class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} diff --git a/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts b/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts deleted file mode 100644 index e89062c9240..00000000000 --- a/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts +++ /dev/null @@ -1,443 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { - hexToBase64, - InstrumentationLibrary, - VERSION, -} from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import { - ESpanKind, - IEvent, - IExportTraceServiceRequest, - IKeyValue, - ILink, - IResource, - ISpan, -} from '@opentelemetry/otlp-transformer'; - -if (typeof Buffer === 'undefined') { - (window as any).Buffer = { - from: function (arr: []) { - return new Uint8Array(arr); - }, - }; -} - -const traceIdHex = '1f1008dc8e270e85c40a0d7c3939b278'; -const spanIdHex = '5e107261f64fa53e'; -const parentIdHex = '78a8915098864388'; - -export const mockedReadableSpan: ReadableSpan = { - name: 'documentFetch', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: '78a8915098864388', - startTime: [1574120165, 429803070], - endTime: [1574120165, 438688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: { component: 'document-load' }, - links: [ - { - context: { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '78a8915098864388', - traceFlags: TraceFlags.SAMPLED, - }, - attributes: { component: 'document-load' }, - }, - ], - events: [ - { - name: 'fetchStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupEnd', - time: [1574120165, 429803070], - }, - { - name: 'connectStart', - time: [1574120165, 429803070], - }, - { - name: 'connectEnd', - time: [1574120165, 429803070], - }, - { - name: 'requestStart', - time: [1574120165, 435513070], - }, - { - name: 'responseStart', - time: [1574120165, 436923070], - }, - { - name: 'responseEnd', - time: [1574120165, 438688070], - }, - ], - duration: [0, 8885000], - resource: Resource.default().merge( - new Resource({ - service: 'ui', - version: 1, - cost: 112.12, - }) - ), - instrumentationLibrary: { name: 'default', version: '0.0.1' }, - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, -}; - -export const mockedResources: Resource[] = [ - new Resource({ name: 'resource 1' }), - new Resource({ name: 'resource 2' }), -]; - -export const mockedInstrumentationLibraries: InstrumentationLibrary[] = [ - { - name: 'lib1', - version: '0.0.1', - }, - { - name: 'lib2', - version: '0.0.2', - }, -]; - -export const basicTrace: ReadableSpan[] = [ - { - name: 'span1', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: '78a8915098864388', - startTime: [1574120165, 429803070], - endTime: [1574120165, 438688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: {}, - links: [], - events: [], - duration: [0, 8885000], - resource: mockedResources[0], - instrumentationLibrary: mockedInstrumentationLibraries[0], - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, - }, - { - name: 'span2', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: 'f64fa53e5e107261', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: '78a8915098864388', - startTime: [1575120165, 439803070], - endTime: [1575120165, 448688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: {}, - links: [], - events: [], - duration: [0, 8775000], - resource: mockedResources[0], - instrumentationLibrary: mockedInstrumentationLibraries[0], - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, - }, - { - name: 'span3', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '07261f64fa53e5e1', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: 'a891578098864388', - startTime: [1575120165, 439803070], - endTime: [1575120165, 448688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: {}, - links: [], - events: [], - duration: [0, 8775000], - resource: mockedResources[0], - instrumentationLibrary: mockedInstrumentationLibraries[0], - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, - }, -]; - -export const multiResourceTrace: ReadableSpan[] = [ - { - ...basicTrace[0], - resource: mockedResources[0], - }, - { - ...basicTrace[1], - resource: mockedResources[1], - }, - { - ...basicTrace[2], - resource: mockedResources[1], - }, -]; - -export const multiInstrumentationLibraryTrace: ReadableSpan[] = [ - { - ...basicTrace[0], - instrumentationLibrary: mockedInstrumentationLibraries[0], - }, - { - ...basicTrace[1], - instrumentationLibrary: mockedInstrumentationLibraries[0], - }, - { - ...basicTrace[2], - instrumentationLibrary: mockedInstrumentationLibraries[1], - }, -]; - -export function ensureEventsAreCorrect(events: IEvent[]) { - assert.deepStrictEqual( - events, - [ - { - timeUnixNano: '1574120165429803070', - name: 'fetchStart', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'domainLookupStart', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'domainLookupEnd', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'connectStart', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'connectEnd', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165435513070', - name: 'requestStart', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165436923070', - name: 'responseStart', - attributes: [], - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165438688070', - name: 'responseEnd', - attributes: [], - droppedAttributesCount: 0, - }, - ], - 'events are incorrect' - ); -} - -export function ensureAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - 'attributes are incorrect' - ); -} - -export function ensureLinksAreCorrect(attributes: ILink[], useHex?: boolean) { - assert.deepStrictEqual( - attributes, - [ - { - traceId: useHex ? traceIdHex : hexToBase64(traceIdHex), - spanId: useHex ? parentIdHex : hexToBase64(parentIdHex), - attributes: [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - droppedAttributesCount: 0, - }, - ], - 'links are incorrect' - ); -} - -export function ensureSpanIsCorrect(span: ISpan, useHex = true) { - if (span.attributes) { - ensureAttributesAreCorrect(span.attributes); - } - if (span.events) { - ensureEventsAreCorrect(span.events); - } - if (span.links) { - ensureLinksAreCorrect(span.links, useHex); - } - assert.deepStrictEqual( - span.traceId, - useHex ? traceIdHex : hexToBase64(traceIdHex), - 'traceId is' + ' wrong' - ); - assert.deepStrictEqual( - span.spanId, - useHex ? spanIdHex : hexToBase64(spanIdHex), - 'spanId is' + ' wrong' - ); - assert.deepStrictEqual( - span.parentSpanId, - useHex ? parentIdHex : hexToBase64(parentIdHex), - 'parentIdArr is wrong' - ); - assert.strictEqual(span.name, 'documentFetch', 'name is wrong'); - assert.strictEqual(span.kind, ESpanKind.SPAN_KIND_INTERNAL, 'kind is wrong'); - assert.deepStrictEqual( - span.startTimeUnixNano, - '1574120165429803070', - 'startTimeUnixNano is wrong' - ); - assert.deepStrictEqual( - span.endTimeUnixNano, - '1574120165438688070', - 'endTimeUnixNano is wrong' - ); - assert.strictEqual( - span.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(span.droppedEventsCount, 0, 'droppedEventsCount is wrong'); - assert.strictEqual(span.droppedLinksCount, 0, 'droppedLinksCount is wrong'); - assert.deepStrictEqual( - span.status, - { code: SpanStatusCode.OK }, - 'status is wrong' - ); -} - -export function ensureWebResourceIsCorrect(resource: IResource) { - assert.strictEqual(resource.attributes.length, 7); - assert.strictEqual(resource.attributes[0].key, 'service.name'); - assert.strictEqual( - resource.attributes[0].value.stringValue, - 'unknown_service' - ); - assert.strictEqual(resource.attributes[1].key, 'telemetry.sdk.language'); - assert.strictEqual(resource.attributes[1].value.stringValue, 'webjs'); - assert.strictEqual(resource.attributes[2].key, 'telemetry.sdk.name'); - assert.strictEqual(resource.attributes[2].value.stringValue, 'opentelemetry'); - assert.strictEqual(resource.attributes[3].key, 'telemetry.sdk.version'); - assert.strictEqual(resource.attributes[3].value.stringValue, VERSION); - assert.strictEqual(resource.attributes[4].key, 'service'); - assert.strictEqual(resource.attributes[4].value.stringValue, 'ui'); - assert.strictEqual(resource.attributes[5].key, 'version'); - assert.strictEqual(resource.attributes[5].value.intValue, 1); - assert.strictEqual(resource.attributes[6].key, 'cost'); - assert.strictEqual(resource.attributes[6].value.doubleValue, 112.12); - assert.strictEqual(resource.droppedAttributesCount, 0); -} - -export function ensureExportTraceServiceRequestIsSet( - json: IExportTraceServiceRequest -) { - const resourceSpans = json.resourceSpans; - assert.strictEqual(resourceSpans?.length, 1, 'resourceSpans is missing'); - - const resource = resourceSpans?.[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeSpans = resourceSpans?.[0].scopeSpans; - assert.strictEqual(scopeSpans?.length, 1, 'scopeSpans is missing'); - - const scope = scopeSpans?.[0].scope; - assert.ok(scope, 'scope is missing'); - - const spans = scopeSpans?.[0].spans; - assert.strictEqual(spans?.length, 1, 'spans are missing'); -} - -export function ensureHeadersContain( - actual: { [key: string]: string }, - expected: { [key: string]: string } -) { - Object.entries(expected).forEach(([k, v]) => { - assert.strictEqual( - v, - actual[k], - `Expected ${actual} to contain ${k}: ${v}` - ); - }); -} diff --git a/experimental/packages/exporter-trace-otlp-proto/README.md b/experimental/packages/exporter-trace-otlp-proto/README.md index 9b6141b873f..984fbaa4603 100644 --- a/experimental/packages/exporter-trace-otlp-proto/README.md +++ b/experimental/packages/exporter-trace-otlp-proto/README.md @@ -32,9 +32,10 @@ const collectorOptions = { }, //an optional object containing custom headers to be sent with each request will only work with http }; -const provider = new BasicTracerProvider(); const exporter = new OTLPTraceExporter(collectorOptions); -provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); +const provider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(exporter)] +}); provider.register(); diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index fdb271449eb..cb4bda3ac2c 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,10 +62,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -77,12 +77,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -90,11 +90,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts index 85d208b741e..7292f6a6390 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts @@ -17,12 +17,10 @@ import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; import { OTLPExporterConfigBase, - OTLPExporterBrowserBase, + OTLPExporterBase, } from '@opentelemetry/otlp-exporter-base'; -import { - IExportTraceServiceResponse, - ProtobufTraceSerializer, -} from '@opentelemetry/otlp-transformer'; +import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; +import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; @@ -30,15 +28,17 @@ const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; * Collector Trace Exporter for Web */ export class OTLPTraceExporter - extends OTLPExporterBrowserBase + extends OTLPExporterBase implements SpanExporter { constructor(config: OTLPExporterConfigBase = {}) { super( - config, - ProtobufTraceSerializer, - { 'Content-Type': 'application/x-protobuf' }, - DEFAULT_COLLECTOR_RESOURCE_PATH + createLegacyOtlpBrowserExportDelegate( + config, + ProtobufTraceSerializer, + DEFAULT_COLLECTOR_RESOURCE_PATH, + { 'Content-Type': 'application/x-protobuf' } + ) ); } } diff --git a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts index 1e1b35a230a..f546fcb6437 100644 --- a/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts +++ b/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts @@ -17,35 +17,31 @@ import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; import { OTLPExporterNodeConfigBase, - OTLPExporterNodeBase, + OTLPExporterBase, } from '@opentelemetry/otlp-exporter-base'; -import { - IExportTraceServiceResponse, - ProtobufTraceSerializer, -} from '@opentelemetry/otlp-transformer'; +import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer'; import { VERSION } from '../../version'; - -const USER_AGENT = { - 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, -}; +import { + createOtlpHttpExportDelegate, + convertLegacyHttpOptions, +} from '@opentelemetry/otlp-exporter-base/node-http'; /** * Collector Trace Exporter for Node with protobuf */ export class OTLPTraceExporter - extends OTLPExporterNodeBase + extends OTLPExporterBase implements SpanExporter { constructor(config: OTLPExporterNodeConfigBase = {}) { super( - config, - ProtobufTraceSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/x-protobuf', - }, - 'TRACES', - 'v1/traces' + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config, 'TRACES', 'v1/traces', { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + 'Content-Type': 'application/x-protobuf', + }), + ProtobufTraceSerializer + ) ); } } diff --git a/experimental/packages/exporter-trace-otlp-proto/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-proto/test/browser/CollectorTraceExporter.test.ts deleted file mode 100644 index 264d0051f52..00000000000 --- a/experimental/packages/exporter-trace-otlp-proto/test/browser/CollectorTraceExporter.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from 'assert'; -import * as sinon from 'sinon'; -import { OTLPTraceExporter } from '../../src/platform/browser/index'; - -describe('OTLPTraceExporter - web', () => { - let collectorTraceExporter: OTLPTraceExporter; - describe('constructor', () => { - beforeEach(() => { - const collectorExporterConfig = { - hostname: 'foo', - url: 'http://foo.bar.com', - }; - collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - afterEach(() => { - sinon.restore(); - }); - it('should create an instance', () => { - assert.ok(typeof collectorTraceExporter !== 'undefined'); - }); - }); -}); diff --git a/experimental/packages/exporter-trace-otlp-proto/test/browser/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-proto/test/browser/OTLPTraceExporter.test.ts new file mode 100644 index 00000000000..24e517c8b75 --- /dev/null +++ b/experimental/packages/exporter-trace-otlp-proto/test/browser/OTLPTraceExporter.test.ts @@ -0,0 +1,93 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + BasicTracerProvider, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-base'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import { OTLPTraceExporter } from '../../src/platform/browser/index'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...) + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + * - `@opentelemetry/otlp-grpc-exporter-base`: gRPC transport + */ + +describe('OTLPTraceExporter', () => { + afterEach(() => { + sinon.restore(); + }); + + describe('export', function () { + describe('when sendBeacon is available', function () { + it('should successfully send data using sendBeacon', async function () { + // arrange + const stubBeacon = sinon.stub(navigator, 'sendBeacon'); + const tracerProvider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }); + + // act + tracerProvider.getTracer('test-tracer').startSpan('test-span').end(); + await tracerProvider.shutdown(); + + // assert + const args = stubBeacon.args[0]; + const blob: Blob = args[1] as unknown as Blob; + const body = await blob.text(); + assert.throws( + () => JSON.parse(body), + 'expected requestBody to be in protobuf format, but parsing as JSON succeeded' + ); + }); + }); + + describe('when sendBeacon is not available', function () { + beforeEach(function () { + // fake sendBeacon not being available + (window.navigator as any).sendBeacon = false; + }); + + it('should successfully send data using XMLHttpRequest', async function () { + // arrange + const server = sinon.fakeServer.create(); + const tracerProvider = new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }); + + // act + tracerProvider.getTracer('test-tracer').startSpan('test-span').end(); + queueMicrotask(() => { + // simulate success response + server.requests[0].respond(200, {}, ''); + }); + await tracerProvider.shutdown(); + + // assert + const request = server.requests[0]; + const body = request.requestBody as unknown as Uint8Array; + assert.throws( + () => JSON.parse(new TextDecoder().decode(body)), + 'expected requestBody to be in protobuf format, but parsing as JSON succeeded' + ); + }); + }); + }); +}); diff --git a/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts index b034778e33c..c4eeb56d59f 100644 --- a/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts +++ b/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts @@ -14,341 +14,60 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; -import { Stream, PassThrough } from 'stream'; -import * as zlib from 'zlib'; -import { OTLPTraceExporter } from '../../src'; -import { - ensureExportTraceServiceRequestIsSet, - ensureProtoSpanIsCorrect, - mockedReadableSpan, - MockedResponse, -} from '../traceHelper'; -import { - CompressionAlgorithm, - OTLPExporterNodeConfigBase, - OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; -import { Root } from 'protobufjs'; -import { VERSION } from '../../src/version'; -import * as path from 'path'; - -const dir = path.resolve(__dirname, '../../../otlp-transformer/protos'); -const root = new Root(); -root.resolvePath = function (origin, target) { - return `${dir}/${target}`; -}; -const proto = root.loadSync([ - 'opentelemetry/proto/common/v1/common.proto', - 'opentelemetry/proto/resource/v1/resource.proto', - 'opentelemetry/proto/trace/v1/trace.proto', - 'opentelemetry/proto/collector/trace/v1/trace_service.proto', -]); -const exportRequestServiceProto = proto?.lookupType( - 'ExportTraceServiceRequest' -); +import { Stream } from 'stream'; -let fakeRequest: PassThrough; - -describe('OTLPTraceExporter - node with proto over http', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let spans: ReadableSpan[]; - - afterEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.restore(); - }); +import { + BasicTracerProvider, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-base'; +import { OTLPTraceExporter } from '../../src/platform/node'; - describe('default behavior for headers', () => { - const exporter = new OTLPTraceExporter(); - it('should include user agent in header', () => { - assert.strictEqual( - exporter['_transport']['_transport']['_parameters']['headers'][ - 'User-Agent' - ], - `OTel-OTLP-Exporter-JavaScript/${VERSION}` - ); - }); - }); +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ +describe('OTLPTraceExporter', () => { describe('export', () => { - beforeEach(() => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); afterEach(() => { sinon.restore(); }); - it('should open the connection', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - try { - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - } catch (e) { - done(e); - } - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - - collectorExporter.export(spans, () => {}); - }); - - it('should set custom headers', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.headers['foo'], 'bar'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(spans, () => {}); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.agent.keepAlive, true); - assert.strictEqual(options.agent.options.keepAliveMsecs, 2000); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(spans, () => {}); - }); - - it('should successfully send the spans', done => { + it('successfully exports data', done => { const fakeRequest = new Stream.PassThrough(); Object.defineProperty(fakeRequest, 'setTimeout', { value: function (_timeout: number) {}, }); - sinon.stub(http, 'request').returns(fakeRequest as any); + sinon.stub(http, 'request').returns(fakeRequest as any); let buff = Buffer.from(''); fakeRequest.on('finish', () => { - const data = exportRequestServiceProto.decode(buff); - const json = data?.toJSON() as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureProtoSpanIsCorrect(span1); - - ensureExportTraceServiceRequestIsSet(json); - - done(); - }); - - fakeRequest.on('data', chunk => { - buff = Buffer.concat([buff, chunk]); - }); - - const clock = sinon.useFakeTimers(); - collectorExporter.export(spans, () => {}); - clock.tick(200); - clock.restore(); - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const spyLoggerError = sinon.stub(diag, 'error'); - - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(spans, result => { try { - assert.strictEqual(result.code, ExportResultCode.SUCCESS); - assert.strictEqual(spyLoggerError.args.length, 0); + const requestBody = buff.toString(); + assert.throws(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in protobuf format, but parsing as JSON succeeded'); done(); } catch (e) { done(e); } }); - }); - - it('should log the error message', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - cb(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(spans, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - // @ts-expect-error verify error code - assert.strictEqual(result.error.code, 400); - done(); - }); - }); - }); - describe('export - with compression', () => { - beforeEach(() => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - compression: CompressionAlgorithm.GZIP, - httpAgentOptions: { keepAliveMsecs: 2000 }, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - }); - afterEach(() => { - sinon.restore(); - }); - - it('should successfully send the spans', done => { - const fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.stub(http, 'request').returns(fakeRequest as any); - const spySetHeader = sinon.spy(); - (fakeRequest as any).setHeader = spySetHeader; - - let buff = Buffer.from(''); - fakeRequest.on('finish', () => { - const unzippedBuff = zlib.gunzipSync(buff); - const data = exportRequestServiceProto.decode(unzippedBuff); - const json = data?.toJSON() as IExportTraceServiceRequest; - const span1 = json.resourceSpans?.[0].scopeSpans?.[0].spans?.[0]; - assert.ok(typeof span1 !== 'undefined', "span doesn't exist"); - ensureProtoSpanIsCorrect(span1); - - ensureExportTraceServiceRequestIsSet(json); - assert.ok(spySetHeader.calledWith('Content-Encoding', 'gzip')); - - done(); - }); fakeRequest.on('data', chunk => { buff = Buffer.concat([buff, chunk]); }); - const clock = sinon.useFakeTimers(); - collectorExporter.export(spans, () => {}); - clock.tick(200); - clock.restore(); - }); - }); -}); - -describe('export - real http request destroyed before response received', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let spans: ReadableSpan[]; - const server = http.createServer((_, res) => { - setTimeout(() => { - res.statusCode = 200; - res.end(); - }, 1000); - }); - before(done => { - server.listen(8080, done); - }); - after(done => { - server.close(done); - }); - it('should log the timeout request error message when timeout is 100', done => { - collectorExporterConfig = { - url: 'http://localhost:8080', - timeoutMillis: 100, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - collectorExporter.export(spans, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); - }); - }); -}); - -describe('export - real http request destroyed after response received', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase; - let spans: ReadableSpan[]; - - const server = http.createServer((_, res) => { - res.write('writing something'); - }); - before(done => { - server.listen(8080, done); - }); - after(done => { - server.close(done); - }); - it('should log the timeout request error message', done => { - collectorExporterConfig = { - url: 'http://localhost:8080', - timeoutMillis: 300, - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - spans = []; - spans.push(Object.assign({}, mockedReadableSpan)); - - collectorExporter.export(spans, result => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.message, 'Request Timeout'); - done(); + new BasicTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())], + }) + .getTracer('test-tracer') + .startSpan('test-span') + .end(); }); }); }); diff --git a/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts b/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts deleted file mode 100644 index efbdc032830..00000000000 --- a/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { hexToBase64 } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import { Stream } from 'stream'; -import { - IEvent, - IExportTraceServiceRequest, - IKeyValue, - ILink, - ISpan, -} from '@opentelemetry/otlp-transformer'; - -const traceIdHex = '1f1008dc8e270e85c40a0d7c3939b278'; -const spanIdHex = '5e107261f64fa53e'; -const parentIdHex = '78a8915098864388'; - -export const mockedReadableSpan: ReadableSpan = { - name: 'documentFetch', - kind: 0, - spanContext: () => { - return { - traceId: traceIdHex, - spanId: spanIdHex, - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: parentIdHex, - startTime: [1574120165, 429803070], - endTime: [1574120165, 438688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: { component: 'document-load' }, - links: [ - { - context: { - traceId: traceIdHex, - spanId: parentIdHex, - traceFlags: TraceFlags.SAMPLED, - }, - attributes: { component: 'document-load' }, - }, - ], - events: [ - { - name: 'fetchStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupEnd', - time: [1574120165, 429803070], - }, - { - name: 'connectStart', - time: [1574120165, 429803070], - }, - { - name: 'connectEnd', - time: [1574120165, 429803070], - }, - { - name: 'requestStart', - time: [1574120165, 435513070], - }, - { - name: 'responseStart', - time: [1574120165, 436923070], - }, - { - name: 'responseEnd', - time: [1574120165, 438688070], - }, - ], - duration: [0, 8885000], - resource: new Resource({ - service: 'ui', - version: 1, - cost: 112.12, - }), - instrumentationLibrary: { name: 'default', version: '0.0.1' }, - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, -}; - -export function ensureProtoEventsAreCorrect(events: IEvent[]) { - assert.deepStrictEqual( - events, - [ - { - timeUnixNano: '1574120165429803070', - name: 'fetchStart', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'domainLookupStart', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'domainLookupEnd', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'connectStart', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165429803070', - name: 'connectEnd', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165435513070', - name: 'requestStart', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165436923070', - name: 'responseStart', - droppedAttributesCount: 0, - }, - { - timeUnixNano: '1574120165438688070', - name: 'responseEnd', - droppedAttributesCount: 0, - }, - ], - 'events are incorrect' - ); -} - -export function ensureProtoAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - 'attributes are incorrect' - ); -} - -export function ensureProtoLinksAreCorrect(attributes: ILink[]) { - assert.deepStrictEqual( - attributes, - [ - { - traceId: hexToBase64(traceIdHex), - spanId: hexToBase64(parentIdHex), - attributes: [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - droppedAttributesCount: 0, - }, - ], - 'links are incorrect' - ); -} - -export function ensureProtoSpanIsCorrect(span: ISpan) { - if (span.attributes) { - ensureProtoAttributesAreCorrect(span.attributes); - } - if (span.events) { - ensureProtoEventsAreCorrect(span.events); - } - if (span.links) { - ensureProtoLinksAreCorrect(span.links); - } - assert.deepStrictEqual( - span.traceId, - hexToBase64(traceIdHex), - 'traceId is' + ' wrong' - ); - assert.deepStrictEqual( - span.spanId, - hexToBase64(spanIdHex), - 'spanId is' + ' wrong' - ); - assert.deepStrictEqual( - span.parentSpanId, - hexToBase64(parentIdHex), - 'parentIdArr is wrong' - ); - assert.strictEqual(span.name, 'documentFetch', 'name is wrong'); - assert.strictEqual(span.kind, 'SPAN_KIND_INTERNAL', 'kind is wrong'); - assert.strictEqual( - span.startTimeUnixNano, - '1574120165429803070', - 'startTimeUnixNano is wrong' - ); - assert.strictEqual( - span.endTimeUnixNano, - '1574120165438688070', - 'endTimeUnixNano is wrong' - ); - assert.strictEqual( - span.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(span.droppedEventsCount, 0, 'droppedEventsCount is wrong'); - assert.strictEqual(span.droppedLinksCount, 0, 'droppedLinksCount is wrong'); - assert.deepStrictEqual( - span.status, - { code: 'STATUS_CODE_OK' }, - 'status is wrong' - ); -} - -export function ensureExportTraceServiceRequestIsSet( - json: IExportTraceServiceRequest -) { - const resourceSpans = json.resourceSpans; - assert.strictEqual(resourceSpans?.length, 1, 'resourceSpans is missing'); - - const resource = resourceSpans?.[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeSpans = resourceSpans?.[0].scopeSpans; - assert.strictEqual(scopeSpans?.length, 1, 'scopeSpans is missing'); - - const scope = scopeSpans?.[0].scope; - assert.ok(scope, 'scope is missing'); - - const spans = scopeSpans?.[0].spans; - assert.strictEqual(spans?.length, 1, 'spans are missing'); -} - -export class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} diff --git a/experimental/packages/opentelemetry-browser-detector/README.md b/experimental/packages/opentelemetry-browser-detector/README.md index b1cbe45e574..bc0d0ad8a54 100644 --- a/experimental/packages/opentelemetry-browser-detector/README.md +++ b/experimental/packages/opentelemetry-browser-detector/README.md @@ -24,10 +24,18 @@ async function start(){ let detectedResources= await detectResources({detectors:[browserDetector]}); resource=resource.merge(detectedResources); const provider = new WebTracerProvider({ - resource + resource, + spanProcessors: [ + new BatchSpanProcessor( + new OTLPTraceExporter({ url:CONF.url, headers: {} }), + { + exportTimeoutMillis: CONF.timeOutMillis, + scheduledDelayMillis:CONF.delayMillis + } + ) + ] }); - provider.addSpanProcessor(new BatchSpanProcessor(new OTLPTraceExporter( {url:CONF.url ,headers:{}}),{exportTimeoutMillis:CONF.timeOutMillis,scheduledDelayMillis:CONF.delayMillis})); provider.register({ // Changing default contextManager to use ZoneContextManager - supports asynchronous operations - optional contextManager: new ZoneContextManager(), diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index fd5d7b40832..681066899b0 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -53,10 +53,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -68,12 +68,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -81,7 +81,7 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/resources": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 04e19ffb1ed..40760ce73c1 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -18,8 +18,7 @@ "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../../scripts/peer-api-check.js", - "align-api-deps": "node ../../../scripts/align-api-deps.js", - "maint:regenerate-test-certs": "cd test/certs && ./regenerate.sh" + "align-api-deps": "node ../../../scripts/align-api-deps.js" }, "keywords": [ "opentelemetry", @@ -50,12 +49,12 @@ "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -66,13 +65,13 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts index 2602911aa1a..074c5e5c63d 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts @@ -18,36 +18,26 @@ import { OTLPMetricExporterBase, OTLPMetricExporterOptions, } from '@opentelemetry/exporter-metrics-otlp-http'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { + convertLegacyOtlpGrpcOptions, + createOtlpGrpcExportDelegate, OTLPGRPCExporterConfigNode, - OTLPGRPCExporterNodeBase, } from '@opentelemetry/otlp-grpc-exporter-base'; -import { - IExportMetricsServiceResponse, - ProtobufMetricsSerializer, -} from '@opentelemetry/otlp-transformer'; - -class OTLPMetricExporterProxy extends OTLPGRPCExporterNodeBase< - ResourceMetrics, - IExportMetricsServiceResponse -> { - constructor(config?: OTLPGRPCExporterConfigNode & OTLPMetricExporterOptions) { - super( - config, - ProtobufMetricsSerializer, - 'MetricsExportService', - '/opentelemetry.proto.collector.metrics.v1.MetricsService/Export', - 'METRICS' - ); - } -} +import { ProtobufMetricsSerializer } from '@opentelemetry/otlp-transformer'; /** * OTLP-gRPC metric exporter */ -export class OTLPMetricExporter extends OTLPMetricExporterBase { +export class OTLPMetricExporter extends OTLPMetricExporterBase { constructor(config?: OTLPGRPCExporterConfigNode & OTLPMetricExporterOptions) { - super(new OTLPMetricExporterProxy(config), config); + super( + createOtlpGrpcExportDelegate( + convertLegacyOtlpGrpcOptions(config ?? {}, 'METRICS'), + ProtobufMetricsSerializer, + 'MetricsExportService', + '/opentelemetry.proto.collector.metrics.v1.MetricsService/Export' + ), + config + ); } } 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 833fa2ba7d1..ac84344ba4b 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 @@ -14,295 +14,83 @@ * limitations under the License. */ -import * as protoLoader from '@grpc/proto-loader'; -import { diag, DiagLogger } from '@opentelemetry/api'; -import * as assert from 'assert'; -import * as crypto from 'crypto'; -import * as fs from 'fs'; -import * as grpc from '@grpc/grpc-js'; -import * as path from 'path'; -import * as sinon from 'sinon'; import { OTLPMetricExporter } from '../src'; +import { ServerTestContext, startServer } from './utils'; +import * as assert from 'assert'; import { - collect, - ensureExportedCounterIsCorrect, - ensureExportedHistogramIsCorrect, - ensureExportedObservableGaugeIsCorrect, - ensureMetadataIsCorrect, - ensureResourceIsCorrect, - mockCounter, - mockHistogram, - mockObservableGauge, - setUp, - shutdown, -} from './metricsHelper'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import { - IExportMetricsServiceRequest, - IResourceMetrics, -} from '@opentelemetry/otlp-transformer'; -import { AggregationTemporalityPreference } from '@opentelemetry/exporter-metrics-otlp-http'; - -const metricsServiceProtoPath = - 'opentelemetry/proto/collector/metrics/v1/metrics_service.proto'; -const includeDirs = [path.resolve(__dirname, '../../otlp-transformer/protos')]; - -const httpAddr = 'https://localhost:1502'; -const udsAddr = 'unix:///tmp/otlp-metrics.sock'; - -type TestParams = { - address?: string; - useTLS?: boolean; - metadata?: grpc.Metadata; + MeterProvider, + PeriodicExportingMetricReader, +} from '@opentelemetry/sdk-metrics'; + +const testServiceDefinition = { + export: { + path: '/opentelemetry.proto.collector.metrics.v1.MetricsService/Export', + requestStream: false, + responseStream: false, + requestSerialize: (arg: Buffer) => { + return arg; + }, + requestDeserialize: (arg: Buffer) => { + return arg; + }, + responseSerialize: (arg: Buffer) => { + return arg; + }, + responseDeserialize: (arg: Buffer) => { + return arg; + }, + }, }; -const metadata = new grpc.Metadata(); -metadata.set('k', 'v'); - -const testOTLPMetricExporter = (params: TestParams) => { - const { address = httpAddr, useTLS, metadata } = params; - return describe(`OTLPMetricExporter - node ${ - useTLS ? 'with' : 'without' - } TLS, ${metadata ? 'with' : 'without'} metadata, target ${address}`, () => { - let collectorExporter: OTLPMetricExporter; - let server: grpc.Server; - let exportedData: IResourceMetrics[] | undefined; - let metrics: ResourceMetrics; - let reqMetadata: grpc.Metadata | undefined; - - before(done => { - server = new grpc.Server(); - protoLoader - .load(metricsServiceProtoPath, { - keepCase: false, - longs: String, - enums: String, - defaults: true, - oneofs: true, - includeDirs, - }) - .then((packageDefinition: protoLoader.PackageDefinition) => { - const packageObject: any = - grpc.loadPackageDefinition(packageDefinition); - server.addService( - packageObject.opentelemetry.proto.collector.metrics.v1 - .MetricsService.service, - { - Export: (data: { - request: IExportMetricsServiceRequest; - metadata: grpc.Metadata; - }) => { - try { - exportedData = data.request.resourceMetrics; - reqMetadata = data.metadata; - } catch (e) { - exportedData = undefined; - } - }, - } - ); - const credentials = useTLS - ? grpc.ServerCredentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - [ - { - cert_chain: fs.readFileSync('./test/certs/server.crt'), - private_key: fs.readFileSync('./test/certs/server.key'), - }, - ] - ) - : grpc.ServerCredentials.createInsecure(); - const serverAddr = new URL(address); - server.bindAsync( - serverAddr.protocol === 'https:' ? serverAddr.host : address, - credentials, - () => { - server.start(); - done(); - } - ); - }); - }); - - after(() => { - server.forceShutdown(); - }); - - beforeEach(async () => { - const credentials = useTLS - ? grpc.credentials.createSsl( - fs.readFileSync('./test/certs/ca.crt'), - fs.readFileSync('./test/certs/client.key'), - fs.readFileSync('./test/certs/client.crt') - ) - : grpc.credentials.createInsecure(); - collectorExporter = new OTLPMetricExporter({ - url: address, - credentials, - metadata: metadata, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - - setUp(); - - const counter = mockCounter(); - mockObservableGauge(observableResult => { - observableResult.observe(3, {}); - observableResult.observe(6, {}); - }); - const histogram = mockHistogram(); - - counter.add(1); - histogram.record(7); - histogram.record(14); - - const { resourceMetrics, errors } = await collect(); - assert.strictEqual(errors.length, 0); - metrics = resourceMetrics; - }); - - afterEach(async () => { - await shutdown(); - exportedData = undefined; - reqMetadata = undefined; - sinon.restore(); - }); - - if (useTLS && crypto.X509Certificate) { - it('test certs are valid', () => { - const certPaths = [ - './test/certs/ca.crt', - './test/certs/client.crt', - './test/certs/server.crt', - ]; - certPaths.forEach(certPath => { - const cert = new crypto.X509Certificate(fs.readFileSync(certPath)); - const now = new Date(); - assert.ok( - new Date(cert.validTo) > now, - `TLS cert "${certPath}" is still valid: cert.validTo="${cert.validTo}" (if this fails use 'npm run maint:regenerate-test-certs')` - ); - }); - }); - } - - describe('instance', () => { - let warnStub: sinon.SinonStub; +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...) + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + * - `@opentelemetry/otlp-grpc-exporter-base`: gRPC transport + */ +describe('OTLPMetricsExporter', function () { + let shutdownHandle: () => void | undefined; + const serverTestContext: ServerTestContext = { + requests: [], + serverResponseProvider: () => { + return { error: null, buffer: Buffer.from([]) }; + }, + }; + + beforeEach(async function () { + shutdownHandle = await startServer( + 'localhost:1502', + testServiceDefinition, + serverTestContext + ); + }); - beforeEach(() => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - warnStub = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: nop, - error: nop, - info: nop, - verbose: nop, - warn: warnStub, - }; - diag.setLogger(diagLogger); - }); + afterEach(function () { + shutdownHandle(); - afterEach(() => { - diag.disable(); - }); + // clear context + serverTestContext.requests = []; + serverTestContext.serverResponseProvider = () => { + return { error: null, buffer: Buffer.from([]) }; + }; + }); - it('should warn about headers', () => { - collectorExporter = new OTLPMetricExporter({ - url: address, - headers: { - foo: 'bar', - }, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - const args = warnStub.args[0]; - assert.strictEqual(args[0], 'Headers cannot be set when using grpc'); - }); - it('should warn about path in url', () => { - if (new URL(address).protocol === 'unix:') { - // Skip this test for UDS - return; - } - collectorExporter = new OTLPMetricExporter({ - url: `${address}/v1/metrics`, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - const args = warnStub.args[0]; - assert.strictEqual( - args[0], - 'URL path should not be set when using grpc, the path part of the URL will be ignored.' - ); - }); + it('successfully exports data', async () => { + // arrange + const meterProvider = new MeterProvider({ + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter({ url: 'http://localhost:1502' }), + }), + ], }); - describe('export', () => { - it('should export metrics', done => { - const responseSpy = sinon.spy(); - collectorExporter.export(metrics, responseSpy); - setTimeout(() => { - assert.ok( - typeof exportedData !== 'undefined', - 'resource does not exist' - ); - - assert.ok(exportedData, 'exportedData does not exist'); - - // The order of the metrics is not guaranteed. - const counterIndex = - exportedData[0].scopeMetrics[0].metrics.findIndex( - it => it.name === 'int-counter' - ); - const observableIndex = - exportedData[0].scopeMetrics[0].metrics.findIndex( - it => it.name === 'double-observable-gauge' - ); - const histogramIndex = - exportedData[0].scopeMetrics[0].metrics.findIndex( - it => it.name === 'int-histogram' - ); - - const resource = exportedData[0].resource; - const counter = exportedData[0].scopeMetrics[0].metrics[counterIndex]; - const observableGauge = - exportedData[0].scopeMetrics[0].metrics[observableIndex]; - const histogram = - exportedData[0].scopeMetrics[0].metrics[histogramIndex]; - ensureExportedCounterIsCorrect( - counter, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0] - .startTime - ); - ensureExportedObservableGaugeIsCorrect( - observableGauge, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .startTime - ); - ensureExportedHistogramIsCorrect( - histogram, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .startTime, - [0, 100], - ['0', '2', '0'] - ); - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - ensureResourceIsCorrect(resource); + // act + meterProvider.getMeter('test-meter').createCounter('test-counter').add(1); + await meterProvider.forceFlush(); - ensureMetadataIsCorrect(reqMetadata, metadata); - - done(); - }, 500); - }); - }); + // assert + assert.strictEqual(serverTestContext.requests.length, 1); }); -}; - -testOTLPMetricExporter({ useTLS: true }); -testOTLPMetricExporter({ useTLS: false }); -testOTLPMetricExporter({ metadata }); -// skip UDS tests on windows -process.platform !== 'win32' && testOTLPMetricExporter({ address: udsAddr }); +}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.crt deleted file mode 100644 index 57decab97a0..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFozCCA4ugAwIBAgIUB0Ij1wY1Y97b9f57vy3qxdY3eyMwDQYJKoZIhvcNAQEL -BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs -ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE -AwwCY2EwHhcNMjQwNjA4MTkxODUwWhcNMjUwNjA4MTkxODUwWjBhMQswCQYDVQQG -EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w -CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCAiIwDQYJ -KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5sOaALnaMG5LvsyTRf77a0iQj5A1QP -N11tcWPQ5DvRtD6rKh3ISuKCPOX0BOeY0VdwqWP3dVP0qQgek48iGQw4Wl7SBQxO -vX3+cmaIy17ZHPu4RZIbjbGbS61OHU2iM4Ek1styhccWTv8dDN9V1LGr9mOnqVkv -4SZrmrGYAKyF5JLImafzAUUGttc5aeBpqWmjObk3GLFDWEvObkrI5sUqabJ3U4LS -KVPAX4sXoEPmlmnqIe6/5edmYNbeK0Kr8gZLDqJXThIDsgbRNIOTYWohPR3/JlDy -xnIH31GXygSWlGmDUxHynm7rvzY70Dm4G8JHI8F8hClRZ29XVYjyBMlS8qBHLa72 -mLU79WfsCbvdU/1AWg9g1FopSdf3G3z0Y4ZI8nTCMAbSJ0zQm3nIT9pNVPa9nk0e -iOo1462+TZ40X3/E+t7G7PkGgIHyYrL3o6bMsp3B2pKbJHIybwwGNxiuyRKvzIyc -Xcz7jbEzyL7rmcsxiNNuukk8ilpMexeCDu/Y+ndmvnNVWAsNf6HSbHlkip3Efi+p -6pK0pWgNprkoQvigiEeSqep5u2v/ogTRflLwih1UDB9krJ3dzoE6TB5kDrgvmn/s -Iohh/LWC7HipuQji1b+/ejFuQNy3mwDR2G09vrqk5PZXvfHRX+CCfTUZSFY8uEHr -TAhfgiKEPaf5AgMBAAGjUzBRMB0GA1UdDgQWBBQJ4qWJUnKN4XrWuGJ8TN4YIN7R -sjAfBgNVHSMEGDAWgBQJ4qWJUnKN4XrWuGJ8TN4YIN7RsjAPBgNVHRMBAf8EBTAD -AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAYAu4AjPtl3Ji0n5u/p1mlp7DfmT4JpzZa -nczi7M1ae9ILx58i037zXVB9Fk7Yk5CG3buVqf7hzRT6KERKpTyUsc4wiy+vaAw9 -euGnp4qmG3mj4GRDAqDruOHFrv8Dfq541aF4N+V1OOdCbG3B3wXBQ9LkBpWCgHSk -M2h5jiLbbvwIbd4WoztLUOJtx89L+5TVM10fBTxekdJM/cVXOMzJgFzukc87sTAL -dSj3dz9J3TH6R24NzWijSch8Zh9ymAfSCKthBOl1mWIfd8h4ygUjnouGj5MGIIpl -q9ATAk0cka6VvjSzQ5OucZtrYkWIlLlqiUisYD7bJSn2zij4j3K2TQu+PTxM4/Oh -Xzz3W8LuAp+mdcgtPt4GvmtML2LtIJi6EgNRMkUzYtaERxubrgPuJOh1/10kp1ww -W8wdnweYid1I4nJXjGDhIvKk6ntzhBg6zV+5OSJf6o2RJKRsdxAz8o3wKbIXXGXh -u4B1TQJEivUTAcaZJX4iOJI2VhLaSP5lzdihAaLiPpSMk/cTTs5OYHCvb4XxkT5L -KH3UqSlvQBTQ2NfMfM5S4kLGtcCarOzcPYn++fjAOg24//TyZ2RAGbSCwjok/nKN -62MwO+Npr0sSkBGvYG2xzTS7R00L14cWOA9L26v7EqjZbpFd2B6vE0sUWLvVlbNc -wwZok4pFbw== ------END CERTIFICATE----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.key deleted file mode 100644 index b9f12f4f350..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/ca.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC+bDmgC52jBuS7 -7Mk0X++2tIkI+QNUDzddbXFj0OQ70bQ+qyodyErigjzl9ATnmNFXcKlj93VT9KkI -HpOPIhkMOFpe0gUMTr19/nJmiMte2Rz7uEWSG42xm0utTh1NojOBJNbLcoXHFk7/ -HQzfVdSxq/Zjp6lZL+Ema5qxmACsheSSyJmn8wFFBrbXOWngaalpozm5NxixQ1hL -zm5KyObFKmmyd1OC0ilTwF+LF6BD5pZp6iHuv+XnZmDW3itCq/IGSw6iV04SA7IG -0TSDk2FqIT0d/yZQ8sZyB99Rl8oElpRpg1MR8p5u6782O9A5uBvCRyPBfIQpUWdv -V1WI8gTJUvKgRy2u9pi1O/Vn7Am73VP9QFoPYNRaKUnX9xt89GOGSPJ0wjAG0idM -0Jt5yE/aTVT2vZ5NHojqNeOtvk2eNF9/xPrexuz5BoCB8mKy96OmzLKdwdqSmyRy -Mm8MBjcYrskSr8yMnF3M+42xM8i+65nLMYjTbrpJPIpaTHsXgg7v2Pp3Zr5zVVgL -DX+h0mx5ZIqdxH4vqeqStKVoDaa5KEL4oIhHkqnqebtr/6IE0X5S8IodVAwfZKyd -3c6BOkweZA64L5p/7CKIYfy1gux4qbkI4tW/v3oxbkDct5sA0dhtPb66pOT2V73x -0V/ggn01GUhWPLhB60wIX4IihD2n+QIDAQABAoICAAH0mI7lL6Q58OVhJBvOlGaa -6gFWlUsqsNXbxttQjNd0atZt6YvOv74dukReQiKithugw4yMQP8wtv+nWLqSjhFL -DtqEa5rZwCZoE4KsCvKZZivLk6NRdx4IyzknYTOn48GCwFXsgiUuPHdwM+6jMgD1 -FB2n3hxVWomLd1Y1imQ7J8K+Hp3T6AJudDg3lbfBPgUgsPoO78j6ORDmOMm50Gzb -56P2h7wDLnt2sUR7ZKDt4EOMLPcHr3O14G60b1tK6rxXzvmpzdpvgUeCpHhpbgmp -97e0JA+WvqTzIb7zwRZU+Ycv2w2HIUtgTmFfMd813csb8ekNv0mxVU+WZQF4AsaN -8zC6IEihWrDw9Rh7pNsXZup+TIU1RORm5DOjcSKZaeFyimA0hugK7dwZUzfR7dR2 -9dBunvoiqg3mqsTTVMe4IaAaWqovVqyBUPvtJTk5HEJIMSNfeDjQhMb049fH/ur3 -blI08xKE9lxR5peN+V3beVW5/ORIntHmlcEBJoEYi8HOuosIIQv4ZuyLMboG80LX -lU/s2i2zztAcq+LtHO09r8k4mogm6MzNfw8IanTAU/SY9dxB49unfIaUelnkNdZ9 -L7QWqpHGwgjRyHAI0rjCfHbHjDZwf59VKcihsJfugW8drN6/2tMyyRNla62U83Gh -fK2ldrZ8aXT0sht8pKflAoIBAQDi/GMuSCtKKANNQzdIxUEsTCabTcQabvYTctsp -TcxOVqvBn07snUUzuBuowM1Fdd3u9GDsVUQ6/OWf0yRI3mzI2foFA/av7srFb8DD -a/ikZK3BZC1HDpaBKAhijB8O7rHT52+7SVrTJHeFy5iKVmxGGVrbm+9QOSGQABzT -eL1flDSXlZ5dy+sxaJMTvMUVRsXabxXsK5jwJryQxvJSPzmyiei0EVqT81+yYwyg -6wXl6y/TAxcgaVB3WVhzFQND6fKNOYGV1fQRrkXNgC2QFartCkpEBh8ZRbp8eIkb -M7GSrI8vY+Y0QljStXIDNX+sSYvyh9JAzL476Q111gCgrikLAoIBAQDWw2PGup+U -WoUuNOAYTDAJqGa6uY6u9tLcK/4UpDZV/IzFA75n+sP2uJiM6phLcsBY8h+7cpbo -zNlUAMD1A4ZHole7G5lZO9za75GV/dCkFb3prC4PrpZBs5QpWn30Wqy2oqFUpN7Z -Pu6oAK/XH3Z2pB5uCO+3YWJ61zv8z0lg6zD9jUKG001j4Wo8mzfGKrmvU6Jo1HhM -x0papSyythpslVdJwNBMVIMO6RkyyM90PrhCQDCE/qedwY7Uf4hmUe3Tt3BHWqFp -K8RceMvwROTcjMoHCjZAPOW362ZzPHhKcZ9AMNNnSZWuArlva83EsbpLiCrrbT7J -p7Ct7X1GyX2LAoIBAD92Fviynr/N7hZk64kB9VXAOK8FEAXf7hbD7vheUve4Da9F -rhhDZDywhbMprHp2GMWdN5f7wubHHCASNTvWTA3fu6I5WHgZyEFpHDjG8C5uI5JF -Qs9yCaw0mBuNV4WiQL+hHkD7olQUBwK2SICs5vq2TgvGTiNcxcBv9588S530Xrve -zfclcy1OMoi7J1LqhZirpDJyggDqo5/Kr6dFHAmJuzDVBUEGM0Q5oyc+bli455cU -bxvVtfSYWz1Zq58KQpEvecZ9mg5zbfqlkpeNJ0u8q8TW/UzgjOIOBS9Axa3fZuz1 -/j+wKQtIRYcWJwrxSRpW1PbfB3TSlLvUSDqkVr8CggEAetjpihPWlJXy+KtmRH/Q -OrYJjWX3KD4n/6lqfYQxUJ5WJ5wsnm3jCo4tNO48j2vkevyFCkRR7ni/GD4WIhES -DofehzkSTujfPJ0tOg8l+bY2HCRRdMb5TDvc1Ire4Ze8k/wTLMficYJ+IbvC2ds1 -eEgI4Ahclxktq/bSaZpo7veZ3m+fTmAwNKIMkv52uPRXouLEVBK1fbXB4nf5SYDB -PLtwYs/YVtFA5paPw2z6vhPicoMlPe4tEyBVA1iwPVdAI4savrYo/m/6sqqmfZnr -D/240q4UukobXUlaITDF3k+AOMe1JbAB3rfQOtv/qDPBzNLnOiQTdmZluhfPQV6g -YQKCAQAXiNBOHBxYTMLcIHUeOqaoqDxlyP0QWiWGwJ4D5S+zx6LdyPMc8MidAplu -FWaGQgoXyh1iWpI1X10iPyU+VUYFvg7/s0dj80J04mBBFVyXUzZeLsZgo4dcU7nH -Oy8KjV8Ldl0QJxwKlTQELW5V3u4MCfUI59a7nUF47RB1hNB2gzQGH81ibuYkFtQg -oM1YZB0tLg7jsMVkPZG3d8mP7mvitK0BTekQt5Ea/Z5qmOrOd4gpvMe9KWPdML0K -B0yMLykxCmg2NqRpcyV3Kk4LOd/UZr2kAFjM7Tt0u03gY4OjxXyX4xTyMu8S9Dj5 -+pFcbZ4RROHkC2Vg2eaQxFXb0mnv ------END PRIVATE KEY----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.crt deleted file mode 100644 index b85e18dffad..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NTFaFw0yNTA2MDgxOTE4NTFaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBkNsaWVudDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAjTQGK0mcpE04z7FRBz2mYOeoIh7SToyII0cR8+6T3YEK -R6SzZOLRXZ73/EucsQs0WxYEqXLgSlnxOBDQVttEwIi4VBxQnTc3T1itbZJeGnvf -t108ntOX5czbFJMuey/4D5WPRFBFJfSgqRPq4h5zu9rm1eUXOCB6l6B+OK5Ev5/8 -OLHAXY/QqUNFPLYggUMom7OhnWqA0Z1HR504J4GkeEsIwI/asEclo1gS6WrV6VBh -ZZFS7u//C52vw+jSZ+VAXLcgJ+9m6CPRdrhBh+yQ9hX2ZLb+TrUaPAsgtxrj6oB0 -uV62MYE7zNhNnrks6zwT8GDOu/rMSbII0bpF3L/M/fD57vpcbSu0t3TLgP2ZgV6L -pwKesQmcl3m7G6mvhx1R9M5xlKkcOjcoxCMmCttkzyh49x7bVYZEm+mFV+WPkgoe -CBg5eEbBxsVsIHkpU2GjnzIFMJlPpnwtDdgKKY/feQ88CLRlEF7+juJnjUS2tXmJ -2tcGteugIi459PHw3ZcFaXPsheEXUa8zPkyPCbFYXLpYLpXZN8wIwzxlgtw62Owk -ri6DA29F0rZy2N1Nf5R/mkVqN69ulZPxX9UYt5bCPYn4z2VKT46JpxsBTMV8TLbf -RO8xOfLj3PARCGWHV4KmBC9fakLQmVsMKjlcoWN3m2oVLNAORlYdmo+I81JryasC -AwEAAaNCMEAwHQYDVR0OBBYEFJUvzuLa8rgkuSbFYmQvj89kpe2QMB8GA1UdIwQY -MBaAFAnipYlSco3heta4YnxM3hgg3tGyMA0GCSqGSIb3DQEBCwUAA4ICAQCIMXBi -c0pTL0YAurUQUPtmU9GPLOxA2e0Uj4TjLY1hn4gUOHXcdxWsvL0B18z9AP74b/d6 -e57l944BDUXZsb0A9HqDR3HqVsCU9cEFmFEXcdx7kMCZzptRSWdUz/WRGChtjVIS -0YhX6JNmAR6luNGarzt1brCNQi5BBJEo3OhH/WcuKXcWnCIcNCL7dTybXbu2d5aO -d9wrAtZzmTtetlRAAia0jMmM/nAPYhN8cq5qkUdOsfnUyq09sfFh6JwmLAm9jT8T -HLFY+44BpMB+4H4PluY22nSKg2DzlerxYsbcnGklEAG4bglNlVTiJ+d7hi0Vn1sx -WxNzammg3b7RSEr7F2HXHztpx32QQO93igTHGXpb55yM2jt3eCivl3xynnPQMPhS -ZZPv61zVeVXaqjJHX12AMP41PEjFvBlIB0PqsORDZv4+X5MOchRf5VepM4hd01LW -9lTrX7oBSc0uzjDA5OyOZaqNDP06YfgezO0uF049cVbuGQ4NA+Iby6+nFILFgjcS -50p29zV2mP2KJ4dLnFf3/6CPNUSGrY7SXh2rcTefs7oxvlBu6Jt+b+2XYIWl9+Iz -Z/3dm5l5cEt9B4eogUb6HpFCfm3yba89wqUZK9o4O5WS/amx7MxPcQ4NPw5e+6EE -If4hv5PmFbUJtzKCwwvtjg1eWRW0th/Il3ixgQ== ------END CERTIFICATE----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.csr deleted file mode 100644 index 190eb372ce1..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGQ2xp -ZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCNNAYrSZykTTjPsVEHPaZg56giHtJOjIgjRxHz7pPdgQpHpLNk4tFd -nvf8S5yxCzRbFgSpcuBKWfE4ENBW20TAiLhUHFCdNzdPWK1tkl4ae9+3XTye05fl -zNsUky57L/gPlY9EUEUl9KCpE+riHnO72ubV5Rc4IHqXoH44rkS/n/w4scBdj9Cp -Q0U8tiCBQyibs6GdaoDRnUdHnTgngaR4SwjAj9qwRyWjWBLpatXpUGFlkVLu7/8L -na/D6NJn5UBctyAn72boI9F2uEGH7JD2FfZktv5OtRo8CyC3GuPqgHS5XrYxgTvM -2E2euSzrPBPwYM67+sxJsgjRukXcv8z98Pnu+lxtK7S3dMuA/ZmBXounAp6xCZyX -ebsbqa+HHVH0znGUqRw6NyjEIyYK22TPKHj3HttVhkSb6YVX5Y+SCh4IGDl4RsHG -xWwgeSlTYaOfMgUwmU+mfC0N2Aopj995DzwItGUQXv6O4meNRLa1eYna1wa166Ai -Ljn08fDdlwVpc+yF4RdRrzM+TI8JsVhculguldk3zAjDPGWC3DrY7CSuLoMDb0XS -tnLY3U1/lH+aRWo3r26Vk/Ff1Ri3lsI9ifjPZUpPjomnGwFMxXxMtt9E7zE58uPc -8BEIZYdXgqYEL19qQtCZWwwqOVyhY3ebahUs0A5GVh2aj4jzUmvJqwIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAGU0GhLOUGDMEnHNMebVO7hXewW2wc8pfMO/QwgV -/KyqDe7FxZgmfGIw6lN8QMowSL5ZJx7S/lu5lHg3W+OgbRmXm8KocelLkVNXekRW -qhgzPuWsrCBO+EoGvN5R3ZTW9uxWiI2XmfZmlBkWpl2ozPSjPL3muleU04nSza4k -rUio6Qn3nwPEjjVrfeglO3B15wwkiEzyvA5sUdnJ2rHz5VvPjCUNQiGVwqZLLDP9 -9XLfImregy4/NKBN/M5RwF1HihdPOH5yeqBW+CF3WPvjatwlVwpduGdlhe2Kymu0 -wpys3mv/Y6cE6G9UmbUB14axhFhZ1DqrDLl7RvOOeezH94tCM8bG97nYgfJvkq9t -Z1chPweaNugOBe/GAle0P8sxSMvVh2k3exeSCVyFguZKzmt6THciJ7ney3vkJP9w -cnw5armWglVALEljMSZf5pNqBzvnXGxs0mHlH4KuJl01+fH/GMt6P/XMJ9vBVje/ -IqHexFtd9s8U7k885jkVCu+hTtEaOU71m5kGbfHX15Xbo5JSlX5L89PeZb4Xr5ts -sSJ31F/RmNCbrNQbhXJ2Q/tS/ndxKU1F+rCXIxGMGRcJDjBJ7PB613URZN5Nl0TV -NU356jMzURcAhRfdmN6GhTjM0cPz365hqywkHWryv20xrdLgGuYjxkNsU8DeQ7/R -ZDny ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.key b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.key deleted file mode 100644 index 4ea34697a30..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/client.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCNNAYrSZykTTjP -sVEHPaZg56giHtJOjIgjRxHz7pPdgQpHpLNk4tFdnvf8S5yxCzRbFgSpcuBKWfE4 -ENBW20TAiLhUHFCdNzdPWK1tkl4ae9+3XTye05flzNsUky57L/gPlY9EUEUl9KCp -E+riHnO72ubV5Rc4IHqXoH44rkS/n/w4scBdj9CpQ0U8tiCBQyibs6GdaoDRnUdH -nTgngaR4SwjAj9qwRyWjWBLpatXpUGFlkVLu7/8Lna/D6NJn5UBctyAn72boI9F2 -uEGH7JD2FfZktv5OtRo8CyC3GuPqgHS5XrYxgTvM2E2euSzrPBPwYM67+sxJsgjR -ukXcv8z98Pnu+lxtK7S3dMuA/ZmBXounAp6xCZyXebsbqa+HHVH0znGUqRw6NyjE -IyYK22TPKHj3HttVhkSb6YVX5Y+SCh4IGDl4RsHGxWwgeSlTYaOfMgUwmU+mfC0N -2Aopj995DzwItGUQXv6O4meNRLa1eYna1wa166AiLjn08fDdlwVpc+yF4RdRrzM+ -TI8JsVhculguldk3zAjDPGWC3DrY7CSuLoMDb0XStnLY3U1/lH+aRWo3r26Vk/Ff -1Ri3lsI9ifjPZUpPjomnGwFMxXxMtt9E7zE58uPc8BEIZYdXgqYEL19qQtCZWwwq -OVyhY3ebahUs0A5GVh2aj4jzUmvJqwIDAQABAoICABP52auTEOl/kTt0uuFa2+hW -rYcSNC9vmyzed5A6XsnV4RXsm4J4wiTMAgo7yjGTw7blIQi12zw5iDIl0suO3qWc -UfN4RAFR1+3OPk7Dh7OYdbhTpOlVRuZ4OkApaEh+K0pNHsUL1BSADKCO1EpkA3x+ -heyZqdTDZ4R+7IxpPwmbAQwmPXAfEeZ4QVnK7ENNNHf+jC0gbZP5+6UKfXC9Wv63 -osfXMhmBHzaCFb7W4edNe1HqosBxzHOgvcZp8CZJnPbg41gy+qx5sL7qZz7q/UEL -L13lM4n//fOjoV+2GqtIu/qjhwPu4/5hVW3QhaXLzIhTsbuPSgpc+PlusEaADehj -PKF3TIZDp6ZFd8kGrhP/l7xIrh90jnohEgcHbaq8gJgv/Esqyo7NFPRZ/vb+UzKs -NOxiC/NyoZqDCzDYx4AY9mr27oOfWaQEuUm0SsqnSVYLUL/VQiYYse0xoUU1bGjG -68PTBckay9wsI1QF/N9SGIxz5AB1OM2SyRKecswHpJSHpKmAqnqkPxlYGSs/LHL3 -yT/SYaKJXjeiUjhQZoh1qjQs+Z9oHGamoTSoSjJhKv3QKiwjToSPXQnOGbYZgCjQ -iUQvBDMPKObJiw7FXMNrxDvdXqwIWlo444mcmjtRNZxjesqwYcXlDYiOrikgs2pt -aN2pmdfTWmNf1UOQ7I9pAoIBAQC/dlPY/Z7L8gy7HVYOWfriQ6R7eQB6NxDHFikd -Uhs8rPpbJDBqt5Kj7F8zk/uKt/xwU0WgMN+9a3h2QwJESW/i7nx9rHlpovwByU/c -fcAG3Q68nFEsnWHZtLmzRHECwrDSE30anxgJ3KlAUw0AEHwCSqzQRRB+AOp+F7uP -2DgXTWWNBLzOP3QVKRvcuBEAHmMkDsW4WkS92TWuMQ+YQp7PXIvtqTzlGZtHHtbo -nFzyEbtBlaieiEWSbvIoljUJAWhrVmXj1pR4gC/sP2VHEqSwu6JCokjaikLp8y73 -1wD4RdU7osZJnT8Pb+NUGyFvGLhYJCKFD4ZHuXG4iY/LGYLjAoIBAQC8zL5Elszu -7ayAxX/lZtpdTvw1DAjtAF3GujSfs40IxMSJZ+T3V7PGi3m2/+mW/wzbo6B8p6FM -SpOMgRWrNFrhxR5rD0BVmIVdz2VIrRiCRjB2jCRwd0CmK1nUfi8YiI7hdZ20tI63 -YAYToeGakLv1aEc1sn3eWjxhKShDcyhWb8PWTjvfhxt5DQ8P3J9N7hvDexRpbqIg -Q6dwsTWF2toruphCimHHaBIvpW0PmnYpuqU7zJkvqxp06LXm1rEg40TmP9/aw8K5 -e/xXMuHAuIVQxNBeQ9PP+8MMRExfC5UcHHaoGqAaYHnfuHOQpfEjTxp9vhhSDLlC -JKIMVtZRdjCZAoIBAQCi57k7/b+pY8/1PWbFW0YeUtOWw0PmuQerfW2KJxxJqhxy -g/42Lu+0TiBKsHTseNNvd0rcm/kjIFgkt6ssExgCDE0cWS4M9cJaesFaqBxFOr2Z -OZ/PyDFDnYQLxgYqBSGR/UcK6ab4bSoNMxzymxQIlyUnKDx6GalrlCHgqGZBXXc0 -X32ON2s7vfiY+nxsj25ndbJBw3yN1EzaY6ATO0wIv4PHuaG4hOsbvl+5F6H1zaR4 -jzAjg2s+xuuAIR4LBYmlGqQjEabOSLN93gr8SB6cyWmsLIy0dcOtb17dPbDzjed6 -kGsKo6LOLbNNErCF6JChXk2IzcbBLEZYb6NLee9lAoIBAG8q63m9havF/MXSBO3R -sxAwGuctT/AlQBJsv+GtOoUIP2Vc7IALfwqQQ7nSU/uZ8Ds/zJa5qYsfemPH+jdV -25GGnNOTJmGALj8/iDbT3VOP+qdC+43RWhq9+eXZ6uc6OU9eDt9BVat5+foDXrDB -OjtVDGD82YpcfaMENfYJT54dryV36V9D0ZRkcRL46EBdzLE8vpcaEpKG44fCgG5x -n/cRpue/TbW5fMPbVy1R2PPXN8XPQf/Ecw6Vm83xaligGYit4aSRkg3fiITbq/vr -amxVhw+KRqT3bDDD4mgwjLsBs4hmLRF67yghFsL8QtF0mXeiv/VIEql0ooo7c3SB -8DkCggEAcIg4pK3ZgW6n93U4p6uDDCYY4EYFlCkdjbEgfxV7oZljgcVC/G+yAp0e -c9bnW2lqGbQ3i1EwLsgjFrzyO7pLzcRZt3VgW8wbfWtp/4NgRrFz/lPku0K7jjHT -LeES8L0kwnC8Zq/JTQnWXkHM4xB5BEIzpCG1cwGJIzfDtMat7a2x40DtnjXIZ+yq -xuuVAxg4m1KWRNHAKhVuq0hRk9/HKou83sJgs6vtZ6zE81csQwo4MOH1LwcsS2A4 -EVJOYPsoWpflL6ULvGyKckHdQMfzkHjrsUF/nfpOOikxe/ot4cu54eRQWKuZsJHR -rUDy/i3nw+6XSyDDV2kEJRodu+fA8Q== ------END PRIVATE KEY----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/regenerate.sh deleted file mode 100755 index cc052a4effe..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/regenerate.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh -# -# Regenerate certificates that are used for tests using TLS. -# Certs are generated with a one year expiry, so periodic regen is required. -# -# Usage: npm run maint:regenerate-test-certs - -rm ca.crt ca.key client.crt client.csr client.key server.crt server.csr server.key - -openssl genrsa -out ca.key 4096 -openssl req -new -x509 -days 365 -key ca.key -out ca.crt -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Root/OU=Test/CN=ca" - -openssl genrsa -out server.key 4096 -openssl req -new -key server.key -out server.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Server/CN=localhost" -openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out server.crt -openssl rsa -in server.key -out server.key - -openssl genrsa -out client.key 4096 -openssl req -new -key client.key -out client.csr -subj "/C=CL/ST=RM/L=OpenTelemetryTest/O=Test/OU=Client/CN=localhost" -openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out client.crt -openssl rsa -in client.key -out client.key diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.crt deleted file mode 100644 index e4e85c42df3..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFiDCCA3CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJDTDEL -MAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0wCwYDVQQK -DARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTAeFw0yNDA2MDgxOTE4 -NTFaFw0yNTA2MDgxOTE4NTFaMGoxCzAJBgNVBAYTAkNMMQswCQYDVQQIDAJSTTEa -MBgGA1UEBwwRT3BlblRlbGVtZXRyeVRlc3QxDTALBgNVBAoMBFRlc3QxDzANBgNV -BAsMBlNlcnZlcjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAsrgR40g2ius4P7h5mO6/2r9uD903m672EHRkYXKKKViV -wMS/7kgNo8vbenmmO0Ra3Rk3J80M4HhWJsI5bWvjLtbLkG6CkiK0yCpSbsK+F13B -oDvCeVEYaLz2IV2e/61l5y73Q5s6Iu2OTckIvGZr/jsCBJ+9457uuMd4Mvzi1jLo -PmVYJZYG/8I2dIjrtxqm/gAiBjbrZ5Nmm702GArvm85VWL8o3b0C+9YXI8PHHGT9 -CYqBjKobDdM0lrZdBiy5JEwSI1L0MCGzcmEVCJIuHe9b66GUVWrAsvOKrBMkziSm -BKjvAzDIsiRIS0Z2jiXpRwUhjpAphJDtsePGXvbSzvt4mUNUvSsnS4ImKURkDLVB -BndzJMUX0/fJG2fh0cVmT0V6+otqpPTrf89i3dsSG9gBHVlp4u1p7krQ8KgZ0Fpw -wbo+p41KrChQ8iwE4eEgcI2joQrC2ccpQzxyn/quH604gadtBTEw+NrCu8NB5hso -hMGJV1jMJ0wENkRY0WjD51y87ieUhMQwUnM7Yi7CLq3SJA9N0KHbtg4U+42d63pH -HmMwUw2cG7tVKJR/quZxwibqkA7mkUYp/pyILt6m1IOAwK5SgomMGCsstXSFXisR -fCCNTEkQMvuylC3TsV6THPb6zJvhntIkLGbSFzxfLeGP5x0KhqWt76W//BnKfXsC -AwEAAaNCMEAwHQYDVR0OBBYEFLNHcwOHiVPwk8X3kZnMBz/rezOiMB8GA1UdIwQY -MBaAFAnipYlSco3heta4YnxM3hgg3tGyMA0GCSqGSIb3DQEBCwUAA4ICAQCqWBJL -+hOWGK4IUXXUodvHcctiXU6ktUP4ki8Ml0c1UWnRZECuBU/tlCiasgQlGc0eld/H -q9h0zK3gUDoLXYb6uPuFUmhtJYY6ydIBR7XqCCTgBMfJ6gwxH2ybC/BTyp1cE9o1 -hMkaD+/r3JRGX0G5FPYRhfF5JDSGVAiWWFD1udPH4+UidjFAXTyi0bn5BsY5Aze9 -xVWvOMYNLxiaZEklfTGGgY7xbTECow+XR7ThguzL1Wg9GBJEAYWvfbdb+RKB5bqs -ggKRTg21VWapTeSbfnjhvyrRN2FamGxeW1lqb8Ts1yyKiqtkj/cy2tIheEGAPt/a -wWgFKAuSRN0YtSW8D8oOmY+4+ULDl0um/dhJ31/nF0qOgopHUozJXDj71GsNrokh -3TmYYnuyZdAAyVFwNffXWingfqNOs2ozf/efBTLLAb094QOnpdit9pYPqE5ar72Y -JdGACna1Mxz5PDa6Z7eQB7s7h/Q47JFXIOI4TdguKGYiDT0XXfEq6lKbvVYkheQ/ -kutiMFQQCwwv/LxRhjTeeFEnASyWgRhhvuTg0ndOqpCtgUJ8mEZ4c9RB+QA7XeOe -FKx9QMLJRAOMNE2WoSPhgaJrf6glSKOvR6CuH/v1ekE3pJpVZGk+3GOs3H8k92Vv -pV9S89yNX95tLzlOR/nKWLrX6n27fjE2BBXeBg== ------END CERTIFICATE----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.csr deleted file mode 100644 index 642fbae3c42..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.csr +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIErzCCApcCAQAwajELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQH -DBFPcGVuVGVsZW1ldHJ5VGVzdDENMAsGA1UECgwEVGVzdDEPMA0GA1UECwwGU2Vy -dmVyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCyuBHjSDaK6zg/uHmY7r/av24P3TebrvYQdGRhcoopWJXAxL/uSA2j -y9t6eaY7RFrdGTcnzQzgeFYmwjlta+Mu1suQboKSIrTIKlJuwr4XXcGgO8J5URho -vPYhXZ7/rWXnLvdDmzoi7Y5NyQi8Zmv+OwIEn73jnu64x3gy/OLWMug+ZVgllgb/ -wjZ0iOu3Gqb+ACIGNutnk2abvTYYCu+bzlVYvyjdvQL71hcjw8ccZP0JioGMqhsN -0zSWtl0GLLkkTBIjUvQwIbNyYRUIki4d71vroZRVasCy84qsEyTOJKYEqO8DMMiy -JEhLRnaOJelHBSGOkCmEkO2x48Ze9tLO+3iZQ1S9KydLgiYpRGQMtUEGd3MkxRfT -98kbZ+HRxWZPRXr6i2qk9Ot/z2Ld2xIb2AEdWWni7WnuStDwqBnQWnDBuj6njUqs -KFDyLATh4SBwjaOhCsLZxylDPHKf+q4frTiBp20FMTD42sK7w0HmGyiEwYlXWMwn -TAQ2RFjRaMPnXLzuJ5SExDBScztiLsIurdIkD03Qodu2DhT7jZ3rekceYzBTDZwb -u1UolH+q5nHCJuqQDuaRRin+nIgu3qbUg4DArlKCiYwYKyy1dIVeKxF8II1MSRAy -+7KULdOxXpMc9vrMm+Ge0iQsZtIXPF8t4Y/nHQqGpa3vpb/8Gcp9ewIDAQABoAAw -DQYJKoZIhvcNAQELBQADggIBAAvxaoCgCOM5mVOAFeLQoKGTORIWoT73yKeebLu8 -Ie26lrOZyItFneYCnyFocYb20mriC+C30lUgNM66mHWLW0QSDPhI0VeBMDRHYPMo -S5EWkQNy0VQ1HZV/DITXqEBld0WdmBl71D7gOlZvDHHnrb5emOKOVP/7poitywC1 -NA/Ry0TJYAz1z9uu5GLmMNJwfkRAPVYJnzMTMQ6G8z2tUKTTDKbJvkkJ1tmjBToD -/8JeXmxH0a0NuwC7QLDzR1Jl4XWj3uIAHUtcsHMFjOc3nAin3L7FGD7CaXTyz/Hw -J7GkeIMGSYs+i+09l9dMLSrlIsh2sphV768dKajqA11C6nGOeEkJFziY+l9KNy9B -MkW74Vj2SyN0l8Cn2X282UakAxQ0kCwpBQYSO+M6q2gVLhwTwmDUCpfuo03dOGrn -kHPDYQUahTLfKNEe6seXHomGUxTpMnr5p3ftMOrc4uCWY1DkhEviw9Jea666gG/e -5yiYcN4vSmru4GpmOV5N28GNC8oAgm7rPpPgXeiVET+p3wms8cZ8/Htpkxn2nTcc -3tBvAYt8qql9Wt/2R4ewo39bzg4dPzl9AUWeQRpA6O0n6ZhtHhCzDSik5Tam9fh8 -lxTldG69Enm4+amCLja/YYRmaEE9KYM3jxSi6k+Xh2L+vI8WlwbkZKnYs9suDW22 -eoJ+ ------END CERTIFICATE REQUEST----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.key b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.key deleted file mode 100644 index 1801be40223..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/certs/server.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCyuBHjSDaK6zg/ -uHmY7r/av24P3TebrvYQdGRhcoopWJXAxL/uSA2jy9t6eaY7RFrdGTcnzQzgeFYm -wjlta+Mu1suQboKSIrTIKlJuwr4XXcGgO8J5URhovPYhXZ7/rWXnLvdDmzoi7Y5N -yQi8Zmv+OwIEn73jnu64x3gy/OLWMug+ZVgllgb/wjZ0iOu3Gqb+ACIGNutnk2ab -vTYYCu+bzlVYvyjdvQL71hcjw8ccZP0JioGMqhsN0zSWtl0GLLkkTBIjUvQwIbNy -YRUIki4d71vroZRVasCy84qsEyTOJKYEqO8DMMiyJEhLRnaOJelHBSGOkCmEkO2x -48Ze9tLO+3iZQ1S9KydLgiYpRGQMtUEGd3MkxRfT98kbZ+HRxWZPRXr6i2qk9Ot/ -z2Ld2xIb2AEdWWni7WnuStDwqBnQWnDBuj6njUqsKFDyLATh4SBwjaOhCsLZxylD -PHKf+q4frTiBp20FMTD42sK7w0HmGyiEwYlXWMwnTAQ2RFjRaMPnXLzuJ5SExDBS -cztiLsIurdIkD03Qodu2DhT7jZ3rekceYzBTDZwbu1UolH+q5nHCJuqQDuaRRin+ -nIgu3qbUg4DArlKCiYwYKyy1dIVeKxF8II1MSRAy+7KULdOxXpMc9vrMm+Ge0iQs -ZtIXPF8t4Y/nHQqGpa3vpb/8Gcp9ewIDAQABAoICAAd1zuvkGcA19AtF+00TYqAv -SZNc89knansXFcv40vuyNv24e7Tm8s4VPxIcaZepejSbJXGT1ZjoPQo3PH9EIGth -tJxzr8Jx+UCLZv3y5fAxfJMmT9I0VBVJW3VmdaZS21WbA9/y5vvzFUUcyCT7VEBw -qDlojXOD6wPCw9JlaTD8+XlL2ZqzUpNhWFhN+fTv99Sk8FJKLfVS1W4qYhz/FgzL -+nP3mVv4jqECd63PMbs87TkYPCcp+nJ9yl4kAF5Z19hyoEh5SiD8CVWfohgXLgcu -3XExb83sExecgB6c/Q2Mkrj+nqMqUkoApub93zjy/YswtoFidfzYgv0C8RhPcZTJ -Iw7RzhDcYMyAVg3izcfhMAVPMLx0LbyXw5Fyj4K8Ec+soWPScseAfGaOtmodB8mn -XLTdfIpgJJKI5T58C5uXveotYJEcTMjJSoELTI+KrMgwhtaYeHyPINSDrgaCpzfl -ATxcPbFgdzINg/e12GkYRsXnzWe1zeYkv0gh3zsUV5N4lBYvOSqJ/O3CuqgTucWO -mjT5AdoWqGmuT7teUmK/ce6SEsH5f+wz1H51OcP1H659fKsdx/NE7NsItF9K7mTr -D1OTUcUwzih5eDIHfb6cIs6BSo8xC7ux0NVpbChKoUOgmCNS/BDAn67Z1pD8ScOG -1DmczC+YEwlVGZdXmfFNAoIBAQDu1eWPXIWwIffYkOeHTHP9D9uxUmGpSR0exXWU -M+hVrzH6rLwIy4LjmzlFvo9Nvu8yjPzQDgDfY+hC8AZy0oNZVGEhULblESjfR3Qa -SYC1usJuXF5E0xh+k4RRTZST+2Q/CDsnmE+8qQvPRv/sB4JJpzSadfjQi7k574QD -uZt6iyZSMVqZ7vHKg9bBipVNF6ZiFwt9AhZ9VMUvi5pH7sQwdNAbRT4QLDfrKmkc -K6HTALpH3ej6SfCxldrzDJ3SUYEyBus113tT/MdivkAvyTajhNKYSWYyhu0+296m -fq1b5Hw6pGCho+J35thCJsIEb6y7bZ4xgH3aH8dSmxf2RmMNAoIBAQC/kCXVmbM2 -ja+I90JUlXWAyCfbhfmD6Hg4/TSCO2Qx488mw3dDdJS5CkzxAXi+chbIIyxqaiZL -Wym886Iax1zAloi9l+801NYBbUiPnVA35MNxHkvTW3kyRLcMbM4wSEhVfjaL45S5 -7wNoRLW+8i3AQa8oO7v67PwCvspDGPgHwhshNP3z0XwIwob/fu7MLs70cLYbc3NZ -k8jhxfNimxdptehZLIs+kYz0CBR+t6unHbba6bM3ZCGSjhg1yU4EkNrxW1YELWmk -X+9BCsNxrqGko4h8XK1lNnNFhzf8kyPY0Vaa88BTo86r/p72Ezmx0sJhmb0R1wvq -BieY8HRc52CnAoIBAAinubz7RmD+qiOwBKPzklR+aaDAcoeW/bYqw7sOMoJAahhC -gEH1VhX3fxjW8gyIOdTkJRlJGKD/1t/uIN2yYU4wb6CscyRT/d4xkbSOK1rqnLcx -I71sxPt5Txc/L345YwWhv7sMmv8kRShK02VzVDZlF9PtKIouNhUyZ99Wr5q+RjI+ -VaE0dpC3PGYhJo33qHDvktwB4lzCYK77aSjoLzXuVchXNwuQ/qnIDK0Xq7Kg2R9X -nGTNnypgWuHp+CIyD/OHKqj12SNPCs66REs3CILegl9AcbKtDxXzE9uGxbOJ0TKy -2EmjTca4l+e1zdwpS+Iy88Ope2YXNrr4oeKr5FUCggEAZ5ZcTzApD/P4GvmR/clA -XB5gJz5AWgsoj7CkZ1QUb0IAL7b9VBXDongmeSDRmTJ6jUkv6G90O8WVQV8Bprdt -uZrtYJC7QndhLi5ZUYfA7CihYxb969IILJ2p2mcv7D36F3kDqAutzgmobwbQvOua -v98FB52dnifuctGW8EedQBy/rOpJ9UGvb9E5TQnnubQKJ3aXkyqQEr1uoF/5p7W0 -KG68sRP8TB5K+V8xLgDGKr1Ptvsu9WIJIYYDI3qy3Jc0PdWlIucnvEJAT4yxeVT0 -heIEmTNIdHXISa3AIa2zcbhpu6rZsqDeznUGooxs43LTuBF5gx8liyw+114XnnFj -+wKCAQBvYIspfu+hjHpR67Tv8NLAzH9pWcbpKJ66YYW5IaD3kytsML9C+x7NiuGy -U2Svxfdin3otbG/TEPH+d5e5t23lWZEBmuQucjhpRZj7J8zzImdjCtYMekYHIepD -1XMKAQdYqx251Gux2FHmYD8hbJbUJLrfuSyFksxvqDdkidQiKMfRDNS1IElkcRRz -bhJUPzJ9XRJIlkIzZCQ8XgZWDyiSA0Gpq+jwZfqmn8v4ol1cmK9EEAFZ9cewvSdq -YIxr/IvWouwSqVkn0p33g080Uv+Rc871XtnxMcdVFExVE2cPZFY7v8yWqpo7PNU+ -HvjeIanEQir29p2epOg8Epxewjc9 ------END PRIVATE KEY----- diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts deleted file mode 100644 index 7c9fbfd99c0..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts +++ /dev/null @@ -1,277 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - Counter, - Histogram, - HrTime, - ObservableGauge, - ObservableResult, - ValueType, -} from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import * as grpc from '@grpc/grpc-js'; -import { VERSION } from '@opentelemetry/core'; -import { - ExplicitBucketHistogramAggregation, - MeterProvider, - MetricReader, - View, -} from '@opentelemetry/sdk-metrics'; -import { - encodeAsString, - IKeyValue, - IMetric, - IResource, -} from '@opentelemetry/otlp-transformer'; - -class TestMetricReader extends MetricReader { - protected onForceFlush(): Promise { - return Promise.resolve(undefined); - } - - protected onShutdown(): Promise { - return Promise.resolve(undefined); - } -} - -const testResource = new Resource({ - service: 'ui', - version: 1, - cost: 112.12, -}); - -let reader = new TestMetricReader(); -let meterProvider = new MeterProvider({ - resource: testResource, - readers: [reader], -}); - -let meter = meterProvider.getMeter('default', '0.0.1'); - -export async function collect() { - return (await reader.collect())!; -} - -export function setUp() { - reader = new TestMetricReader(); - meterProvider = new MeterProvider({ - resource: testResource, - views: [ - new View({ - aggregation: new ExplicitBucketHistogramAggregation([0, 100]), - instrumentName: 'int-histogram', - }), - ], - readers: [reader], - }); - meter = meterProvider.getMeter('default', '0.0.1'); -} - -export async function shutdown() { - await meterProvider.shutdown(); -} - -export function mockCounter(): Counter { - const name = 'int-counter'; - return meter.createCounter(name, { - description: 'sample counter description', - valueType: ValueType.INT, - }); -} - -export function mockObservableGauge( - callback: (observableResult: ObservableResult) => void -): ObservableGauge { - const name = 'double-observable-gauge'; - const observableGauge = meter.createObservableGauge(name, { - description: 'sample observable gauge description', - valueType: ValueType.DOUBLE, - }); - observableGauge.addCallback(callback); - - return observableGauge; -} - -export function mockHistogram(): Histogram { - return meter.createHistogram('int-histogram', { - description: 'sample histogram description', - valueType: ValueType.INT, - }); -} - -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - value: 'stringValue', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedCounterIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime -) { - assert.strictEqual(metric.name, 'int-counter'); - assert.strictEqual(metric.description, 'sample counter description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.sum?.dataPoints.length, 1); - assert.strictEqual( - metric.sum?.aggregationTemporality, - 'AGGREGATION_TEMPORALITY_CUMULATIVE' - ); - assert.strictEqual(metric.sum?.isMonotonic, true); - - const [dp] = metric.sum.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.deepStrictEqual(dp.exemplars, []); - assert.strictEqual(dp.asInt, '1'); - assert.strictEqual(dp.flags, 0); - - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano as string, encodeAsString(time)); -} - -export function ensureExportedObservableGaugeIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime -) { - assert.strictEqual(metric.name, 'double-observable-gauge'); - assert.strictEqual(metric.description, 'sample observable gauge description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.gauge?.dataPoints.length, 1); - - const [dp] = metric.gauge.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.deepStrictEqual(dp.exemplars, []); - assert.strictEqual(dp.asDouble, 6); - assert.strictEqual(dp.flags, 0); - - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureExportedHistogramIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime, - explicitBounds: number[] = [Infinity], - bucketCounts: string[] = ['2', '0'] -) { - assert.strictEqual(metric.name, 'int-histogram'); - assert.strictEqual(metric.description, 'sample histogram description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.histogram?.dataPoints.length, 1); - assert.strictEqual( - metric.histogram?.aggregationTemporality, - 'AGGREGATION_TEMPORALITY_CUMULATIVE' - ); - - const [dp] = metric.histogram.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.deepStrictEqual(dp.exemplars, []); - assert.strictEqual(dp.flags, 0); - assert.strictEqual(dp.sum, 21); - assert.strictEqual(dp.count, '2'); - assert.strictEqual(dp.min, 7); - assert.strictEqual(dp.max, 14); - - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); - assert.deepStrictEqual(dp.bucketCounts, bucketCounts); - assert.deepStrictEqual(dp.explicitBounds, explicitBounds); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'service', - value: { - stringValue: 'ui', - value: 'stringValue', - }, - }, - { - key: 'version', - value: { - intValue: '1', - value: 'intValue', - }, - }, - { - key: 'cost', - value: { - doubleValue: 112.12, - value: 'doubleValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureMetadataIsCorrect( - actual?: grpc.Metadata, - expected?: grpc.Metadata -) { - //ignore user agent - expected?.remove('user-agent'); - actual?.remove('user-agent'); - assert.deepStrictEqual(actual?.getMap(), expected?.getMap() ?? {}); -} diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts new file mode 100644 index 00000000000..8dc6ae14e0c --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/utils.ts @@ -0,0 +1,72 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + Metadata, + Server, + ServerCredentials, + ServiceDefinition, +} from '@grpc/grpc-js'; + +export interface ExportedData { + request: Buffer; + metadata: Metadata; +} + +export interface ServerTestContext { + requests: ExportedData[]; + serverResponseProvider: () => { error: Error | null; buffer?: Buffer }; +} + +/** + * Starts a customizable server that saves all responses to context.responses + * Returns data as defined in context.ServerResponseProvider + * + * @return shutdown handle, needs to be called to ensure that mocha exits + * @param address address to bind to + * @param service service to start + * @param context context for storing responses and to define server behavior. + */ +export function startServer( + address: string, + service: ServiceDefinition, + context: ServerTestContext +): Promise<() => void> { + const server = new Server(); + server.addService(service, { + export: (data: ExportedData, callback: any) => { + context.requests.push(data); + const response = context.serverResponseProvider(); + callback(response.error, response.buffer); + }, + }); + + return new Promise<() => void>((resolve, reject) => { + server.bindAsync( + address, + ServerCredentials.createInsecure(), + (error, port) => { + server.start(); + if (error != null) { + reject(error); + } + resolve(() => { + server.forceShutdown(); + }); + } + ); + }); +} diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js index 4c60b54edba..50fac98bd80 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js @@ -1,11 +1,11 @@ -/*! +/* * Copyright The OpenTelemetry Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,10 +17,12 @@ const karmaWebpackConfig = require('../../../karma.webpack'); const karmaBaseConfig = require('../../../karma.base'); -module.exports = (config) => { - config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig, - files: ['test/browser/index-webpack.ts'], - preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } - })) +module.exports = config => { + config.set( + Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + files: ['test/browser/index-webpack.ts'], + preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] }, + }) + ); }; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index c71ed8cbf26..606d3d793fc 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -62,10 +62,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -79,12 +79,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -92,11 +92,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts index 76b7f74dfda..33880a4fdaa 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult, getEnv } from '@opentelemetry/core'; +import { getEnv } from '@opentelemetry/core'; import { AggregationTemporality, AggregationTemporalitySelector, @@ -28,7 +28,10 @@ import { AggregationTemporalityPreference, OTLPMetricExporterOptions, } from './OTLPMetricExporterOptions'; -import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; +import { + IOtlpExportDelegate, + OTLPExporterBase, +} from '@opentelemetry/otlp-exporter-base'; import { diag } from '@opentelemetry/api'; export const CumulativeTemporalitySelector: AggregationTemporalitySelector = @@ -117,37 +120,24 @@ function chooseAggregationSelector( } } -export class OTLPMetricExporterBase< - T extends OTLPExporterBase, -> implements PushMetricExporter +export class OTLPMetricExporterBase + extends OTLPExporterBase + implements PushMetricExporter { - public _otlpExporter: T; - private _aggregationTemporalitySelector: AggregationTemporalitySelector; - private _aggregationSelector: AggregationSelector; - - constructor(exporter: T, config?: OTLPMetricExporterOptions) { - this._otlpExporter = exporter; + private readonly _aggregationTemporalitySelector: AggregationTemporalitySelector; + private readonly _aggregationSelector: AggregationSelector; + + constructor( + delegate: IOtlpExportDelegate, + config?: OTLPMetricExporterOptions + ) { + super(delegate); this._aggregationSelector = chooseAggregationSelector(config); this._aggregationTemporalitySelector = chooseTemporalitySelector( config?.temporalityPreference ); } - export( - metrics: ResourceMetrics, - resultCallback: (result: ExportResult) => void - ): void { - this._otlpExporter.export([metrics], resultCallback); - } - - async shutdown(): Promise { - await this._otlpExporter.shutdown(); - } - - forceFlush(): Promise { - return Promise.resolve(); - } - selectAggregation(instrumentType: InstrumentType): Aggregation { return this._aggregationSelector(instrumentType); } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts index 44b5a3e1b20..e77177dce6e 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts @@ -14,9 +14,14 @@ * limitations under the License. */ -/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] -- - * TODO: Replace export * with named exports before next major version - */ -export * from './platform'; -export * from './OTLPMetricExporterOptions'; -export * from './OTLPMetricExporterBase'; +export { OTLPMetricExporter } from './platform'; +export { + OTLPMetricExporterOptions, + AggregationTemporalityPreference, +} from './OTLPMetricExporterOptions'; +export { + CumulativeTemporalitySelector, + DeltaTemporalitySelector, + LowMemoryTemporalitySelector, + OTLPMetricExporterBase, +} from './OTLPMetricExporterBase'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts index 828cd61b0c0..01a39a24795 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts @@ -14,39 +14,24 @@ * limitations under the License. */ -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; -import { - OTLPExporterBrowserBase, - OTLPExporterConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { - IExportMetricsServiceResponse, - JsonMetricsSerializer, -} from '@opentelemetry/otlp-transformer'; - -const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/metrics'; - -class OTLPExporterBrowserProxy extends OTLPExporterBrowserBase< - ResourceMetrics, - IExportMetricsServiceResponse -> { - constructor(config?: OTLPMetricExporterOptions & OTLPExporterConfigBase) { - super( - config, - JsonMetricsSerializer, - { 'Content-Type': 'application/json' }, - DEFAULT_COLLECTOR_RESOURCE_PATH - ); - } -} +import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { JsonMetricsSerializer } from '@opentelemetry/otlp-transformer'; +import { createLegacyOtlpBrowserExportDelegate } from '@opentelemetry/otlp-exporter-base/browser-http'; /** * Collector Metric Exporter for Web */ -export class OTLPMetricExporter extends OTLPMetricExporterBase { +export class OTLPMetricExporter extends OTLPMetricExporterBase { constructor(config?: OTLPExporterConfigBase & OTLPMetricExporterOptions) { - super(new OTLPExporterBrowserProxy(config), config); + super( + createLegacyOtlpBrowserExportDelegate( + config ?? {}, + JsonMetricsSerializer, + 'v1/metrics', + { 'Content-Type': 'application/json' } + ) + ); } } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts index 231f75b5937..be76cce78f5 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts @@ -14,7 +14,4 @@ * limitations under the License. */ -/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] -- - * TODO: Replace export * with named exports before next major version - */ -export * from './OTLPMetricExporter'; +export { OTLPMetricExporter } from './OTLPMetricExporter'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts index 65e269f6773..f94c843caa0 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts @@ -14,7 +14,4 @@ * limitations under the License. */ -/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] -- - * TODO: Replace export * with named exports before next major version - */ -export * from './node'; +export { OTLPMetricExporter } from './node'; 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 368858190af..ae7ea320daf 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 @@ -14,46 +14,34 @@ * limitations under the License. */ -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; -import { - OTLPExporterNodeBase, - OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { - IExportMetricsServiceResponse, - JsonMetricsSerializer, -} from '@opentelemetry/otlp-transformer'; +import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { JsonMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { VERSION } from '../../version'; +import { + convertLegacyHttpOptions, + createOtlpHttpExportDelegate, +} from '@opentelemetry/otlp-exporter-base/node-http'; const USER_AGENT = { 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, }; -class OTLPExporterNodeProxy extends OTLPExporterNodeBase< - ResourceMetrics, - IExportMetricsServiceResponse -> { - constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) { - super( - config, - JsonMetricsSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/json', - }, - 'METRICS', - 'v1/metrics' - ); - } -} - /** - * Collector Metric Exporter for Node + * OTLP Metric Exporter for Node.js */ -export class OTLPMetricExporter extends OTLPMetricExporterBase { +export class OTLPMetricExporter extends OTLPMetricExporterBase { constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) { - super(new OTLPExporterNodeProxy(config), config); + super( + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config ?? {}, 'METRICS', 'v1/metrics', { + ...USER_AGENT, + 'Content-Type': 'application/json', + }), + JsonMetricsSerializer + ), + config + ); } } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts index 231f75b5937..be76cce78f5 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts @@ -14,7 +14,4 @@ * limitations under the License. */ -/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] -- - * TODO: Replace export * with named exports before next major version - */ -export * from './OTLPMetricExporter'; +export { OTLPMetricExporter } from './OTLPMetricExporter'; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts deleted file mode 100644 index 5650fc8510a..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts +++ /dev/null @@ -1,429 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - diag, - DiagLogger, - DiagLogLevel, - Counter, - Histogram, -} from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import * as assert from 'assert'; -import * as sinon from 'sinon'; -import { OTLPMetricExporter } from '../../src/platform/browser'; -import { - collect, - ensureCounterIsCorrect, - ensureExportMetricsServiceRequestIsSet, - ensureHeadersContain, - ensureHistogramIsCorrect, - ensureObservableGaugeIsCorrect, - ensureWebResourceIsCorrect, - HISTOGRAM_AGGREGATION_VIEW, - mockCounter, - mockHistogram, - mockObservableGauge, - setUp, - shutdown, -} from '../metricsHelper'; -import { - AggregationTemporalityPreference, - OTLPMetricExporterOptions, -} from '../../src'; -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; - -describe('OTLPMetricExporter - web', () => { - let collectorExporter: OTLPMetricExporter; - let stubOpen: sinon.SinonStub; - let stubBeacon: sinon.SinonStub; - let metrics: ResourceMetrics; - let debugStub: sinon.SinonStub; - let errorStub: sinon.SinonStub; - - beforeEach(async () => { - setUp([HISTOGRAM_AGGREGATION_VIEW]); - stubOpen = sinon.stub(XMLHttpRequest.prototype, 'open'); - sinon.stub(XMLHttpRequest.prototype, 'send'); - stubBeacon = sinon.stub(navigator, 'sendBeacon'); - - const counter: Counter = mockCounter(); - mockObservableGauge(observableResult => { - observableResult.observe(3, {}); - observableResult.observe(6, {}); - }, 'double-observable-gauge2'); - const histogram: Histogram = mockHistogram(); - - counter.add(1); - histogram.record(7); - histogram.record(14); - - const { resourceMetrics, errors } = await collect(); - assert.strictEqual(errors.length, 0); - metrics = resourceMetrics; - - // Need to stub/spy on the underlying logger as the "diag" instance is global - debugStub = sinon.stub(); - errorStub = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: debugStub, - error: errorStub, - info: nop, - verbose: nop, - warn: nop, - }; - diag.setLogger(diagLogger, DiagLogLevel.DEBUG); - }); - - afterEach(async () => { - await shutdown(); - sinon.restore(); - diag.disable(); - }); - - describe('export', () => { - describe('when "sendBeacon" is available', () => { - beforeEach(() => { - collectorExporter = new OTLPMetricExporter({ - url: 'http://foo.bar.com', - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - }); - - it('should successfully send metrics using sendBeacon', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(async () => { - const args = stubBeacon.args[0]; - const url = args[0]; - const blob: Blob = args[1]; - const body = await blob.text(); - const json = JSON.parse(body) as IExportMetricsServiceRequest; - - // The order of the metrics is not guaranteed. - const counterIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-counter' - ); - const observableIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'double-observable-gauge2' - ); - const histogramIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-histogram' - ); - - const metric1 = - json.resourceMetrics[0].scopeMetrics[0].metrics[counterIndex]; - const metric2 = - json.resourceMetrics[0].scopeMetrics[0].metrics[observableIndex]; - const metric3 = - json.resourceMetrics[0].scopeMetrics[0].metrics[histogramIndex]; - - assert.ok(typeof metric1 !== 'undefined', "metric doesn't exist"); - - ensureCounterIsCorrect( - metric1, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0] - .startTime - ); - - assert.ok( - typeof metric2 !== 'undefined', - "second metric doesn't exist" - ); - ensureObservableGaugeIsCorrect( - metric2, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .startTime, - 6, - 'double-observable-gauge2' - ); - - assert.ok( - typeof metric3 !== 'undefined', - "third metric doesn't exist" - ); - ensureHistogramIsCorrect( - metric3, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .startTime, - [0, 100], - [0, 2, 0] - ); - - const resource = json.resourceMetrics[0].resource; - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - ensureWebResourceIsCorrect(resource); - - assert.strictEqual(url, 'http://foo.bar.com'); - - assert.strictEqual(stubBeacon.callCount, 1); - assert.strictEqual(stubOpen.callCount, 0); - - ensureExportMetricsServiceRequestIsSet(json); - - done(); - }); - }); - - it('should log the successful message', done => { - stubBeacon.returns(true); - - collectorExporter.export(metrics, () => {}); - - queueMicrotask(() => { - const response: any = debugStub.args[2][0]; - assert.strictEqual(response, 'SendBeacon success'); - assert.strictEqual(errorStub.args.length, 0); - - done(); - }); - }); - - it('should log the error message', done => { - stubBeacon.returns(false); - - collectorExporter.export(metrics, result => { - try { - assert.deepStrictEqual(result.code, ExportResultCode.FAILED); - assert.ok( - result.error, - 'Expected Error, but no Error was present on the result' - ); - assert.match(result.error?.message, /SendBeacon failed/); - done(); - } catch (e) { - done(e); - } - }); - }); - }); - - describe('when "sendBeacon" is NOT available', () => { - let server: any; - beforeEach(() => { - (window.navigator as any).sendBeacon = false; - collectorExporter = new OTLPMetricExporter({ - url: 'http://foo.bar.com', - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - // Overwrites the start time to make tests consistent - Object.defineProperty(collectorExporter, '_startTime', { - value: 1592602232694000000, - }); - server = sinon.fakeServer.create(); - }); - afterEach(() => { - server.restore(); - }); - - it('should successfully send the metrics using XMLHttpRequest', done => { - collectorExporter.export(metrics, () => {}); - - queueMicrotask(async () => { - const request = server.requests[0]; - assert.strictEqual(request.method, 'POST'); - assert.strictEqual(request.url, 'http://foo.bar.com'); - - const body = request.requestBody; - const decoder = new TextDecoder(); - const json = JSON.parse( - decoder.decode(await body.arrayBuffer()) - ) as IExportMetricsServiceRequest; - // The order of the metrics is not guaranteed. - const counterIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-counter' - ); - const observableIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'double-observable-gauge2' - ); - const histogramIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-histogram' - ); - - const metric1 = - json.resourceMetrics[0].scopeMetrics[0].metrics[counterIndex]; - const metric2 = - json.resourceMetrics[0].scopeMetrics[0].metrics[observableIndex]; - const metric3 = - json.resourceMetrics[0].scopeMetrics[0].metrics[histogramIndex]; - - assert.ok(typeof metric1 !== 'undefined', "metric doesn't exist"); - ensureCounterIsCorrect( - metric1, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0] - .startTime - ); - - assert.ok( - typeof metric2 !== 'undefined', - "second metric doesn't exist" - ); - ensureObservableGaugeIsCorrect( - metric2, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .startTime, - 6, - 'double-observable-gauge2' - ); - - assert.ok( - typeof metric3 !== 'undefined', - "third metric doesn't exist" - ); - ensureHistogramIsCorrect( - metric3, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .startTime, - [0, 100], - [0, 2, 0] - ); - - const resource = json.resourceMetrics[0].resource; - assert.ok(typeof resource !== 'undefined', "resource doesn't exist"); - ensureWebResourceIsCorrect(resource); - - assert.strictEqual(stubBeacon.callCount, 0); - ensureExportMetricsServiceRequestIsSet(json); - - done(); - }); - }); - - it('should log the successful message', done => { - collectorExporter.export(metrics, () => {}); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(200); - - const response: any = debugStub.args[2][0]; - assert.strictEqual(response, 'XHR success'); - assert.strictEqual(errorStub.args.length, 0); - - assert.strictEqual(stubBeacon.callCount, 0); - done(); - }); - }); - - it('should log the error message', done => { - collectorExporter.export(metrics, result => { - try { - assert.deepStrictEqual(result.code, ExportResultCode.FAILED); - assert.deepStrictEqual( - result.error?.message, - 'XHR request failed with non-retryable status' - ); - } catch (e) { - done(e); - } - done(); - }); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(400); - }); - }); - it('should send custom headers', done => { - collectorExporter.export(metrics, () => {}); - - queueMicrotask(() => { - const request = server.requests[0]; - request.respond(200); - - assert.strictEqual(stubBeacon.callCount, 0); - done(); - }); - }); - }); - }); - - describe('export with custom headers', () => { - let server: any; - const customHeaders = { - foo: 'bar', - bar: 'baz', - }; - let collectorExporterConfig: - | (OTLPExporterConfigBase & OTLPMetricExporterOptions) - | undefined; - - beforeEach(() => { - collectorExporterConfig = { - headers: customHeaders, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }; - server = sinon.fakeServer.create(); - }); - - afterEach(() => { - server.restore(); - }); - - describe('when "sendBeacon" is available', () => { - beforeEach(() => { - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - }); - it('should successfully send custom headers using XMLHTTPRequest', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(() => { - const [{ requestHeaders }] = server.requests; - - ensureHeadersContain(requestHeaders, customHeaders); - assert.strictEqual(stubBeacon.callCount, 0); - assert.strictEqual(stubOpen.callCount, 0); - - done(); - }); - }); - }); - - describe('when "sendBeacon" is NOT available', () => { - beforeEach(() => { - (window.navigator as any).sendBeacon = false; - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - }); - - it('should successfully send metrics using XMLHttpRequest', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(() => { - const [{ requestHeaders }] = server.requests; - - ensureHeadersContain(requestHeaders, customHeaders); - assert.strictEqual(stubBeacon.callCount, 0); - assert.strictEqual(stubOpen.callCount, 0); - - done(); - }); - }); - }); - }); -}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts new file mode 100644 index 00000000000..cd6d80d8eaa --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/OTLPMetricExporter.test.ts @@ -0,0 +1,108 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + MeterProvider, + PeriodicExportingMetricReader, +} from '@opentelemetry/sdk-metrics'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import { OTLPMetricExporter } from '../../src/platform/browser'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ + +describe('OTLPMetricExporter', function () { + afterEach(() => { + sinon.restore(); + }); + + describe('export', function () { + describe('when sendBeacon is available', function () { + it('should successfully send data using sendBeacon', async function () { + // arrange + const stubBeacon = sinon.stub(navigator, 'sendBeacon'); + const meterProvider = new MeterProvider({ + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter(), + }), + ], + }); + + // act + meterProvider + .getMeter('test-meter') + .createCounter('test-counter') + .add(1); + await meterProvider.forceFlush(); + await meterProvider.shutdown(); + + // assert + const args = stubBeacon.args[0]; + const blob: Blob = args[1] as unknown as Blob; + const body = await blob.text(); + assert.doesNotThrow( + () => JSON.parse(body), + 'expected requestBody to be in JSON format, but parsing failed' + ); + }); + }); + + describe('when sendBeacon is not available', function () { + beforeEach(function () { + // fake sendBeacon not being available + (window.navigator as any).sendBeacon = false; + }); + + it('should successfully send data using XMLHttpRequest', async function () { + // arrange + const server = sinon.fakeServer.create(); + server.respondWith('OK'); + server.respondImmediately = true; + server.autoRespond = true; + const meterProvider = new MeterProvider({ + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter(), + }), + ], + }); + + // act + meterProvider + .getMeter('test-meter') + .createCounter('test-counter') + .add(1); + + await meterProvider.forceFlush(); + await meterProvider.shutdown(); + + // assert + const request = server.requests[0]; + const body = request.requestBody as unknown as Uint8Array; + assert.doesNotThrow( + () => JSON.parse(new TextDecoder().decode(body)), + 'expected requestBody to be in JSON format, but parsing failed' + ); + }); + }); + }); +}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts index 99100a0f6ee..ae7d4b5a9dd 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts @@ -16,8 +16,5 @@ const testsContext = require.context('../browser', true, /test$/); testsContext.keys().forEach(testsContext); -const testsContextCommon = require.context('../common', true, /test$/); -testsContextCommon.keys().forEach(testsContextCommon); - const srcContext = require.context('.', true, /src$/); srcContext.keys().forEach(srcContext); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts deleted file mode 100644 index e6e646f06a2..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ExportResultCode } from '@opentelemetry/core'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import * as assert from 'assert'; -import * as sinon from 'sinon'; -import { - collect, - mockCounter, - mockObservableGauge, - setUp, - shutdown, -} from '../metricsHelper'; -import { - OTLPExporterBase, - OTLPExporterConfigBase, -} from '@opentelemetry/otlp-exporter-base'; - -type CollectorExporterConfig = OTLPExporterConfigBase; - -class OTLPMetricExporter extends OTLPExporterBase< - CollectorExporterConfig, - ResourceMetrics -> { - onShutdown() {} - - send() {} - - getDefaultUrl(config: CollectorExporterConfig) { - return config.url || ''; - } -} - -describe('OTLPMetricExporter - common', () => { - let collectorExporter: OTLPMetricExporter; - let collectorExporterConfig: CollectorExporterConfig; - let metrics: ResourceMetrics; - - beforeEach(() => { - setUp(); - }); - - afterEach(async () => { - await shutdown(); - sinon.restore(); - }); - - describe('constructor', () => { - beforeEach(async () => { - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - const counter = mockCounter(); - mockObservableGauge(observableResult => { - observableResult.observe(3, {}); - observableResult.observe(6, {}); - }, 'double-observable-gauge3'); - counter.add(1); - - const { resourceMetrics, errors } = await collect(); - assert.strictEqual(errors.length, 0); - metrics = resourceMetrics; - }); - - it('should create an instance', () => { - assert.ok(typeof collectorExporter !== 'undefined'); - }); - - describe('when config is missing certain params', () => { - beforeEach(() => { - collectorExporter = new OTLPMetricExporter(); - }); - }); - }); - - describe('export', () => { - let spySend: any; - beforeEach(() => { - spySend = sinon.stub(OTLPMetricExporter.prototype, 'send'); - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - }); - - it('should export metrics as otlpTypes.Metrics', done => { - collectorExporter.export([metrics], () => {}); - setTimeout(() => { - const metric1 = spySend.args[0][0][0] as ResourceMetrics; - assert.deepStrictEqual(metrics, metric1); - done(); - }); - assert.strictEqual(spySend.callCount, 1); - }); - - describe('when exporter is shutdown', () => { - it( - 'should not export anything but return callback with code' + - ' "FailedNotRetryable"', - async () => { - await collectorExporter.shutdown(); - spySend.resetHistory(); - - const callbackSpy = sinon.spy(); - collectorExporter.export([metrics], callbackSpy); - const returnCode = callbackSpy.args[0][0]; - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual(spySend.callCount, 0, 'should not call send'); - } - ); - }); - describe('when an error occurs', () => { - it('should return failed export result', done => { - spySend.throws({ - code: 600, - details: 'Test error', - metadata: {}, - message: 'Non-Retryable', - stack: 'Stack', - }); - const callbackSpy = sinon.spy(); - collectorExporter.export([metrics], callbackSpy); - setTimeout(() => { - const returnCode = callbackSpy.args[0][0]; - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual( - returnCode.error.message, - 'Non-Retryable', - 'return error message is wrong' - ); - assert.strictEqual(spySend.callCount, 1, 'should call send'); - done(); - }); - }); - }); - }); - - describe('shutdown', () => { - let onShutdownSpy: any; - beforeEach(() => { - onShutdownSpy = sinon.stub(OTLPMetricExporter.prototype, 'onShutdown'); - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - }); - - it('should call onShutdown', async () => { - await collectorExporter.shutdown(); - assert.strictEqual(onShutdownSpy.callCount, 1); - }); - }); -}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts deleted file mode 100644 index 850cdae4d0f..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts +++ /dev/null @@ -1,341 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - Counter, - ObservableResult, - Histogram, - ValueType, - ObservableCounter, - ObservableGauge, - ObservableUpDownCounter, - HrTime, -} from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import { InstrumentationScope, VERSION } from '@opentelemetry/core'; -import { - ExplicitBucketHistogramAggregation, - MeterProvider, - MetricReader, - View, -} from '@opentelemetry/sdk-metrics'; -import { - encodeAsString, - IExportMetricsServiceRequest, - IKeyValue, - IMetric, - IResource, -} from '@opentelemetry/otlp-transformer'; - -if (typeof Buffer === 'undefined') { - (window as any).Buffer = { - from: function (arr: []) { - return new Uint8Array(arr); - }, - }; -} - -class TestMetricReader extends MetricReader { - protected onForceFlush(): Promise { - return Promise.resolve(undefined); - } - - protected onShutdown(): Promise { - return Promise.resolve(undefined); - } -} - -export const HISTOGRAM_AGGREGATION_VIEW = new View({ - aggregation: new ExplicitBucketHistogramAggregation([0, 100]), - instrumentName: 'int-histogram', -}); - -const defaultResource = Resource.default().merge( - new Resource({ - service: 'ui', - version: 1, - cost: 112.12, - }) -); - -let reader = new TestMetricReader(); -let meterProvider = new MeterProvider({ - resource: defaultResource, - readers: [reader], -}); -let meter = meterProvider.getMeter('default', '0.0.1'); - -export async function collect() { - return (await reader.collect())!; -} - -export function setUp(views?: View[]) { - reader = new TestMetricReader(); - meterProvider = new MeterProvider({ - resource: defaultResource, - views, - readers: [reader], - }); - meter = meterProvider.getMeter('default', '0.0.1'); -} - -export async function shutdown() { - await meterProvider.shutdown(); -} - -export function mockCounter(): Counter { - const name = 'int-counter'; - return meter.createCounter(name, { - description: 'sample counter description', - valueType: ValueType.INT, - }); -} - -export function mockObservableGauge( - callback: (observableResult: ObservableResult) => void, - name = 'double-observable-gauge' -): ObservableGauge { - const observableGauge = meter.createObservableGauge(name, { - description: 'sample observable gauge description', - valueType: ValueType.DOUBLE, - }); - observableGauge.addCallback(callback); - - return observableGauge; -} - -export function mockDoubleCounter(): Counter { - const name = 'double-counter'; - return meter.createCounter(name, { - description: 'sample counter description', - valueType: ValueType.DOUBLE, - }); -} - -export function mockObservableCounter( - callback: (observableResult: ObservableResult) => void, - name = 'double-observable-counter' -): ObservableCounter { - const observableCounter = meter.createObservableCounter(name, { - description: 'sample observable counter description', - valueType: ValueType.DOUBLE, - }); - observableCounter.addCallback(callback); - - return observableCounter; -} - -export function mockObservableUpDownCounter( - callback: (observableResult: ObservableResult) => void, - name = 'double-up-down-observable-counter' -): ObservableUpDownCounter { - const observableUpDownCounter = meter.createObservableUpDownCounter(name, { - description: 'sample observable up down counter description', - valueType: ValueType.DOUBLE, - }); - observableUpDownCounter.addCallback(callback); - - return observableUpDownCounter; -} - -export function mockHistogram(): Histogram { - return meter.createHistogram('int-histogram', { - description: 'sample histogram description', - valueType: ValueType.INT, - }); -} - -export const mockedResources: Resource[] = [ - new Resource({ name: 'resource 1' }), - new Resource({ name: 'resource 2' }), -]; - -export const mockedInstrumentationLibraries: InstrumentationScope[] = [ - { - name: 'lib1', - version: '0.0.1', - }, - { - name: 'lib2', - version: '0.0.2', - }, -]; - -export function ensureAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - 'attributes are incorrect' - ); -} - -export function ensureWebResourceIsCorrect(resource: IResource) { - assert.strictEqual(resource.attributes.length, 7); - assert.strictEqual(resource.attributes[0].key, 'service.name'); - assert.strictEqual( - resource.attributes[0].value.stringValue, - 'unknown_service' - ); - assert.strictEqual(resource.attributes[1].key, 'telemetry.sdk.language'); - assert.strictEqual(resource.attributes[1].value.stringValue, 'webjs'); - assert.strictEqual(resource.attributes[2].key, 'telemetry.sdk.name'); - assert.strictEqual(resource.attributes[2].value.stringValue, 'opentelemetry'); - assert.strictEqual(resource.attributes[3].key, 'telemetry.sdk.version'); - assert.strictEqual(resource.attributes[3].value.stringValue, VERSION); - assert.strictEqual(resource.attributes[4].key, 'service'); - assert.strictEqual(resource.attributes[4].value.stringValue, 'ui'); - assert.strictEqual(resource.attributes[5].key, 'version'); - assert.strictEqual(resource.attributes[5].value.intValue, 1); - assert.strictEqual(resource.attributes[6].key, 'cost'); - assert.strictEqual(resource.attributes[6].value.doubleValue, 112.12); - assert.strictEqual(resource.droppedAttributesCount, 0); -} - -export function ensureCounterIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime -) { - assert.strictEqual(metric.name, 'int-counter'); - assert.strictEqual(metric.description, 'sample counter description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.sum?.dataPoints.length, 1); - assert.strictEqual(metric.sum?.isMonotonic, true); - assert.strictEqual(metric.sum?.aggregationTemporality, 2); - - const [dp] = metric.sum.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.strictEqual(dp.asInt, 1); - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureDoubleCounterIsCorrect( - metric: IMetric, - time: number, - endTime: number -) { - assert.deepStrictEqual(metric, { - name: 'double-counter', - description: 'sample counter description', - unit: '', - doubleSum: { - dataPoints: [ - { - labels: [], - value: 8, - startTimeUnixNano: endTime, - timeUnixNano: time, - }, - ], - isMonotonic: true, - aggregationTemporality: 2, - }, - }); -} - -export function ensureObservableGaugeIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime, - value: number, - name = 'double-observable-gauge' -) { - assert.strictEqual(metric.name, name); - assert.strictEqual(metric.description, 'sample observable gauge description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.gauge?.dataPoints.length, 1); - - const [dp] = metric.gauge.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.strictEqual(dp.asDouble, value); - - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureHistogramIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime, - explicitBounds: (number | null)[] = [Infinity], - bucketCounts: number[] = [2, 0] -) { - assert.strictEqual(metric.name, 'int-histogram'); - assert.strictEqual(metric.description, 'sample histogram description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.histogram?.dataPoints.length, 1); - assert.strictEqual(metric.histogram?.aggregationTemporality, 2); - - const [dp] = metric.histogram.dataPoints; - - assert.deepStrictEqual(dp.attributes, []); - assert.strictEqual(dp.sum, 21); - assert.strictEqual(dp.count, 2); - assert.strictEqual(dp.min, 7); - assert.strictEqual(dp.max, 14); - assert.deepStrictEqual(dp.bucketCounts, bucketCounts); - assert.deepStrictEqual(dp.explicitBounds, explicitBounds); - - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureExportMetricsServiceRequestIsSet( - json: IExportMetricsServiceRequest -) { - const resourceMetrics = json.resourceMetrics; - assert.strictEqual( - resourceMetrics.length, - 1, - 'resourceMetrics has incorrect length' - ); - - const resource = resourceMetrics[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeMetrics = resourceMetrics[0].scopeMetrics; - assert.strictEqual(scopeMetrics?.length, 1, 'scopeMetrics is missing'); - - const scope = scopeMetrics[0].scope; - assert.ok(scope, 'scope is missing'); - - const metrics = resourceMetrics[0].scopeMetrics[0].metrics; - assert.strictEqual(metrics.length, 3, 'Metrics are missing'); -} - -export function ensureHeadersContain( - actual: { [key: string]: string }, - expected: { [key: string]: string } -) { - Object.entries(expected).forEach(([k, v]) => { - assert.strictEqual( - v, - actual[k], - `Expected ${actual} to contain ${k}: ${v}` - ); - }); -} 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 deleted file mode 100644 index 4b11c946cc1..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts +++ /dev/null @@ -1,462 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { diag, DiagLogger } from '@opentelemetry/api'; -import * as core from '@opentelemetry/core'; -import * as assert from 'assert'; -import * as http from 'http'; -import * as sinon from 'sinon'; -import { - AggregationTemporalityPreference, - OTLPMetricExporterOptions, -} from '../../src'; - -import { OTLPMetricExporter } from '../../src/platform/node'; -import { - collect, - ensureCounterIsCorrect, - ensureExportMetricsServiceRequestIsSet, - ensureHistogramIsCorrect, - ensureObservableGaugeIsCorrect, - HISTOGRAM_AGGREGATION_VIEW, - mockCounter, - mockHistogram, - mockObservableGauge, - setUp, - shutdown, -} from '../metricsHelper'; -import { MockedResponse } from './nodeHelpers'; -import { - Aggregation, - AggregationTemporality, - ExplicitBucketHistogramAggregation, - InstrumentType, - ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; -import { PassThrough, Stream } from 'stream'; -import { - OTLPExporterError, - OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; - -let fakeRequest: PassThrough; - -const address = 'localhost:1501'; - -describe('OTLPMetricExporter - node with json over http', () => { - let collectorExporter: OTLPMetricExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase & - OTLPMetricExporterOptions; - let stubRequest: sinon.SinonStub; - let metrics: ResourceMetrics; - - beforeEach(async () => { - setUp([HISTOGRAM_AGGREGATION_VIEW]); - }); - - afterEach(async () => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - await shutdown(); - sinon.restore(); - }); - - describe('instance', () => { - let warnStub: sinon.SinonStub; - - beforeEach(() => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - warnStub = sinon.stub(); - const nop = () => {}; - const diagLogger: DiagLogger = { - debug: nop, - error: nop, - info: nop, - verbose: nop, - warn: warnStub, - }; - diag.setLogger(diagLogger); - }); - - afterEach(() => { - diag.disable(); - }); - - it('should warn about metadata when using json', () => { - const metadata = 'foo'; - collectorExporter = new OTLPMetricExporter({ - url: address, - metadata, - } as any); - const args = warnStub.args[0]; - assert.strictEqual(args[0], 'Metadata cannot be set when using http'); - }); - }); - - describe('temporality', () => { - it('should use the right temporality when Cumulative preference is selected', () => { - const exporter = new OTLPMetricExporter({ - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }); - - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.COUNTER), - AggregationTemporality.CUMULATIVE, - 'Counter' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), - AggregationTemporality.CUMULATIVE, - 'Histogram' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), - AggregationTemporality.CUMULATIVE, - 'UpDownCounter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_COUNTER - ), - AggregationTemporality.CUMULATIVE, - 'Asynchronous Counter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_UP_DOWN_COUNTER - ), - AggregationTemporality.CUMULATIVE, - 'Asynchronous UpDownCounter' - ); - }); - - it('should use the right temporality when Delta preference is selected', () => { - const exporter = new OTLPMetricExporter({ - temporalityPreference: AggregationTemporalityPreference.DELTA, - }); - - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.COUNTER), - AggregationTemporality.DELTA, - 'Counter' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), - AggregationTemporality.DELTA, - 'Histogram' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), - AggregationTemporality.CUMULATIVE, - 'UpDownCounter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_COUNTER - ), - AggregationTemporality.DELTA, - 'Asynchronous Counter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_UP_DOWN_COUNTER - ), - AggregationTemporality.CUMULATIVE, - 'Asynchronous UpDownCounter' - ); - }); - - it('should use the right temporality when LowMemory preference is selected', () => { - const exporter = new OTLPMetricExporter({ - temporalityPreference: AggregationTemporalityPreference.LOWMEMORY, - }); - - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.COUNTER), - AggregationTemporality.DELTA, - 'Counter' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), - AggregationTemporality.DELTA, - 'Histogram' - ); - assert.equal( - exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), - AggregationTemporality.CUMULATIVE, - 'UpDownCounter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_COUNTER - ), - AggregationTemporality.CUMULATIVE, - 'Asynchronous Counter' - ); - assert.equal( - exporter.selectAggregationTemporality( - InstrumentType.OBSERVABLE_UP_DOWN_COUNTER - ), - AggregationTemporality.CUMULATIVE, - 'Asynchronous UpDownCounter' - ); - }); - }); - - describe('aggregation', () => { - it('aggregationSelector calls the selector supplied to the constructor', () => { - const aggregation = new ExplicitBucketHistogramAggregation([ - 0, 100, 100000, - ]); - const exporter = new OTLPMetricExporter({ - aggregationPreference: _instrumentType => aggregation, - }); - assert.equal( - exporter.selectAggregation(InstrumentType.COUNTER), - aggregation - ); - }); - - it('aggregationSelector returns the default aggregation preference when nothing is supplied', () => { - const exporter = new OTLPMetricExporter({ - aggregationPreference: _instrumentType => Aggregation.Default(), - }); - assert.equal( - exporter.selectAggregation(InstrumentType.COUNTER), - Aggregation.Default() - ); - }); - }); - - describe('export', () => { - beforeEach(async () => { - stubRequest = sinon.stub(http, 'request').returns(fakeRequest as any); - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }; - - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - - const counter = mockCounter(); - mockObservableGauge(observableResult => { - observableResult.observe(6, {}); - }, 'double-observable-gauge2'); - const histogram = mockHistogram(); - counter.add(1); - histogram.record(7); - histogram.record(14); - - const { resourceMetrics, errors } = await collect(); - assert.strictEqual(errors.length, 0); - metrics = resourceMetrics; - }); - - it('should open the connection', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - const options = args[0]; - - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - done(); - }); - }); - - it('should set custom headers', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - const options = args[0]; - assert.strictEqual(options.headers['foo'], 'bar'); - done(); - }); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - collectorExporter.export(metrics, () => {}); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - const options = args[0]; - const agent = options.agent; - assert.strictEqual(agent.keepAlive, true); - assert.strictEqual(agent.options.keepAliveMsecs, 2000); - done(); - }); - }); - - it('should successfully send metrics', done => { - let buff = Buffer.from(''); - - collectorExporter.export(metrics, () => {}); - - fakeRequest.on('end', () => { - const responseBody = buff.toString(); - - const json = JSON.parse(responseBody) as IExportMetricsServiceRequest; - // The order of the metrics is not guaranteed. - const counterIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-counter' - ); - const observableIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'double-observable-gauge2' - ); - const histogramIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-histogram' - ); - - const metric1 = - json.resourceMetrics[0].scopeMetrics[0].metrics[counterIndex]; - const metric2 = - json.resourceMetrics[0].scopeMetrics[0].metrics[observableIndex]; - const metric3 = - json.resourceMetrics[0].scopeMetrics[0].metrics[histogramIndex]; - - assert.ok(typeof metric1 !== 'undefined', "counter doesn't exist"); - ensureCounterIsCorrect( - metric1, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].startTime - ); - assert.ok( - typeof metric2 !== 'undefined', - "observable gauge doesn't exist" - ); - ensureObservableGaugeIsCorrect( - metric2, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .startTime, - 6, - 'double-observable-gauge2' - ); - assert.ok(typeof metric3 !== 'undefined', "histogram doesn't exist"); - ensureHistogramIsCorrect( - metric3, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .startTime, - [0, 100], - [0, 2, 0] - ); - - ensureExportMetricsServiceRequestIsSet(json); - - done(); - }); - - fakeRequest.on('data', chunk => { - buff = Buffer.concat([buff, chunk]); - }); - - const mockRes = new MockedResponse(200); - const args = stubRequest.args[0]; - const callback = args[1]; - - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const stubLoggerError = sinon.stub(diag, 'error'); - - const responseSpy = sinon.spy(); - collectorExporter.export(metrics, responseSpy); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - callback(mockRes); - mockRes.send(Buffer.from('success')); - }); - - setTimeout(() => { - assert.strictEqual(stubLoggerError.args.length, 0); - assert.strictEqual( - responseSpy.args[0][0].code, - core.ExportResultCode.SUCCESS - ); - done(); - }); - }); - }); - - it('should log the error message', done => { - const handler = core.loggingErrorHandler(); - core.setGlobalErrorHandler(handler); - - const responseSpy = sinon.spy(); - collectorExporter.export(metrics, responseSpy); - - setTimeout(() => { - const args = stubRequest.args[0]; - const callback = args[1]; - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - callback(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - setTimeout(() => { - const result = responseSpy.args[0][0] as core.ExportResult; - assert.strictEqual(result.code, core.ExportResultCode.FAILED); - const error = result.error as OTLPExporterError; - assert.ok(error !== undefined); - assert.strictEqual(error.code, 400); - done(); - }); - }); - }); - }); -}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts new file mode 100644 index 00000000000..87569f327a3 --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/OTLPMetricExporter.test.ts @@ -0,0 +1,221 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import * as http from 'http'; +import * as sinon from 'sinon'; +import { AggregationTemporalityPreference } from '../../src'; + +import { OTLPMetricExporter } from '../../src/platform/node'; +import { + Aggregation, + AggregationTemporality, + ExplicitBucketHistogramAggregation, + InstrumentType, + MeterProvider, + PeriodicExportingMetricReader, +} from '@opentelemetry/sdk-metrics'; +import { Stream } from 'stream'; + +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ + +describe('OTLPMetricExporter', () => { + describe('temporality', () => { + it('should use the right temporality when Cumulative preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.CUMULATIVE, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.CUMULATIVE, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + + it('should use the right temporality when Delta preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.DELTA, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.DELTA, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.DELTA, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.DELTA, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + + it('should use the right temporality when LowMemory preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.LOWMEMORY, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.DELTA, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.DELTA, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + }); + + describe('aggregation', () => { + it('aggregationSelector calls the selector supplied to the constructor', () => { + const aggregation = new ExplicitBucketHistogramAggregation([ + 0, 100, 100000, + ]); + const exporter = new OTLPMetricExporter({ + aggregationPreference: _instrumentType => aggregation, + }); + assert.equal( + exporter.selectAggregation(InstrumentType.COUNTER), + aggregation + ); + }); + + it('aggregationSelector returns the default aggregation preference when nothing is supplied', () => { + const exporter = new OTLPMetricExporter({ + aggregationPreference: _instrumentType => Aggregation.Default(), + }); + assert.equal( + exporter.selectAggregation(InstrumentType.COUNTER), + Aggregation.Default() + ); + }); + }); + + describe('export', () => { + afterEach(() => { + sinon.restore(); + }); + + it('successfully exports data', function (done) { + // arrange + const fakeRequest = new Stream.PassThrough(); + Object.defineProperty(fakeRequest, 'setTimeout', { + value: function (_timeout: number) {}, + }); + + sinon.stub(http, 'request').returns(fakeRequest as any); + let buff = Buffer.from(''); + fakeRequest.on('finish', () => { + try { + // assert + const requestBody = buff.toString(); + assert.doesNotThrow(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in JSON format, but parsing failed'); + done(); + } catch (e) { + done(e); + } + }); + + fakeRequest.on('data', chunk => { + buff = Buffer.concat([buff, chunk]); + }); + + const meterProvider = new MeterProvider({ + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter(), + }), + ], + }); + meterProvider.getMeter('test-meter').createCounter('test-counter').add(1); + + // act + meterProvider.forceFlush(); + meterProvider.shutdown(); + }); + }); +}); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index ee104b00163..38f4512fa16 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,12 +56,12 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -71,12 +71,12 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts index 9f594055a5b..f2509dcedae 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts @@ -15,42 +15,26 @@ */ import { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { OTLPMetricExporterBase } from '@opentelemetry/exporter-metrics-otlp-http'; -import { - OTLPExporterNodeConfigBase, - OTLPExporterNodeBase, -} from '@opentelemetry/otlp-exporter-base'; -import { - IExportMetricsServiceResponse, - ProtobufMetricsSerializer, -} from '@opentelemetry/otlp-transformer'; +import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { ProtobufMetricsSerializer } from '@opentelemetry/otlp-transformer'; import { VERSION } from './version'; +import { + convertLegacyHttpOptions, + createOtlpHttpExportDelegate, +} from '@opentelemetry/otlp-exporter-base/node-http'; -const USER_AGENT = { - 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, -}; - -class OTLPMetricExporterNodeProxy extends OTLPExporterNodeBase< - ResourceMetrics, - IExportMetricsServiceResponse -> { +export class OTLPMetricExporter extends OTLPMetricExporterBase { constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) { super( - config, - ProtobufMetricsSerializer, - { - ...USER_AGENT, - 'Content-Type': 'application/x-protobuf', - }, - 'METRICS', - 'v1/metrics' + createOtlpHttpExportDelegate( + convertLegacyHttpOptions(config ?? {}, 'METRICS', 'v1/metrics', { + 'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`, + 'Content-Type': 'application/x-protobuf', + }), + ProtobufMetricsSerializer + ), + config ); } } - -export class OTLPMetricExporter extends OTLPMetricExporterBase { - constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) { - super(new OTLPMetricExporterNodeProxy(config), config); - } -} 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 42408adab96..aeb7e14ecbf 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 @@ -14,235 +14,46 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; -import { OTLPMetricExporter } from '../src'; +import { OTLPMetricExporter } from '../src/'; import { - ensureExportedCounterIsCorrect, - ensureExportedObservableGaugeIsCorrect, - ensureExportedHistogramIsCorrect, - ensureExportMetricsServiceRequestIsSet, - mockCounter, - MockedResponse, - mockObservableGauge, - mockHistogram, - collect, - setUp, - shutdown, -} from './metricsHelper'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import { - AggregationTemporalityPreference, - OTLPMetricExporterOptions, -} from '@opentelemetry/exporter-metrics-otlp-http'; -import { Stream, PassThrough } from 'stream'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { VERSION } from '../src/version'; -import { Root } from 'protobufjs'; -import * as path from 'path'; - -let fakeRequest: PassThrough; - -const dir = path.resolve(__dirname, '../../otlp-transformer/protos'); -const root = new Root(); -root.resolvePath = function (origin, target) { - return `${dir}/${target}`; -}; -const proto = root.loadSync([ - 'opentelemetry/proto/common/v1/common.proto', - 'opentelemetry/proto/resource/v1/resource.proto', - 'opentelemetry/proto/metrics/v1/metrics.proto', - 'opentelemetry/proto/collector/metrics/v1/metrics_service.proto', -]); -const exportRequestServiceProto = proto?.lookupType( - 'ExportMetricsServiceRequest' -); - -describe('OTLPMetricExporter - node with proto over http', () => { - let collectorExporter: OTLPMetricExporter; - let collectorExporterConfig: OTLPExporterNodeConfigBase & - OTLPMetricExporterOptions; - let metrics: ResourceMetrics; + MeterProvider, + PeriodicExportingMetricReader, +} from '@opentelemetry/sdk-metrics'; +import { Stream } from 'stream'; - afterEach(() => { - fakeRequest = new Stream.PassThrough(); - Object.defineProperty(fakeRequest, 'setTimeout', { - value: function (_timeout: number) {}, - }); - sinon.restore(); - }); - - describe('default behavior for headers', () => { - const exporter = new OTLPMetricExporter(); - it('should include user agent in header', () => { - assert.strictEqual( - exporter._otlpExporter['_transport']['_transport']['_parameters'][ - 'headers' - ]['User-Agent'], - `OTel-OTLP-Exporter-JavaScript/${VERSION}` - ); - }); - }); +/* + * NOTE: Tests here are not intended to test the underlying components directly. They are intended as a quick + * check if the correct components are used. Use the following packages to test details: + * - `@opentelemetry/oltp-exporter-base`: OTLP common exporter logic (handling of concurrent exports, ...), HTTP transport code + * - `@opentelemetry/otlp-transformer`: Everything regarding serialization and transforming internal representations to OTLP + */ +describe('OTLPMetricExporter', () => { describe('export', () => { - beforeEach(async () => { - collectorExporterConfig = { - headers: { - foo: 'bar', - }, - url: 'http://foo.bar.com', - keepAlive: true, - httpAgentOptions: { keepAliveMsecs: 2000 }, - temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, - }; - collectorExporter = new OTLPMetricExporter(collectorExporterConfig); - setUp(); - - const counter = mockCounter(); - mockObservableGauge(observableResult => { - observableResult.observe(3, {}); - observableResult.observe(6, {}); - }); - const histogram = mockHistogram(); - - counter.add(1); - histogram.record(7); - histogram.record(14); - - const { resourceMetrics, errors } = await collect(); - assert.strictEqual(errors.length, 0); - metrics = resourceMetrics; - }); - - afterEach(async () => { - await shutdown(); + afterEach(() => { sinon.restore(); }); - it('should open the connection', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.hostname, 'foo.bar.com'); - assert.strictEqual(options.method, 'POST'); - assert.strictEqual(options.path, '/'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - - collectorExporter.export(metrics, () => {}); - }); - - it('should set custom headers', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - assert.strictEqual(options.headers['foo'], 'bar'); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - return fakeRequest as any; - }); - - collectorExporter.export(metrics, () => {}); - }); - - it('should have keep alive and keepAliveMsecs option set', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - try { - assert.strictEqual(options.agent.keepAlive, true); - assert.strictEqual(options.agent.options.keepAliveMsecs, 2000); - - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - done(); - }); - } catch (e) { - done(e); - } - return fakeRequest as any; - }); - - collectorExporter.export(metrics, () => {}); - }); - - it('should successfully send metrics', done => { + it('successfully exports data', function (done) { + // arrange const fakeRequest = new Stream.PassThrough(); Object.defineProperty(fakeRequest, 'setTimeout', { value: function (_timeout: number) {}, }); - sinon.stub(http, 'request').returns(fakeRequest as any); + sinon.stub(http, 'request').returns(fakeRequest as any); let buff = Buffer.from(''); - fakeRequest.on('finish', () => { try { - const data = exportRequestServiceProto.decode(buff); - const json = data?.toJSON() as any; - - // The order of the metrics is not guaranteed. - const counterIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-counter' - ); - const observableIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'double-observable-gauge' - ); - const histogramIndex = metrics.scopeMetrics[0].metrics.findIndex( - it => it.descriptor.name === 'int-histogram' - ); - - const metric1 = - json.resourceMetrics[0].scopeMetrics[0].metrics[counterIndex]; - const metric2 = - json.resourceMetrics[0].scopeMetrics[0].metrics[observableIndex]; - const metric3 = - json.resourceMetrics[0].scopeMetrics[0].metrics[histogramIndex]; - - assert.ok(typeof metric1 !== 'undefined', "counter doesn't exist"); - ensureExportedCounterIsCorrect( - metric1, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0].endTime, - metrics.scopeMetrics[0].metrics[counterIndex].dataPoints[0] - .startTime - ); - assert.ok( - typeof metric2 !== 'undefined', - "observable gauge doesn't exist" - ); - ensureExportedObservableGaugeIsCorrect( - metric2, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[observableIndex].dataPoints[0] - .startTime - ); - assert.ok( - typeof metric3 !== 'undefined', - "value recorder doesn't exist" - ); - ensureExportedHistogramIsCorrect( - metric3, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .endTime, - metrics.scopeMetrics[0].metrics[histogramIndex].dataPoints[0] - .startTime, - [0, 100], - ['0', '2', '0'] - ); - - ensureExportMetricsServiceRequestIsSet(json); + // assert + const requestBody = buff.toString(); + assert.throws(() => { + JSON.parse(requestBody); + }, 'expected requestBody to be in protobuf format, but parsing as JSON succeeded'); done(); } catch (e) { done(e); @@ -253,55 +64,18 @@ describe('OTLPMetricExporter - node with proto over http', () => { buff = Buffer.concat([buff, chunk]); }); - try { - collectorExporter.export(metrics, () => {}); - } catch (error) { - done(error); - } - }); - - it('should log the successful message', done => { - // Need to stub/spy on the underlying logger as the "diag" instance is global - const spyLoggerError = sinon.stub(diag, 'error'); - - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(200); - cb(mockRes); - mockRes.send(Buffer.from('success')); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(metrics, result => { - assert.strictEqual(result.code, ExportResultCode.SUCCESS); - assert.strictEqual(spyLoggerError.args.length, 0); - done(); + const meterProvider = new MeterProvider({ + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter(), + }), + ], }); - }); + meterProvider.getMeter('test-meter').createCounter('test-counter').add(1); - it('should return the error code message', done => { - sinon.stub(http, 'request').callsFake((options: any, cb: any) => { - queueMicrotask(() => { - const mockRes = new MockedResponse(400); - cb(mockRes); - mockRes.send(Buffer.from('failure')); - }); - - return fakeRequest as any; - }); - - collectorExporter.export(metrics, result => { - try { - assert.strictEqual(result.code, ExportResultCode.FAILED); - // @ts-expect-error verify error code - assert.strictEqual(result.error.code, 400); - done(); - } catch (e) { - done(e); - } - }); + // act + meterProvider.forceFlush(); + meterProvider.shutdown(); }); }); }); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts deleted file mode 100644 index effc732b370..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - Counter, - ObservableResult, - Histogram, - ValueType, - ObservableGauge, - HrTime, -} from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import * as assert from 'assert'; -import { - ExplicitBucketHistogramAggregation, - MeterProvider, - MetricReader, - View, -} from '@opentelemetry/sdk-metrics'; -import { - encodeAsString, - IExportMetricsServiceRequest, - IKeyValue, - IMetric, -} from '@opentelemetry/otlp-transformer'; -import { Stream } from 'stream'; - -export class TestMetricReader extends MetricReader { - protected onForceFlush(): Promise { - return Promise.resolve(undefined); - } - - protected onShutdown(): Promise { - return Promise.resolve(undefined); - } -} - -const testResource = new Resource({ - service: 'ui', - version: 1, - cost: 112.12, -}); - -let reader = new TestMetricReader(); -let meterProvider = new MeterProvider({ - resource: testResource, - readers: [reader], -}); - -let meter = meterProvider.getMeter('default', '0.0.1'); - -export async function collect() { - return (await reader.collect())!; -} - -export function setUp() { - reader = new TestMetricReader(); - meterProvider = new MeterProvider({ - resource: testResource, - views: [ - new View({ - aggregation: new ExplicitBucketHistogramAggregation([0, 100]), - instrumentName: 'int-histogram', - }), - ], - readers: [reader], - }); - meter = meterProvider.getMeter('default', '0.0.1'); -} - -export async function shutdown() { - await meterProvider.shutdown(); -} - -export function mockCounter(): Counter { - const name = 'int-counter'; - return meter.createCounter(name, { - description: 'sample counter description', - valueType: ValueType.INT, - }); -} - -export function mockObservableGauge( - callback: (observableResult: ObservableResult) => void -): ObservableGauge { - const name = 'double-observable-gauge'; - const observableGauge = meter.createObservableGauge(name, { - description: 'sample observable gauge description', - valueType: ValueType.DOUBLE, - }); - observableGauge.addCallback(callback); - - return observableGauge; -} - -export function mockHistogram(): Histogram { - const name = 'int-histogram'; - - return meter.createHistogram(name, { - description: 'sample histogram description', - valueType: ValueType.INT, - }); -} - -export function ensureProtoAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - }, - }, - ], - 'attributes are incorrect' - ); -} - -export function ensureExportedCounterIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime -) { - assert.strictEqual(metric.name, 'int-counter'); - assert.strictEqual(metric.description, 'sample counter description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.sum?.dataPoints.length, 1); - assert.strictEqual(metric.sum?.isMonotonic, true); - assert.strictEqual( - metric.sum?.aggregationTemporality, - 'AGGREGATION_TEMPORALITY_CUMULATIVE' - ); - - const [dp] = metric.sum.dataPoints; - assert.strictEqual(dp.asInt, '1'); - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureExportedObservableGaugeIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime -) { - assert.strictEqual(metric.name, 'double-observable-gauge'); - assert.strictEqual(metric.description, 'sample observable gauge description'); - assert.strictEqual(metric.unit, ''); - assert.strictEqual(metric.gauge?.dataPoints.length, 1); - - const [dp] = metric.gauge.dataPoints; - assert.strictEqual(dp.asDouble, 6); - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureExportedHistogramIsCorrect( - metric: IMetric, - time: HrTime, - startTime: HrTime, - explicitBounds: number[] = [Infinity], - bucketCounts: string[] = ['2', '0'] -) { - assert.strictEqual(metric.name, 'int-histogram'); - assert.strictEqual(metric.description, 'sample histogram description'); - assert.strictEqual(metric.unit, ''); - - assert.strictEqual(metric.histogram?.dataPoints.length, 1); - assert.strictEqual( - metric.histogram.aggregationTemporality, - 'AGGREGATION_TEMPORALITY_CUMULATIVE' - ); - - const [dp] = metric.histogram.dataPoints; - - assert.strictEqual(dp.sum, 21); - assert.strictEqual(dp.count, '2'); - assert.strictEqual(dp.min, 7); - assert.strictEqual(dp.max, 14); - assert.deepStrictEqual(dp.explicitBounds, explicitBounds); - assert.deepStrictEqual(dp.bucketCounts, bucketCounts); - assert.deepStrictEqual(dp.startTimeUnixNano, encodeAsString(startTime)); - assert.deepStrictEqual(dp.timeUnixNano, encodeAsString(time)); -} - -export function ensureExportMetricsServiceRequestIsSet( - json: IExportMetricsServiceRequest -) { - const resourceMetrics = json.resourceMetrics; - assert.strictEqual( - resourceMetrics.length, - 1, - 'resourceMetrics has incorrect length' - ); - - const resource = resourceMetrics[0].resource; - assert.ok(resource, 'resource is missing'); - - const scopeMetrics = resourceMetrics[0].scopeMetrics; - assert.strictEqual(scopeMetrics?.length, 1, 'scopeMetrics is missing'); - - const scope = scopeMetrics[0].scope; - assert.ok(scope, 'scope is missing'); - - const metrics = resourceMetrics[0].scopeMetrics[0].metrics; - assert.strictEqual(metrics.length, 3, 'Metrics are missing'); -} - -export class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index e31c73beba1..aedac0e0e5b 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,13 +44,13 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -59,9 +59,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/README.md b/experimental/packages/opentelemetry-instrumentation-fetch/README.md index 2d3c2d4aeed..2653586f384 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/README.md +++ b/experimental/packages/opentelemetry-instrumentation-fetch/README.md @@ -26,9 +26,9 @@ import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; import { ZoneContextManager } from '@opentelemetry/context-zone'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; -const provider = new WebTracerProvider(); - -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const provider = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); provider.register({ contextManager: new ZoneContextManager(), @@ -40,15 +40,14 @@ registerInstrumentations({ // or plugin can be also initialised separately and then set the tracer provider or meter provider const fetchInstrumentation = new FetchInstrumentation(); -const provider = new WebTracerProvider(); +const provider = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); provider.register({ contextManager: new ZoneContextManager(), }); fetchInstrumentation.setTracerProvider(provider); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); - - // and some test fetch('http://localhost:8090/fetch.js'); @@ -69,8 +68,9 @@ Fetch instrumentation plugin has few options available to choose from. You can s | Options | Type | Description | |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|-----------------------------------------------------------------------------------------| -| [`applyCustomAttributesOnSpan`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L64) | `HttpCustomAttributeFunction` | Function for adding custom attributes | -| [`ignoreNetworkEvents`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L67) | `boolean` | Disable network events being added as span events (network events are added by default) | +| [`applyCustomAttributesOnSpan`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L75) | `HttpCustomAttributeFunction` | Function for adding custom attributes | +| [`ignoreNetworkEvents`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L77) | `boolean` | Disable network events being added as span events (network events are added by default) | +| [`measureRequestSize`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L79) | `boolean` | Measure outgoing request length (outgoing request length is not measured by default) | ## Semantic Conventions @@ -80,12 +80,13 @@ Attributes collected: | Attribute | Short Description | | ------------------------------------------- | ------------------------------------------------------------------------------ | -| `http.status_code` | HTTP response status code | +| `http.status_code` | HTTP response status code | | `http.host` | The value of the HTTP host header | | `http.user_agent` | Value of the HTTP User-Agent header sent by the client | | `http.scheme` | The URI scheme identifying the used protocol | | `http.url` | Full HTTP request URL | | `http.method` | HTTP request method | +| `http.request_content_length_uncompressed` | Uncompressed size of the request body, if any body exists | ## Useful links diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 8e13ecc1dc4..c6904f4aa8c 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry instrumentation for fetch http client in web browsers", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,13 +54,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -74,12 +74,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -87,10 +87,10 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index fedb495d685..e5d9a84bdeb 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -31,8 +31,10 @@ import { SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_METHOD, + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, } from '@opentelemetry/semantic-conventions'; import { FetchError, FetchResponse, SpanData } from './types'; +import { getFetchBodyLength } from './utils'; import { VERSION } from './version'; import { _globalThis } from '@opentelemetry/core'; @@ -74,6 +76,8 @@ export interface FetchInstrumentationConfig extends InstrumentationConfig { applyCustomAttributesOnSpan?: FetchCustomAttributeFunction; // Ignore adding network events as span events ignoreNetworkEvents?: boolean; + /** Measure outgoing request size */ + measureRequestSize?: boolean; } /** @@ -320,6 +324,21 @@ export class FetchInstrumentation extends InstrumentationBase { + if (!length) return; + + createdSpan.setAttribute( + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, + length + ); + }) + .catch(error => { + plugin._diag.warn('getFetchBodyLength', error); + }); + } + function endSpanOnError(span: api.Span, error: FetchError) { plugin._applyAttributesAfterFetch(span, options, error); plugin._endSpan(span, spanData, { diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts new file mode 100644 index 00000000000..da3d329dc21 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/src/utils.ts @@ -0,0 +1,173 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Much of the logic here overlaps with the same utils file in opentelemetry-instrumentation-xml-http-request +// These may be unified in the future. + +import * as api from '@opentelemetry/api'; + +const DIAG_LOGGER = api.diag.createComponentLogger({ + namespace: '@opentelemetry/opentelemetry-instrumentation-fetch/utils', +}); + +/** + * Helper function to determine payload content length for fetch requests + * + * The fetch API is kinda messy: there are a couple of ways the body can be passed in. + * + * In all cases, the body param can be some variation of ReadableStream, + * and ReadableStreams can only be read once! We want to avoid consuming the body here, + * because that would mean that the body never gets sent with the actual fetch request. + * + * Either the first arg is a Request object, which can be cloned + * so we can clone that object and read the body of the clone + * without disturbing the original argument + * However, reading the body here can only be done async; the body() method returns a promise + * this means this entire function has to return a promise + * + * OR the first arg is a url/string + * in which case the second arg has type RequestInit + * RequestInit is NOT cloneable, but RequestInit.body is writable + * so we can chain it into ReadableStream.pipeThrough() + * + * ReadableStream.pipeThrough() lets us process a stream and returns a new stream + * So we can measure the body length as it passes through the pie, but need to attach + * the new stream to the original request + * so that the browser still has access to the body. + * + * @param body + * @returns promise that resolves to the content length of the body + */ +export function getFetchBodyLength(...args: Parameters) { + if (args[0] instanceof URL || typeof args[0] === 'string') { + const requestInit = args[1]; + if (!requestInit?.body) { + return Promise.resolve(); + } + if (requestInit.body instanceof ReadableStream) { + const { body, length } = _getBodyNonDestructively(requestInit.body); + requestInit.body = body; + + return length; + } else { + return Promise.resolve(getXHRBodyLength(requestInit.body)); + } + } else { + const info = args[0]; + if (!info?.body) { + return Promise.resolve(); + } + + return info + .clone() + .text() + .then(t => getByteLength(t)); + } +} + +function _getBodyNonDestructively(body: ReadableStream) { + // can't read a ReadableStream without destroying it + // but we CAN pipe it through and return a new ReadableStream + + // some (older) platforms don't expose the pipeThrough method and in that scenario, we're out of luck; + // there's no way to read the stream without consuming it. + if (!body.pipeThrough) { + DIAG_LOGGER.warn('Platform has ReadableStream but not pipeThrough!'); + return { + body, + length: Promise.resolve(undefined), + }; + } + + let length = 0; + let resolveLength: (l: number) => void; + const lengthPromise = new Promise(resolve => { + resolveLength = resolve; + }); + + const transform = new TransformStream({ + start() {}, + async transform(chunk, controller) { + const bytearray = (await chunk) as Uint8Array; + length += bytearray.byteLength; + + controller.enqueue(chunk); + }, + flush() { + resolveLength(length); + }, + }); + + return { + body: body.pipeThrough(transform), + length: lengthPromise, + }; +} + +/** + * Helper function to determine payload content length for XHR requests + * @param body + * @returns content length + */ +export function getXHRBodyLength( + body: Document | XMLHttpRequestBodyInit +): number | undefined { + if (typeof Document !== 'undefined' && body instanceof Document) { + return new XMLSerializer().serializeToString(document).length; + } + // XMLHttpRequestBodyInit expands to the following: + if (body instanceof Blob) { + return body.size; + } + + // ArrayBuffer | ArrayBufferView + if ((body as any).byteLength !== undefined) { + return (body as any).byteLength as number; + } + + if (body instanceof FormData) { + return getFormDataSize(body); + } + + if (body instanceof URLSearchParams) { + return getByteLength(body.toString()); + } + + if (typeof body === 'string') { + return getByteLength(body); + } + + DIAG_LOGGER.warn('unknown body type'); + return undefined; +} + +const TEXT_ENCODER = new TextEncoder(); +function getByteLength(s: string): number { + return TEXT_ENCODER.encode(s).byteLength; +} + +function getFormDataSize(formData: FormData): number { + let size = 0; + for (const [key, value] of formData.entries()) { + size += key.length; + if (value instanceof Blob) { + size += value.size; + } else { + size += value.length; + } + } + return size; +} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts index 7e14cc35883..e76d9843248 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts @@ -49,6 +49,7 @@ import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, } from '@opentelemetry/semantic-conventions'; class DummySpanExporter implements tracing.SpanExporter { @@ -74,6 +75,19 @@ const getData = (url: string, method?: string) => { }); }; +const ENCODER = new TextEncoder(); +const textToReadableStream = (msg: string): ReadableStream => { + return new ReadableStream({ + start: controller => { + controller.enqueue(ENCODER.encode(msg)); + controller.close(); + }, + cancel: controller => { + controller.close(); + }, + }); +}; + const CUSTOM_ATTRIBUTE_KEY = 'span kind'; const defaultResource = { connectEnd: 15, @@ -163,6 +177,7 @@ function testForCorrectEvents( describe('fetch', () => { let contextManager: ZoneContextManager; let lastResponse: any | undefined; + let requestBody: any | undefined; let webTracerWithZone: api.Tracer; let webTracerProviderWithZone: WebTracerProvider; let dummySpanExporter: DummySpanExporter; @@ -179,12 +194,13 @@ describe('fetch', () => { const clearData = () => { sinon.restore(); lastResponse = undefined; + requestBody = undefined; }; const prepareData = async ( fileUrl: string, + apiCall: () => Promise, config: FetchInstrumentationConfig, - method?: string, disablePerfObserver?: boolean, disableGetEntries?: boolean ) => { @@ -201,6 +217,25 @@ describe('fetch', () => { }; response.headers = Object.assign({}, init.headers); + // get the request body + if (typeof input === 'string') { + const body = init.body; + if (body instanceof ReadableStream) { + const decoder = new TextDecoder(); + requestBody = ''; + const read = async () => { + for await (const c of body) { + requestBody += decoder.decode(c); + } + }; + read(); + } else { + requestBody = init.body; + } + } else { + input.text().then(r => (requestBody = r)); + } + if (init instanceof Request) { // Passing request as 2nd argument causes missing body bug (#2411) response.status = 400; @@ -288,7 +323,7 @@ describe('fetch', () => { async () => { fakeNow = 0; try { - const responsePromise = getData(fileUrl, method); + const responsePromise = apiCall(); fakeNow = 300; const response = await responsePromise; @@ -332,7 +367,9 @@ describe('fetch', () => { describe('when request is successful', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = [url]; - await prepareData(url, { propagateTraceHeaderCorsUrls }); + await prepareData(url, () => getData(url), { + propagateTraceHeaderCorsUrls, + }); }); afterEach(() => { @@ -374,44 +411,61 @@ describe('fetch', () => { const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; const attributes = span.attributes; const keys = Object.keys(attributes); - - assert.ok( - attributes[keys[0]] !== '', + assert.notStrictEqual( + attributes[AttributeNames.COMPONENT], + '', `attributes ${AttributeNames.COMPONENT} is not defined` ); + assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[2]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); assert.strictEqual( - attributes[keys[3]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 200, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); + const statusText = attributes[AttributeNames.HTTP_STATUS_TEXT]; assert.ok( - attributes[keys[4]] === 'OK' || attributes[keys[4]] === '', + statusText === 'OK' || statusText === '', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.ok( - (attributes[keys[5]] as string).indexOf('localhost') === 0, + (attributes[SEMATTRS_HTTP_HOST] as string).indexOf('localhost') === 0, `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[6]] === 'http' || attributes[keys[6]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[7]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); - assert.ok( - (attributes[keys[8]] as number) > 0, + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + 30, `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is <= 0` ); @@ -568,7 +622,7 @@ describe('fetch', () => { diagLogger.debug = spyDebug; api.diag.setLogger(diagLogger, api.DiagLogLevel.ALL); clearData(); - await prepareData(url, {}); + await prepareData(url, () => getData(url), {}); }); afterEach(() => { sinon.restore(); @@ -600,10 +654,203 @@ describe('fetch', () => { }); }); + describe('post data', () => { + describe('url and config object when request body measurement is disabled', () => { + beforeEach(async () => { + await prepareData( + url, + () => + fetch(url, { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ hello: 'world' }), + }), + {} + ); + }); + + afterEach(() => { + clearData(); + }); + + it('should post data', async () => { + assert.strictEqual(requestBody, '{"hello":"world"}'); + + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED], + undefined + ); + }); + }); + + describe('url and config object', () => { + beforeEach(async () => { + await prepareData( + url, + () => + fetch(url, { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ hello: 'world' }), + }), + { + measureRequestSize: true, + } + ); + }); + + afterEach(() => { + clearData(); + }); + + it('should post data', async () => { + assert.strictEqual(requestBody, '{"hello":"world"}'); + + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED], + 17 + ); + }); + }); + + describe('url and config object with stream', () => { + beforeEach(async () => { + await prepareData( + url, + () => + fetch(url, { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: textToReadableStream('{"hello":"world"}'), + }), + { + measureRequestSize: true, + } + ); + }); + + afterEach(() => { + clearData(); + }); + + it('should post data', async () => { + assert.strictEqual(requestBody, '{"hello":"world"}'); + + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED], + 17 + ); + }); + }); + + describe('single request object', () => { + beforeEach(async () => { + await prepareData( + url, + () => { + const req = new Request(url, { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: '{"hello":"world"}', + }); + return fetch(req); + }, + { + measureRequestSize: true, + } + ); + }); + + afterEach(() => { + clearData(); + }); + + it('should post data', async () => { + assert.strictEqual(requestBody, '{"hello":"world"}'); + + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED], + 17 + ); + }); + }); + + describe('single request object with urlparams', () => { + beforeEach(async () => { + await prepareData( + url, + () => { + const body = new URLSearchParams(); + body.append('hello', 'world'); + const req = new Request(url, { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body, + }); + return fetch(req); + }, + { + measureRequestSize: true, + } + ); + }); + + afterEach(() => { + clearData(); + }); + + it('should post data', async () => { + assert.strictEqual(requestBody, 'hello=world'); + + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED], + 11 + ); + }); + }); + }); + describe('when request is secure and successful', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = [secureUrl]; - await prepareData(secureUrl, { propagateTraceHeaderCorsUrls }); + await prepareData(secureUrl, () => getData(secureUrl), { + propagateTraceHeaderCorsUrls, + }); }); afterEach(() => { @@ -652,7 +899,7 @@ describe('fetch', () => { ) => { const propagateTraceHeaderCorsUrls = [url]; - await prepareData(url, { + await prepareData(url, () => getData(url), { propagateTraceHeaderCorsUrls, applyCustomAttributesOnSpan, }); @@ -720,7 +967,7 @@ describe('fetch', () => { describe('when url is ignored', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = url; - await prepareData(url, { + await prepareData(url, () => getData(url), { propagateTraceHeaderCorsUrls, ignoreUrls: [propagateTraceHeaderCorsUrls], }); @@ -747,7 +994,7 @@ describe('fetch', () => { describe('when clearTimingResources is TRUE', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = url; - await prepareData(url, { + await prepareData(url, () => getData(url), { propagateTraceHeaderCorsUrls, clearTimingResources: true, }); @@ -767,7 +1014,9 @@ describe('fetch', () => { describe('when request is NOT successful (wrong url)', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = badUrl; - await prepareData(badUrl, { propagateTraceHeaderCorsUrls }); + await prepareData(badUrl, () => getData(badUrl), { + propagateTraceHeaderCorsUrls, + }); }); afterEach(() => { clearData(); @@ -785,7 +1034,9 @@ describe('fetch', () => { describe('when request is NOT successful (405)', () => { beforeEach(async () => { const propagateTraceHeaderCorsUrls = url; - await prepareData(url, { propagateTraceHeaderCorsUrls }, 'DELETE'); + await prepareData(url, () => getData(url, 'DELETE'), { + propagateTraceHeaderCorsUrls, + }); }); afterEach(() => { clearData(); @@ -806,7 +1057,7 @@ describe('fetch', () => { // All above tests test it already but just in case // lets explicitly turn getEntriesByType off so we can be sure // that the perf entries come from the observer. - await prepareData(url, {}, undefined, false, true); + await prepareData(url, () => getData(url), {}, false, true); }); afterEach(() => { clearData(); @@ -838,7 +1089,7 @@ describe('fetch', () => { describe('when fetching with relative url', () => { beforeEach(async () => { - await prepareData('/get', {}, undefined, false, true); + await prepareData('/get', () => getData('/get'), {}, false, true); }); afterEach(() => { clearData(); @@ -882,7 +1133,7 @@ describe('fetch', () => { describe('when PerformanceObserver is undefined', () => { beforeEach(async () => { - await prepareData(url, {}, undefined, true, false); + await prepareData(url, () => getData(url), {}, true, false); }); afterEach(() => { @@ -914,7 +1165,7 @@ describe('fetch', () => { describe('when PerformanceObserver and performance.getEntriesByType are undefined', () => { beforeEach(async () => { - await prepareData(url, {}, undefined, true, true); + await prepareData(url, () => getData(url), {}, true, true); }); afterEach(() => { clearData(); @@ -949,7 +1200,7 @@ describe('fetch', () => { describe('when network events are ignored', () => { beforeEach(async () => { - await prepareData(url, { + await prepareData(url, () => getData(url), { ignoreNetworkEvents: true, }); }); diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/utils.test.ts new file mode 100644 index 00000000000..f0fcf89ecba --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/test/utils.test.ts @@ -0,0 +1,272 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; + +import { getXHRBodyLength, getFetchBodyLength } from '../src/utils'; + +const ENCODER = new TextEncoder(); +function textToReadableStream(msg: string) { + return new ReadableStream({ + start: controller => { + controller.enqueue(ENCODER.encode(msg)); + controller.close(); + }, + cancel: controller => { + controller.close(); + }, + }); +} + +describe('getXHRBodyLength', () => { + it('should compute body length for Document payload', () => { + // webworkers don't have DOMParser + if (typeof DOMParser === 'undefined') { + assert.ok(true); + return; + } + const doc = new DOMParser().parseFromString( + '

hello world

', + 'text/html' + ); + + const length = getXHRBodyLength(doc); + assert.ok(length !== undefined, 'body length is undefined'); + assert.ok(length, 'body length is 0'); + }); + it('should compute body length for Blob payload', () => { + const blob = new Blob(['hello world'], { + type: 'text/plain', + }); + + assert.strictEqual(getXHRBodyLength(blob), 11); + }); + it('should compute body length for ArrayBuffer/ArrayBufferView payload', () => { + const arrayBuffer = new Uint8Array([1, 2, 3]).buffer; + + assert.strictEqual(getXHRBodyLength(arrayBuffer), 3); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(8)), 8); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(8).slice(0, 2)), 2); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(0)), 0); + }); + it('should compute body length for FormData payload', () => { + const formData = new FormData(); + formData.append('key1', 'true'); + formData.append('key2', 'hello world'); + + assert.strictEqual(getXHRBodyLength(formData), 23); + assert.strictEqual(getXHRBodyLength(new FormData()), 0); + }); + it('should compute body length for FormData payload with a file', () => { + const formData = new FormData(); + const f = new File( + ['hello world hello world hello world'], + 'test_file.txt' + ); + formData.append('file', f); + + // length should be: + // 4 for the key of the file in the form data + // 35 for the file contents + assert.strictEqual(getXHRBodyLength(formData), 39); + }); + it('should compute body length for URLSearchParams payload', () => { + const search = new URLSearchParams({ + key1: 'true', + key2: 'hello world', + }); + + assert.strictEqual(getXHRBodyLength(search), 26); + assert.strictEqual(getXHRBodyLength(new URLSearchParams()), 0); + }); + it('should compute body length for string payload', () => { + const jsonString = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + assert.strictEqual(getXHRBodyLength(jsonString), 36); + assert.strictEqual(getXHRBodyLength('hello world'), 11); + assert.strictEqual(getXHRBodyLength('π'), 2); // one character, 2 bytes + assert.strictEqual(getXHRBodyLength('🔥🔪😭'), 12); // each emoji is 4 bytes + assert.strictEqual(getXHRBodyLength('مرحبا بالعالم'), 25); // hello world in Arabic is 25 bytes + assert.strictEqual(getXHRBodyLength(''), 0); + }); +}); + +describe('getFetchBodyLength', () => { + it('should read the body of the second param when the first param is string', async () => { + const jsonString = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + const length = await getFetchBodyLength('https://example.com', { + body: jsonString, + }); + assert.strictEqual(length, 36); + }); + + it('should handle undefined body', async () => { + const length = await getFetchBodyLength('https://example.com', {}); + assert.strictEqual(length, undefined); + }); + + it('should handle unicode body', async () => { + const length = await getFetchBodyLength('https://example.com', { + body: 'π🔥🔪😭', + }); + assert.strictEqual(length, 14); // pi is 2 bytes, each emoji is 4 + }); + + it('should (non-destructively) read the body stream of the second param when the first param is string', async () => { + const jsonString = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + const requestParams = { body: textToReadableStream(jsonString) }; + const lengthPromise = getFetchBodyLength( + 'https://example.com', + requestParams + ); + + // if we try to await lengthPromise here, we get a timeout + + let lengthResolved = false; + lengthPromise.finally(() => (lengthResolved = true)); + + // length doesn't get read yet + assert.strictEqual(lengthResolved, false); + + // the body is still readable + assert.strictEqual(requestParams.body.locked, false); + + // AND the body is still correct + const { value } = await requestParams.body.getReader().read(); + const decoder = new TextDecoder(); + assert.strictEqual(decoder.decode(value), jsonString); + + // AND now length got read, and we got the correct length + const length = await lengthPromise; + assert.strictEqual(lengthResolved, true); + assert.strictEqual(length, 36); + }); + + it('should (non-destructively) read the unicode body stream of the second param when the first param is string', async () => { + const bodyString = 'π🔥🔪😭'; + const requestParams = { body: textToReadableStream(bodyString) }; + const lengthPromise = getFetchBodyLength( + 'https://example.com', + requestParams + ); + + // if we try to await lengthPromise here, we get a timeout + + let lengthResolved = false; + lengthPromise.finally(() => (lengthResolved = true)); + + // length doesn't get read yet + assert.strictEqual(lengthResolved, false); + + // the body is still readable + assert.strictEqual(requestParams.body.locked, false); + + // AND the body is still correct + const { value } = await requestParams.body.getReader().read(); + const decoder = new TextDecoder(); + assert.strictEqual(decoder.decode(value), bodyString); + + // AND now length got read, and we got the correct length + const length = await lengthPromise; + assert.strictEqual(lengthResolved, true); + assert.strictEqual(length, 14); + }); + + it('should handle readablestream objects without a pipeThrough method', async () => { + const jsonString = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + const stream = textToReadableStream(jsonString); + + // @ts-expect-error intentionally remove the .tee() method to mimic older environments where this method isn't available + stream.pipeThrough = undefined; + + const requestParams = { body: stream }; + const length = await getFetchBodyLength( + 'https://example.com', + requestParams + ); + + // we got the correct length + assert.strictEqual(length, undefined); + + // AND the body is still readable + assert.strictEqual(requestParams.body.locked, false); + + // AND the body is still correct + const { value } = await requestParams.body.getReader().read(); + const decoder = new TextDecoder(); + assert.strictEqual(decoder.decode(value), jsonString); + }); + + it('should read the body of the first param when recieving a request', async () => { + const bodyContent = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + const req = new Request('https://example.com', { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: bodyContent, + }); + + const length = await getFetchBodyLength(req); + + // we got the correct length + assert.strictEqual(length, 36); + + // AND the body is still readable and correct + const body = await req.text(); + assert.strictEqual(body, bodyContent); + }); + + it('should read the body of the first param when recieving a request with urlparams body', async () => { + const body = new URLSearchParams(); + body.append('hello', 'world'); + + const req = new Request('https://example.com', { + method: 'POST', + headers: { + foo: 'bar', + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body, + }); + + const length = await getFetchBodyLength(req); + + // we got the correct length + assert.strictEqual(length, 11); + + // AND the body is still readable and correct + const requestBody = await req.text(); + assert.strictEqual(requestBody, 'hello=world'); + }); +}); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/README.md b/experimental/packages/opentelemetry-instrumentation-grpc/README.md index e887ef2e429..6d209019b8d 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/README.md +++ b/experimental/packages/opentelemetry-instrumentation-grpc/README.md @@ -31,9 +31,10 @@ const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node'); const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc'); const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const provider = new NodeTracerProvider(); +const provider = new NodeTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); provider.register(); registerInstrumentations({ diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index b9beb6d1ca7..f375396c360 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry instrumentation for `@grpc/grpc-js` rpc client and server for gRPC framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,20 +50,20 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", "@protobuf-ts/grpc-transport": "2.9.4", "@protobuf-ts/runtime": "2.9.4", "@protobuf-ts/runtime-rpc": "2.9.4", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", @@ -73,8 +73,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 131dde04b4b..fc86aaf0abc 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -106,8 +106,8 @@ const checkEqual = x instanceof Array && y instanceof Array ? arrayIsEqual(requestEqual)(x as any)(y as any) : !(x instanceof Array) && !(y instanceof Array) - ? requestEqual(x)(y) - : false; + ? requestEqual(x)(y) + : false; const replicate = (request: TestRequestResponse) => { const result: TestRequestResponse[] = []; diff --git a/experimental/packages/opentelemetry-instrumentation-http/README.md b/experimental/packages/opentelemetry-instrumentation-http/README.md index 030e8f327b6..8237f30d1bc 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/README.md +++ b/experimental/packages/opentelemetry-instrumentation-http/README.md @@ -35,9 +35,10 @@ const { } = require('@opentelemetry/sdk-trace-node'); const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const provider = new NodeTracerProvider(); +const provider = new NodeTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); provider.register(); registerInstrumentations({ @@ -68,12 +69,6 @@ Http instrumentation has few options available to choose from. You can set the f | [`requireParentforIncomingSpans`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-http/src/types.ts#L105) | Boolean | Require that is a parent span to create new span for incoming requests. | | [`headersToSpanAttributes`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-http/src/types.ts#L107) | `object` | List of case insensitive HTTP headers to convert to span attributes. Client (outgoing requests, incoming responses) and server (incoming requests, outgoing responses) headers will be converted to span attributes in the form of `http.{request\|response}.header.header_name`, e.g. `http.response.header.content_length` | -The following options are deprecated: - -| Options | Type | Description | -| ------- | ---- | ----------- | -| `ignoreIncomingPaths` | `IgnoreMatcher[]` | Http instrumentation will not trace all incoming requests that match paths | - ## Semantic Conventions Prior to version `0.54`, this instrumentation created spans targeting an experimental semantic convention [Version 1.7.0](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/semantic_conventions/README.md). diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 52427437259..04a2229a510 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry instrumentation for `node:http` and `node:https` http client and server modules", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,20 +49,20 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "@types/superagent": "8.1.9", - "axios": "1.7.4", + "axios": "1.7.8", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "request": "2.88.2", @@ -75,9 +75,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/semantic-conventions": "1.28.0", "forwarded-parse": "2.1.2", "semver": "^7.5.2" }, diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index 7c7eb64dada..cd38055a4e7 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -40,15 +40,7 @@ import type * as https from 'https'; import { Socket } from 'net'; import * as semver from 'semver'; import * as url from 'url'; -import { - Err, - Func, - Http, - HttpInstrumentationConfig, - HttpRequestArgs, - Https, - SemconvStability, -} from './types'; +import { HttpInstrumentationConfig } from './types'; import { VERSION } from './version'; import { InstrumentationBase, @@ -65,7 +57,6 @@ import { errorMonitor } from 'events'; import { ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, - ATTR_HTTP_ROUTE, ATTR_NETWORK_PROTOCOL_VERSION, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, @@ -80,20 +71,28 @@ import { getIncomingRequestAttributesOnResponse, getIncomingRequestMetricAttributes, getIncomingRequestMetricAttributesOnResponse, + getIncomingStableRequestMetricAttributesOnResponse, getOutgoingRequestAttributes, getOutgoingRequestAttributesOnResponse, getOutgoingRequestMetricAttributes, getOutgoingRequestMetricAttributesOnResponse, getRequestInfo, headerCapture, - isIgnored, isValidOptionsType, parseResponseStatus, setSpanWithError, } from './utils'; +import { + Err, + Func, + Http, + HttpRequestArgs, + Https, + SemconvStability, +} from './internal-types'; /** - * Http instrumentation instrumentation for Opentelemetry + * `node:http` and `node:https` instrumentation for OpenTelemetry */ export class HttpInstrumentation extends InstrumentationBase { /** keep track on spans not ended */ @@ -110,7 +109,7 @@ export class HttpInstrumentation extends InstrumentationBase boolean ): ((this: unknown, event: string, ...args: unknown[]) => boolean) => { @@ -339,13 +338,13 @@ export class HttpInstrumentation extends InstrumentationBase): Func => { return this._outgoingRequestFunction(component, original); }; } - protected _getPatchOutgoingGetFunction( + private _getPatchOutgoingGetFunction( clientRequest: ( options: http.RequestOptions | string | url.URL, ...args: HttpRequestArgs @@ -430,7 +429,8 @@ export class HttpInstrumentation extends InstrumentationBase - instrumentation._diag.error('caught ignoreIncomingPaths error: ', e) - ) || safeExecuteInTheMiddle( () => instrumentation.getConfig().ignoreIncomingRequestHook?.(request), @@ -641,15 +632,19 @@ export class HttpInstrumentation extends InstrumentationBase - instrumentation._diag.error('caught ignoreOutgoingUrls error: ', e) - ) || safeExecuteInTheMiddle( () => instrumentation @@ -883,7 +867,16 @@ export class HttpInstrumentation extends InstrumentationBase original.apply(this, [optionsParsed, ...args]), + () => { + if (invalidUrl) { + // we know that the url is invalid, there's no point in injecting context as it will fail validation. + // Passing in what the user provided will give the user an error that matches what they'd see without + // the instrumentation. + return original.apply(this, [options, ...args]); + } else { + return original.apply(this, [optionsParsed, ...args]); + } + }, error => { if (error) { setSpanWithError(span, error, instrumentation._semconvStability); @@ -931,6 +924,10 @@ export class HttpInstrumentation extends InstrumentationBase response.getHeader(header) @@ -943,7 +940,6 @@ export class HttpInstrumentation extends InstrumentationBase boolean); +export type HttpCallback = (res: IncomingMessage) => void; +export type RequestFunction = typeof request; +export type GetFunction = typeof get; + +export type HttpCallbackOptional = HttpCallback | undefined; + +// from node 10+ +export type RequestSignature = [http.RequestOptions, HttpCallbackOptional] & + HttpCallback; + +export type HttpRequestArgs = Array; + +export type ParsedRequestOptions = + | (http.RequestOptions & Partial) + | http.RequestOptions; +export type Http = typeof http; +export type Https = typeof https; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type Func = (...args: any[]) => T; + +export interface Err extends Error { + errno?: number; + code?: string; + path?: string; + syscall?: string; + stack?: string; +} + +/** + * Tracks whether this instrumentation emits old experimental, + * new stable, or both semantic conventions. + * + * Enum values chosen such that the enum may be used as a bitmask. + */ +export const enum SemconvStability { + /** Emit only stable semantic conventions */ + STABLE = 0x1, + /** Emit only old semantic conventions*/ + OLD = 0x2, + /** Emit both stable and old semantic conventions*/ + DUPLICATE = 0x1 | 0x2, +} diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts index 19647fcb49a..b1c979f4122 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts @@ -14,40 +14,14 @@ * limitations under the License. */ import { Span, Attributes } from '@opentelemetry/api'; -import type * as http from 'http'; -import type * as https from 'https'; import { ClientRequest, - get, IncomingMessage, - request, ServerResponse, RequestOptions, } from 'http'; -import * as url from 'url'; import { InstrumentationConfig } from '@opentelemetry/instrumentation'; -export type IgnoreMatcher = string | RegExp | ((url: string) => boolean); -export type HttpCallback = (res: IncomingMessage) => void; -export type RequestFunction = typeof request; -export type GetFunction = typeof get; - -export type HttpCallbackOptional = HttpCallback | undefined; - -// from node 10+ -export type RequestSignature = [http.RequestOptions, HttpCallbackOptional] & - HttpCallback; - -export type HttpRequestArgs = Array; - -export type ParsedRequestOptions = - | (http.RequestOptions & Partial) - | http.RequestOptions; -export type Http = typeof http; -export type Https = typeof https; -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type Func = (...args: any[]) => T; - export interface HttpCustomAttributeFunction { ( span: Span, @@ -84,18 +58,8 @@ export interface StartOutgoingSpanCustomAttributeFunction { * Options available for the HTTP instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-http#http-instrumentation-options)) */ export interface HttpInstrumentationConfig extends InstrumentationConfig { - /** - * Not trace all incoming requests that match paths - * @deprecated use `ignoreIncomingRequestHook` instead - */ - ignoreIncomingPaths?: IgnoreMatcher[]; /** Not trace all incoming requests that matched with custom function */ ignoreIncomingRequestHook?: IgnoreIncomingRequestFunction; - /** - * Not trace all outgoing requests that match urls - * @deprecated use `ignoreOutgoingRequestHook` instead - */ - ignoreOutgoingUrls?: IgnoreMatcher[]; /** Not trace all outgoing requests that matched with custom function */ ignoreOutgoingRequestHook?: IgnoreOutgoingRequestFunction; /** If set to true, incoming requests will not be instrumented at all. */ @@ -124,26 +88,3 @@ export interface HttpInstrumentationConfig extends InstrumentationConfig { server?: { requestHeaders?: string[]; responseHeaders?: string[] }; }; } - -export interface Err extends Error { - errno?: number; - code?: string; - path?: string; - syscall?: string; - stack?: string; -} - -/** - * Tracks whether this instrumentation emits old experimental, - * new stable, or both semantic conventions. - * - * Enum values chosen such that the enum may be used as a bitmask. - */ -export const enum SemconvStability { - /** Emit only stable semantic conventions */ - STABLE = 0x1, - /** Emit only old semantic convetions */ - OLD = 0x2, - /** Emit both stable and old semantic convetions */ - DUPLICATE = 0x1 | 0x2, -} diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts index 8a3106d0f90..e7a60aa054f 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts @@ -19,6 +19,7 @@ import { Span, context, SpanKind, + DiagLogger, } from '@opentelemetry/api'; import { ATTR_CLIENT_ADDRESS, @@ -26,6 +27,7 @@ import { ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_REQUEST_METHOD_ORIGINAL, ATTR_HTTP_RESPONSE_STATUS_CODE, + ATTR_HTTP_ROUTE, ATTR_NETWORK_PEER_ADDRESS, ATTR_NETWORK_PEER_PORT, ATTR_NETWORK_PROTOCOL_VERSION, @@ -75,7 +77,7 @@ import { IgnoreMatcher, ParsedRequestOptions, SemconvStability, -} from './types'; +} from './internal-types'; import forwardedParse = require('forwarded-parse'); /** @@ -145,39 +147,6 @@ export const satisfiesPattern = ( } }; -/** - * Check whether the given request is ignored by configuration - * It will not re-throw exceptions from `list` provided by the client - * @param constant e.g URL of request - * @param [list] List of ignore patterns - * @param [onException] callback for doing something when an exception has - * occurred - */ -export const isIgnored = ( - constant: string, - list?: IgnoreMatcher[], - onException?: (error: unknown) => void -): boolean => { - if (!list) { - // No ignored urls - trace everything - return false; - } - // Try/catch outside the loop for failing fast - try { - for (const pattern of list) { - if (satisfiesPattern(constant, pattern)) { - return true; - } - } - } catch (e) { - if (onException) { - onException(e); - } - } - - return false; -}; - /** * Sets the span with the error passed in params * @param {Span} span the span that need to be set @@ -267,27 +236,104 @@ export const isCompressed = ( return !!encoding && encoding !== 'identity'; }; +/** + * Mimics Node.js conversion of URL strings to RequestOptions expected by + * `http.request` and `https.request` APIs. + * + * See https://github.com/nodejs/node/blob/2505e217bba05fc581b572c685c5cf280a16c5a3/lib/internal/url.js#L1415-L1437 + * + * @param stringUrl + * @throws TypeError if the URL is not valid. + */ +function stringUrlToHttpOptions( + stringUrl: string +): RequestOptions & { pathname: string } { + // This is heavily inspired by Node.js handling of the same situation, trying + // to follow it as closely as possible while keeping in mind that we only + // deal with string URLs, not URL objects. + const { + hostname, + pathname, + port, + username, + password, + search, + protocol, + hash, + href, + origin, + host, + } = new URL(stringUrl); + + const options: RequestOptions & { + pathname: string; + hash: string; + search: string; + href: string; + origin: string; + } = { + protocol: protocol, + hostname: + hostname && hostname[0] === '[' ? hostname.slice(1, -1) : hostname, + hash: hash, + search: search, + pathname: pathname, + path: `${pathname || ''}${search || ''}`, + href: href, + origin: origin, + host: host, + }; + if (port !== '') { + options.port = Number(port); + } + if (username || password) { + options.auth = `${decodeURIComponent(username)}:${decodeURIComponent( + password + )}`; + } + return options; +} + /** * Makes sure options is an url object * return an object with default value and parsed options + * @param logger component logger * @param options original options for the request * @param [extraOptions] additional options for the request */ export const getRequestInfo = ( + logger: DiagLogger, options: url.URL | RequestOptions | string, extraOptions?: RequestOptions ): { origin: string; pathname: string; method: string; + invalidUrl: boolean; optionsParsed: RequestOptions; } => { - let pathname = '/'; - let origin = ''; + let pathname: string; + let origin: string; let optionsParsed: RequestOptions; + let invalidUrl = false; if (typeof options === 'string') { - optionsParsed = url.parse(options); - pathname = (optionsParsed as url.UrlWithStringQuery).pathname || '/'; + try { + const convertedOptions = stringUrlToHttpOptions(options); + optionsParsed = convertedOptions; + pathname = convertedOptions.pathname || '/'; + } catch (e) { + invalidUrl = true; + logger.verbose( + 'Unable to parse URL provided to HTTP request, using fallback to determine path. Original error:', + e + ); + // for backward compatibility with how url.parse() behaved. + optionsParsed = { + path: options, + }; + pathname = optionsParsed.path || '/'; + } + origin = `${optionsParsed.protocol || 'http:'}//${optionsParsed.host}`; if (extraOptions !== undefined) { Object.assign(optionsParsed, extraOptions); @@ -317,16 +363,23 @@ export const getRequestInfo = ( { protocol: options.host ? 'http:' : undefined }, options ); - pathname = (options as url.URL).pathname; - if (!pathname && optionsParsed.path) { - pathname = url.parse(optionsParsed.path).pathname || '/'; - } + const hostname = optionsParsed.host || (optionsParsed.port != null ? `${optionsParsed.hostname}${optionsParsed.port}` : optionsParsed.hostname); origin = `${optionsParsed.protocol || 'http:'}//${hostname}`; + + pathname = (options as url.URL).pathname; + if (!pathname && optionsParsed.path) { + try { + const parsedUrl = new URL(optionsParsed.path, origin); + pathname = parsedUrl.pathname || '/'; + } catch (e) { + pathname = '/'; + } + } } // some packages return method in lowercase.. @@ -335,7 +388,7 @@ export const getRequestInfo = ( ? optionsParsed.method.toUpperCase() : 'GET'; - return { origin, pathname, method, optionsParsed }; + return { origin, pathname, method, optionsParsed, invalidUrl }; }; /** @@ -604,7 +657,7 @@ function getServerAddress( ): { host: string; port?: string } | null { const forwardedHeader = request.headers['forwarded']; if (forwardedHeader) { - for (const entry of forwardedParse(forwardedHeader)) { + for (const entry of parseForwardedHeader(forwardedHeader)) { if (entry.host) { return parseHostHeader(entry.host, entry.proto); } @@ -667,7 +720,7 @@ export function getRemoteClientAddress( ): string | null { const forwardedHeader = request.headers['forwarded']; if (forwardedHeader) { - for (const entry of forwardedParse(forwardedHeader)) { + for (const entry of parseForwardedHeader(forwardedHeader)) { if (entry.for) { return entry.for; } @@ -689,6 +742,42 @@ export function getRemoteClientAddress( return null; } +function getInfoFromIncomingMessage( + component: 'http' | 'https', + request: IncomingMessage, + logger: DiagLogger +): { pathname?: string; search?: string; toString: () => string } { + try { + if (request.headers.host) { + return new URL( + request.url ?? '/', + `${component}://${request.headers.host}` + ); + } else { + const unsafeParsedUrl = new URL( + request.url ?? '/', + // using localhost as a workaround to still use the URL constructor for parsing + `${component}://localhost` + ); + // since we use localhost as a workaround, ensure we hide the rest of the properties to avoid + // our workaround leaking though. + return { + pathname: unsafeParsedUrl.pathname, + search: unsafeParsedUrl.search, + toString: function () { + // we cannot use the result of unsafeParsedUrl.toString as it's potentially wrong. + return unsafeParsedUrl.pathname + unsafeParsedUrl.search; + }, + }; + } + } catch (e) { + // something is wrong, use undefined - this *should* never happen, logging + // for troubleshooting in case it does happen. + logger.verbose('Unable to get URL from request', e); + return {}; + } +} + /** * Returns incoming request attributes scoped to the request data * @param {IncomingMessage} request the request object @@ -702,18 +791,15 @@ export const getIncomingRequestAttributes = ( serverName?: string; hookAttributes?: Attributes; semconvStability: SemconvStability; - } + }, + logger: DiagLogger ): Attributes => { const headers = request.headers; const userAgent = headers['user-agent']; const ips = headers['x-forwarded-for']; const httpVersion = request.httpVersion; - const requestUrl = request.url ? url.parse(request.url) : null; - const host = requestUrl?.host || headers.host; - const hostname = - requestUrl?.hostname || - host?.replace(/^(.*)(:[0-9]{1,5})/, '$1') || - 'localhost'; + const host = headers.host; + const hostname = host?.replace(/^(.*)(:[0-9]{1,5})/, '$1') || 'localhost'; const method = request.method; const normalizedMethod = normalizeMethod(method); @@ -733,8 +819,14 @@ export const getIncomingRequestAttributes = ( [ATTR_USER_AGENT_ORIGINAL]: userAgent, }; - if (requestUrl?.pathname != null) { - newAttributes[ATTR_URL_PATH] = requestUrl.pathname; + const parsedUrl = getInfoFromIncomingMessage( + options.component, + request, + logger + ); + + if (parsedUrl?.pathname != null) { + newAttributes[ATTR_URL_PATH] = parsedUrl.pathname; } if (remoteClientAddress != null) { @@ -751,11 +843,7 @@ export const getIncomingRequestAttributes = ( } const oldAttributes: Attributes = { - [SEMATTRS_HTTP_URL]: getAbsoluteUrl( - requestUrl, - headers, - `${options.component}:` - ), + [SEMATTRS_HTTP_URL]: parsedUrl.toString(), [SEMATTRS_HTTP_HOST]: host, [SEMATTRS_NET_HOST_NAME]: hostname, [SEMATTRS_HTTP_METHOD]: method, @@ -770,8 +858,9 @@ export const getIncomingRequestAttributes = ( oldAttributes[SEMATTRS_HTTP_SERVER_NAME] = serverName; } - if (requestUrl) { - oldAttributes[SEMATTRS_HTTP_TARGET] = requestUrl.path || '/'; + if (parsedUrl?.pathname) { + oldAttributes[SEMATTRS_HTTP_TARGET] = + parsedUrl?.pathname + parsedUrl?.search || '/'; } if (userAgent !== undefined) { @@ -822,7 +911,7 @@ export const getIncomingRequestAttributesOnResponse = ( const { socket } = request; const { statusCode, statusMessage } = response; - const newAttributes = { + const newAttributes: Attributes = { [ATTR_HTTP_RESPONSE_STATUS_CODE]: statusCode, }; @@ -842,6 +931,7 @@ export const getIncomingRequestAttributesOnResponse = ( if (rpcMetadata?.type === RPCType.HTTP && rpcMetadata.route !== undefined) { oldAttributes[SEMATTRS_HTTP_ROUTE] = rpcMetadata.route; + newAttributes[ATTR_HTTP_ROUTE] = rpcMetadata.route; } switch (semconvStability) { @@ -872,6 +962,22 @@ export const getIncomingRequestMetricAttributesOnResponse = ( return metricAttributes; }; +export const getIncomingStableRequestMetricAttributesOnResponse = ( + spanAttributes: Attributes +): Attributes => { + const metricAttributes: Attributes = {}; + if (spanAttributes[ATTR_HTTP_ROUTE] !== undefined) { + metricAttributes[ATTR_HTTP_ROUTE] = spanAttributes[SEMATTRS_HTTP_ROUTE]; + } + + // required if and only if one was sent, same as span requirement + if (spanAttributes[ATTR_HTTP_RESPONSE_STATUS_CODE]) { + metricAttributes[ATTR_HTTP_RESPONSE_STATUS_CODE] = + spanAttributes[ATTR_HTTP_RESPONSE_STATUS_CODE]; + } + return metricAttributes; +}; + export function headerCapture(type: 'request' | 'response', headers: string[]) { const normalizedHeaders = new Map(); for (let i = 0, len = headers.length; i < len; i++) { @@ -931,3 +1037,11 @@ function normalizeMethod(method?: string | null) { return '_OTHER'; } + +function parseForwardedHeader(header: string): Record[] { + try { + return forwardedParse(header); + } catch { + return []; + } +} diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts index b6470e1f3e6..0d515baf46d 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts @@ -33,6 +33,7 @@ import { ATTR_CLIENT_ADDRESS, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, + ATTR_HTTP_ROUTE, ATTR_NETWORK_PEER_ADDRESS, ATTR_NETWORK_PEER_PORT, ATTR_NETWORK_PROTOCOL_VERSION, @@ -65,7 +66,7 @@ import * as assert from 'assert'; import * as nock from 'nock'; import * as path from 'path'; import { HttpInstrumentation } from '../../src/http'; -import { HttpInstrumentationConfig, SemconvStability } from '../../src/types'; +import { HttpInstrumentationConfig } from '../../src/types'; import { assertSpan } from '../utils/assertSpan'; import { DummyPropagation } from '../utils/DummyPropagation'; import { httpRequest } from '../utils/httpRequest'; @@ -87,6 +88,7 @@ instrumentation.disable(); import * as http from 'http'; import { AttributeNames } from '../../src/enums/AttributeNames'; import { getRemoteClientAddress } from '../../src/utils'; +import { SemconvStability } from '../../src/internal-types'; const applyCustomAttributesOnSpanErrorMessage = 'bad applyCustomAttributesOnSpan function'; @@ -182,19 +184,9 @@ describe('HttpInstrumentation', () => { before(async () => { const config: HttpInstrumentationConfig = { - ignoreIncomingPaths: [ - (url: string) => { - throw new Error('bad ignoreIncomingPaths function'); - }, - ], ignoreIncomingRequestHook: _request => { throw new Error('bad ignoreIncomingRequestHook function'); }, - ignoreOutgoingUrls: [ - (url: string) => { - throw new Error('bad ignoreOutgoingUrls function'); - }, - ], ignoreOutgoingRequestHook: _request => { throw new Error('bad ignoreOutgoingRequestHook function'); }, @@ -307,21 +299,11 @@ describe('HttpInstrumentation', () => { before(async () => { instrumentation.setConfig({ - ignoreIncomingPaths: [ - '/ignored/string', - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ], ignoreIncomingRequestHook: request => { return ( request.headers['user-agent']?.match('ignored-string') != null ); }, - ignoreOutgoingUrls: [ - `${protocol}://${hostname}:${serverPort}/ignored/string`, - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ], ignoreOutgoingRequestHook: request => { if (request.headers?.['user-agent'] != null) { return ( @@ -368,6 +350,15 @@ describe('HttpInstrumentation', () => { assert.strictEqual(rpcData.route, undefined); rpcData.route = 'TheRoute'; } + if (request.url?.includes('/login')) { + assert.strictEqual( + request.headers.authorization, + 'Basic ' + Buffer.from('username:password').toString('base64') + ); + } + if (request.url?.includes('/withQuery')) { + assert.match(request.url, /withQuery\?foo=bar$/); + } response.end('Test Server Response'); }); @@ -591,19 +582,7 @@ describe('HttpInstrumentation', () => { }); }); - for (const ignored of ['string', 'function', 'regexp']) { - it(`should not trace ignored requests with paths (client and server side) with type ${ignored}`, async () => { - const testPath = `/ignored/${ignored}`; - - await httpRequest.get( - `${protocol}://${hostname}:${serverPort}${testPath}` - ); - const spans = memoryExporter.getFinishedSpans(); - assert.strictEqual(spans.length, 0); - }); - } - - it('should not trace ignored requests with headers (client and server side)', async () => { + it('should not trace ignored requests when ignore hook returns true', async () => { const testValue = 'ignored-string'; await Promise.all([ @@ -617,7 +596,7 @@ describe('HttpInstrumentation', () => { assert.strictEqual(spans.length, 0); }); - it('should trace not ignored requests with headers (client and server side)', async () => { + it('should trace requests when ignore hook returns false', async () => { await httpRequest.get(`${protocol}://${hostname}:${serverPort}`, { headers: { 'user-agent': 'test-bot', @@ -627,7 +606,7 @@ describe('HttpInstrumentation', () => { assert.strictEqual(spans.length, 2); }); - for (const arg of ['string', {}, new Date()]) { + for (const arg of [{}, new Date()]) { it(`should be traceable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify( arg )}`, async () => { @@ -1035,6 +1014,34 @@ describe('HttpInstrumentation', () => { assert.deepStrictEqual(warnMessages, []); }); + + it('should not throw with cyrillic characters in the request path', async () => { + // see https://github.com/open-telemetry/opentelemetry-js/issues/5060 + await httpRequest.get(`${protocol}://${hostname}:${serverPort}/привет`); + }); + + it('should keep username and password in the request', async () => { + await httpRequest.get( + `${protocol}://username:password@${hostname}:${serverPort}/login` + ); + }); + + it('should keep query in the request', async () => { + await httpRequest.get( + `${protocol}://${hostname}:${serverPort}/withQuery?foo=bar` + ); + }); + + it('using an invalid url does throw from client but still creates a span', async () => { + try { + await httpRequest.get(`http://instrumentation.test:string-as-port/`); + } catch (e) { + assert.match(e.message, /Invalid URL/); + } + + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + }); }); describe('with semconv stability set to http', () => { @@ -1134,6 +1141,32 @@ describe('HttpInstrumentation', () => { [ATTR_URL_SCHEME]: protocol, }); }); + + it('should generate semconv 1.27 server spans with route when RPC metadata is available', async () => { + const response = await httpRequest.get( + `${protocol}://${hostname}:${serverPort}${pathname}/setroute` + ); + const spans = memoryExporter.getFinishedSpans(); + const [incomingSpan, _] = spans; + assert.strictEqual(spans.length, 2); + + const body = JSON.parse(response.data); + + // should have only required and recommended attributes for semconv 1.27 + assert.deepStrictEqual(incomingSpan.attributes, { + [ATTR_CLIENT_ADDRESS]: body.address, + [ATTR_HTTP_REQUEST_METHOD]: HTTP_REQUEST_METHOD_VALUE_GET, + [ATTR_SERVER_ADDRESS]: hostname, + [ATTR_HTTP_ROUTE]: 'TheRoute', + [ATTR_SERVER_PORT]: serverPort, + [ATTR_HTTP_RESPONSE_STATUS_CODE]: 200, + [ATTR_NETWORK_PEER_ADDRESS]: body.address, + [ATTR_NETWORK_PEER_PORT]: response.clientRemotePort, + [ATTR_NETWORK_PROTOCOL_VERSION]: '1.1', + [ATTR_URL_PATH]: `${pathname}/setroute`, + [ATTR_URL_SCHEME]: protocol, + }); + }); }); describe('with semconv stability set to http/dup', () => { @@ -1146,6 +1179,13 @@ describe('HttpInstrumentation', () => { instrumentation['_semconvStability'] = SemconvStability.DUPLICATE; instrumentation.enable(); server = http.createServer((request, response) => { + if (request.url?.includes('/setroute')) { + const rpcData = getRPCMetadata(context.active()); + assert.ok(rpcData != null); + assert.strictEqual(rpcData.type, RPCType.HTTP); + assert.strictEqual(rpcData.route, undefined); + rpcData.route = 'TheRoute'; + } response.setHeader('Content-Type', 'application/json'); response.end( JSON.stringify({ address: getRemoteClientAddress(request) }) @@ -1241,6 +1281,50 @@ describe('HttpInstrumentation', () => { [AttributeNames.HTTP_STATUS_TEXT]: 'OK', }); }); + + it('should create server spans with semconv 1.27 and old 1.7 including http.route if RPC metadata is available', async () => { + const response = await httpRequest.get( + `${protocol}://${hostname}:${serverPort}${pathname}/setroute` + ); + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 2); + const incomingSpan = spans[0]; + const body = JSON.parse(response.data); + + // should have only required and recommended attributes for semconv 1.27 + assert.deepStrictEqual(incomingSpan.attributes, { + // 1.27 attributes + [ATTR_CLIENT_ADDRESS]: body.address, + [ATTR_HTTP_REQUEST_METHOD]: HTTP_REQUEST_METHOD_VALUE_GET, + [ATTR_SERVER_ADDRESS]: hostname, + [ATTR_SERVER_PORT]: serverPort, + [ATTR_HTTP_RESPONSE_STATUS_CODE]: 200, + [ATTR_NETWORK_PEER_ADDRESS]: body.address, + [ATTR_NETWORK_PEER_PORT]: response.clientRemotePort, + [ATTR_NETWORK_PROTOCOL_VERSION]: '1.1', + [ATTR_URL_PATH]: `${pathname}/setroute`, + [ATTR_URL_SCHEME]: protocol, + [ATTR_HTTP_ROUTE]: 'TheRoute', + + // 1.7 attributes + [SEMATTRS_HTTP_FLAVOR]: '1.1', + [SEMATTRS_HTTP_HOST]: `${hostname}:${serverPort}`, + [SEMATTRS_HTTP_METHOD]: 'GET', + [SEMATTRS_HTTP_SCHEME]: protocol, + [SEMATTRS_HTTP_STATUS_CODE]: 200, + [SEMATTRS_HTTP_TARGET]: `${pathname}/setroute`, + [SEMATTRS_HTTP_URL]: `http://${hostname}:${serverPort}${pathname}/setroute`, + [SEMATTRS_NET_TRANSPORT]: 'ip_tcp', + [SEMATTRS_NET_HOST_IP]: body.address, + [SEMATTRS_NET_HOST_NAME]: hostname, + [SEMATTRS_NET_HOST_PORT]: serverPort, + [SEMATTRS_NET_PEER_IP]: body.address, + [SEMATTRS_NET_PEER_PORT]: response.clientRemotePort, + + // unspecified old names + [AttributeNames.HTTP_STATUS_TEXT]: 'OK', + }); + }); }); describe('with require parent span', () => { diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts index de43ae8c521..907a67b10b0 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-metrics.test.ts @@ -22,6 +22,7 @@ import { import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { ATTR_HTTP_REQUEST_METHOD, + ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_HTTP_ROUTE, ATTR_NETWORK_PROTOCOL_VERSION, ATTR_SERVER_ADDRESS, @@ -47,7 +48,7 @@ instrumentation.enable(); instrumentation.disable(); import * as http from 'http'; -import { SemconvStability } from '../../src/types'; +import { SemconvStability } from '../../src/internal-types'; import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; @@ -181,7 +182,7 @@ describe('metrics', () => { }); }); - describe('with no semconv stability set to stable', () => { + describe('with semconv stability set to stable', () => { before(() => { instrumentation['_semconvStability'] = SemconvStability.STABLE; }); @@ -217,7 +218,9 @@ describe('metrics', () => { assert.deepStrictEqual(metrics[0].dataPoints[0].attributes, { [ATTR_HTTP_REQUEST_METHOD]: 'GET', [ATTR_URL_SCHEME]: 'http', + [ATTR_HTTP_RESPONSE_STATUS_CODE]: 200, [ATTR_NETWORK_PROTOCOL_VERSION]: '1.1', + [ATTR_HTTP_ROUTE]: 'TheRoute', }); assert.strictEqual(metrics[1].dataPointType, DataPointType.HISTOGRAM); @@ -244,7 +247,7 @@ describe('metrics', () => { }); }); - describe('with no semconv stability set to duplicate', () => { + describe('with semconv stability set to duplicate', () => { before(() => { instrumentation['_semconvStability'] = SemconvStability.DUPLICATE; }); @@ -353,6 +356,7 @@ describe('metrics', () => { assert.deepStrictEqual(metrics[2].dataPoints[0].attributes, { [ATTR_HTTP_REQUEST_METHOD]: 'GET', [ATTR_URL_SCHEME]: 'http', + [ATTR_HTTP_RESPONSE_STATUS_CODE]: 200, [ATTR_NETWORK_PROTOCOL_VERSION]: '1.1', [ATTR_HTTP_ROUTE]: 'TheRoute', }); diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts index 0f48a30ae72..a9f3b506a60 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts @@ -111,19 +111,9 @@ describe('HttpsInstrumentation', () => { before(() => { instrumentation.setConfig({ - ignoreIncomingPaths: [ - (url: string) => { - throw new Error('bad ignoreIncomingPaths function'); - }, - ], ignoreIncomingRequestHook: _request => { throw new Error('bad ignoreIncomingRequestHook function'); }, - ignoreOutgoingUrls: [ - (url: string) => { - throw new Error('bad ignoreOutgoingUrls function'); - }, - ], ignoreOutgoingRequestHook: _request => { throw new Error('bad ignoreOutgoingRequestHook function'); }, @@ -192,21 +182,11 @@ describe('HttpsInstrumentation', () => { before(() => { instrumentation.setConfig({ - ignoreIncomingPaths: [ - '/ignored/string', - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ], ignoreIncomingRequestHook: request => { return ( request.headers['user-agent']?.match('ignored-string') != null ); }, - ignoreOutgoingUrls: [ - `${protocol}://${hostname}:${serverPort}/ignored/string`, - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ], ignoreOutgoingRequestHook: request => { if (request.headers?.['user-agent'] != null) { return ( @@ -441,19 +421,7 @@ describe('HttpsInstrumentation', () => { }); }); - for (const ignored of ['string', 'function', 'regexp']) { - it(`should not trace ignored requests with paths (client and server side) with type ${ignored}`, async () => { - const testPath = `/ignored/${ignored}`; - - await httpsRequest.get( - `${protocol}://${hostname}:${serverPort}${testPath}` - ); - const spans = memoryExporter.getFinishedSpans(); - assert.strictEqual(spans.length, 0); - }); - } - - it('should not trace ignored requests with headers (client and server side)', async () => { + it('should trace requests when ignore hook returns false', async () => { const testValue = 'ignored-string'; await Promise.all([ @@ -467,7 +435,7 @@ describe('HttpsInstrumentation', () => { assert.strictEqual(spans.length, 0); }); - for (const arg of ['string', {}, new Date()]) { + for (const arg of [{}, new Date()]) { it(`should be traceable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify( arg )}`, async () => { @@ -704,6 +672,31 @@ describe('HttpsInstrumentation', () => { }); req.end(); }); + + it('should keep username and password in the request', async () => { + await httpsRequest.get( + `${protocol}://username:password@${hostname}:${serverPort}/login` + ); + }); + + it('should keep query in the request', async () => { + await httpsRequest.get( + `${protocol}://${hostname}:${serverPort}/withQuery?foo=bar` + ); + }); + + it('using an invalid url does throw from client but still creates a span', async () => { + try { + await httpsRequest.get( + `${protocol}://instrumentation.test:string-as-port/` + ); + } catch (e) { + assert.match(e.message, /Invalid URL/); + } + + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + }); }); describe('partially disable instrumentation', () => { diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts index c091529c9fc..4f41548c897 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts @@ -19,6 +19,7 @@ import { SpanKind, context, Span, + diag, } from '@opentelemetry/api'; import { SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH, @@ -37,7 +38,7 @@ import { IgnoreMatcher, ParsedRequestOptions, SemconvStability, -} from '../../src/types'; +} from '../../src/internal-types'; import * as utils from '../../src/utils'; import { AttributeNames } from '../../src/enums/AttributeNames'; import { RPCType, setRPCMetadata } from '@opentelemetry/core'; @@ -101,7 +102,7 @@ describe('Utility', () => { urlParsedWithUndefinedHostAndNullPort, whatWgUrl, ]) { - const result = utils.getRequestInfo(param); + const result = utils.getRequestInfo(diag, param); assert.strictEqual(result.optionsParsed.hostname, 'google.fr'); assert.strictEqual(result.optionsParsed.protocol, 'http:'); assert.strictEqual(result.optionsParsed.path, '/aPath?qu=ry'); @@ -149,85 +150,6 @@ describe('Utility', () => { }); }); - describe('isIgnored()', () => { - beforeEach(() => { - sinon.spy(utils, 'satisfiesPattern'); - }); - - afterEach(() => { - sinon.restore(); - }); - - it('should call isSatisfyPattern, n match', () => { - const answer1 = utils.isIgnored('/test/1', ['/test/11']); - assert.strictEqual(answer1, false); - assert.strictEqual( - (utils.satisfiesPattern as sinon.SinonSpy).callCount, - 1 - ); - }); - - it('should call isSatisfyPattern, match for function', () => { - const answer1 = utils.isIgnored('/test/1', [ - url => url.endsWith('/test/1'), - ]); - assert.strictEqual(answer1, true); - }); - - it('should not re-throw when function throws an exception', () => { - const onException = (e: unknown) => { - // Do nothing - }; - for (const callback of [undefined, onException]) { - assert.doesNotThrow(() => - utils.isIgnored( - '/test/1', - [ - () => { - throw new Error('test'); - }, - ], - callback - ) - ); - } - }); - - it('should call onException when function throws an exception', () => { - const onException = sinon.spy(); - assert.doesNotThrow(() => - utils.isIgnored( - '/test/1', - [ - () => { - throw new Error('test'); - }, - ], - onException - ) - ); - assert.strictEqual((onException as sinon.SinonSpy).callCount, 1); - }); - - it('should not call isSatisfyPattern', () => { - utils.isIgnored('/test/1', []); - assert.strictEqual( - (utils.satisfiesPattern as sinon.SinonSpy).callCount, - 0 - ); - }); - - it('should return false on empty list', () => { - const answer1 = utils.isIgnored('/test/1', []); - assert.strictEqual(answer1, false); - }); - - it('should not throw and return false when list is undefined', () => { - const answer2 = utils.isIgnored('/test/1', undefined); - assert.strictEqual(answer2, false); - }); - }); - describe('getAbsoluteUrl()', () => { it('should return absolute url with localhost', () => { const path = '/test/1'; @@ -511,10 +433,14 @@ describe('Utility', () => { 'user-agent': 'chrome', 'x-forwarded-for': ', , ', }; - const attributes = utils.getIncomingRequestAttributes(request, { - component: 'http', - semconvStability: SemconvStability.OLD, - }); + const attributes = utils.getIncomingRequestAttributes( + request, + { + component: 'http', + semconvStability: SemconvStability.OLD, + }, + diag + ); assert.strictEqual(attributes[SEMATTRS_HTTP_ROUTE], undefined); }); @@ -527,10 +453,14 @@ describe('Utility', () => { request.headers = { 'user-agent': 'chrome', }; - const attributes = utils.getIncomingRequestAttributes(request, { - component: 'http', - semconvStability: SemconvStability.OLD, - }); + const attributes = utils.getIncomingRequestAttributes( + request, + { + component: 'http', + semconvStability: SemconvStability.OLD, + }, + diag + ); assert.strictEqual(attributes[SEMATTRS_HTTP_TARGET], '/user/?q=val'); }); }); 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 1f7829c4d22..558bbcb8ff4 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 @@ -45,7 +45,6 @@ import { Socket } from 'net'; import { sendRequestTwice } from '../utils/rawRequest'; const protocol = 'http'; -const serverPort = 32345; const hostname = 'localhost'; const memoryExporter = new InMemorySpanExporter(); @@ -138,14 +137,7 @@ describe('HttpInstrumentation Integration tests', () => { }); before(() => { - const ignoreConfig = [ - `${protocol}://${hostname}:${serverPort}/ignored/string`, - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ]; instrumentation.setConfig({ - ignoreIncomingPaths: ignoreConfig, - ignoreOutgoingUrls: ignoreConfig, applyCustomAttributesOnSpan: customAttributeFunction, }); instrumentation.enable(); @@ -285,6 +277,20 @@ describe('HttpInstrumentation Integration tests', () => { assert.ok(result.reqHeaders[DummyPropagation.SPAN_CONTEXT_KEY]); }); + it('should succeed even with malformed Forwarded header', async () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 0); + + const headers = { 'x-foo': 'foo', forwarded: 'malformed' }; + const result = await httpRequest.get( + new url.URL(`${protocol}://localhost:${mockServerPort}/?query=test`), + { headers } + ); + + 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/integrations/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts index aa19a8629f9..ec0c35f6303 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts @@ -46,8 +46,6 @@ import { httpsRequest } from '../utils/httpsRequest'; import { DummyPropagation } from '../utils/DummyPropagation'; const protocol = 'https'; -const serverPort = 42345; -const hostname = 'localhost'; const memoryExporter = new InMemorySpanExporter(); export const customAttributeFunction = (span: Span): void => { @@ -139,15 +137,8 @@ describe('HttpsInstrumentation Integration tests', () => { }); before(() => { - const ignoreConfig = [ - `${protocol}://${hostname}:${serverPort}/ignored/string`, - /\/ignored\/regexp$/i, - (url: string) => url.endsWith('/ignored/function'), - ]; propagation.setGlobalPropagator(new DummyPropagation()); instrumentation.setConfig({ - ignoreIncomingPaths: ignoreConfig, - ignoreOutgoingUrls: ignoreConfig, applyCustomAttributesOnSpan: customAttributeFunction, }); instrumentation.enable(); diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md b/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md index 8c706ffa61f..f2cfa5b7205 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md @@ -25,8 +25,9 @@ import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xm import { ZoneContextManager } from '@opentelemetry/context-zone'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; -const providerWithZone = new WebTracerProvider(); -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const providerWithZone = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); providerWithZone.register({ contextManager: new ZoneContextManager(), @@ -70,8 +71,25 @@ XHR instrumentation plugin has few options available to choose from. You can set | Options | Type | Description | |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-----------------------------------------------------------------------------------------| -| [`applyCustomAttributesOnSpan`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L76) | `XHRCustomAttributeFunction` | Function for adding custom attributes | -| [`ignoreNetworkEvents`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L78) | `boolean` | Disable network events being added as span events (network events are added by default) | +| [`applyCustomAttributesOnSpan`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L85) | `XHRCustomAttributeFunction` | Function for adding custom attributes | +| [`ignoreNetworkEvents`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L87) | `boolean` | Disable network events being added as span events (network events are added by default) | +| [`measureRequestSize`](https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L89) | `boolean` | Measure outgoing request length (outgoing request length is not measured by default) | + +## Semantic Conventions + +This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which implements Semantic Convention [Version 1.7.0](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/semantic_conventions/README.md) + +Attributes collected: + +| Attribute | Short Description | +| ------------------------------------------- | ------------------------------------------------------------------------------ | +| `http.status_code` | HTTP response status code | +| `http.host` | The value of the HTTP host header | +| `http.user_agent` | Value of the HTTP User-Agent header sent by the client | +| `http.scheme` | The URI scheme identifying the used protocol | +| `http.url` | Full HTTP request URL | +| `http.method` | HTTP request method | +| `http.request_content_length_uncompressed` | Uncompressed size of the request body, if any body exists | ## Example Screenshots diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index a72efde5c13..c6d940e0ff2 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry instrumentation for XMLHttpRequest http client in web browsers", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,13 +54,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -74,12 +74,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -87,10 +87,10 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts new file mode 100644 index 00000000000..c15e84efdd1 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/utils.ts @@ -0,0 +1,80 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Much of the logic here overlaps with the same utils file in opentelemetry-instrumentation-fetch +// These may be unified in the future. + +import * as api from '@opentelemetry/api'; + +const DIAG_LOGGER = api.diag.createComponentLogger({ + namespace: + '@opentelemetry/opentelemetry-instrumentation-xml-http-request/utils', +}); + +/** + * Helper function to determine payload content length for XHR requests + * @param body + * @returns content length + */ +export function getXHRBodyLength( + body: Document | XMLHttpRequestBodyInit +): number | undefined { + if (typeof Document !== 'undefined' && body instanceof Document) { + return new XMLSerializer().serializeToString(document).length; + } + // XMLHttpRequestBodyInit expands to the following: + if (body instanceof Blob) { + return body.size; + } + + // ArrayBuffer | ArrayBufferView + if ((body as any).byteLength !== undefined) { + return (body as any).byteLength as number; + } + + if (body instanceof FormData) { + return getFormDataSize(body); + } + + if (body instanceof URLSearchParams) { + return getByteLength(body.toString()); + } + + if (typeof body === 'string') { + return getByteLength(body); + } + + DIAG_LOGGER.warn('unknown body type'); + return undefined; +} + +const TEXT_ENCODER = new TextEncoder(); +function getByteLength(s: string): number { + return TEXT_ENCODER.encode(s).byteLength; +} + +function getFormDataSize(formData: FormData): number { + let size = 0; + for (const [key, value] of formData.entries()) { + size += key.length; + if (value instanceof Blob) { + size += value.size; + } else { + size += value.length; + } + } + return size; +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 5a8ba3012cb..6d2eafa054c 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -29,6 +29,7 @@ import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, } from '@opentelemetry/semantic-conventions'; import { addSpanNetworkEvents, @@ -44,6 +45,7 @@ import { SendFunction, XhrMem, } from './types'; +import { getXHRBodyLength } from './utils'; import { VERSION } from './version'; import { AttributeNames } from './enums/AttributeNames'; @@ -83,6 +85,8 @@ export interface XMLHttpRequestInstrumentationConfig applyCustomAttributesOnSpan?: XHRCustomAttributeFunction; /** Ignore adding network events as span events */ ignoreNetworkEvents?: boolean; + /** Measure outgoing request size */ + measureRequestSize?: boolean; } /** @@ -486,6 +490,17 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase { diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/utils.test.ts new file mode 100644 index 00000000000..d14f14e1822 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/utils.test.ts @@ -0,0 +1,94 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; + +import { getXHRBodyLength } from '../src/utils'; + +describe('getXHRBodyLength', () => { + it('should compute body length for Document payload', () => { + // webworkers don't have DOMParser + if (typeof DOMParser === 'undefined') { + assert.ok(true); + return; + } + const doc = new DOMParser().parseFromString( + '

hello world

', + 'text/html' + ); + + const length = getXHRBodyLength(doc); + assert.ok(length !== undefined, 'body length is undefined'); + assert.ok(length, 'body length is 0'); + }); + it('should compute body length for Blob payload', () => { + const blob = new Blob(['hello world'], { + type: 'text/plain', + }); + + assert.strictEqual(getXHRBodyLength(blob), 11); + }); + it('should compute body length for ArrayBuffer/ArrayBufferView payload', () => { + const arrayBuffer = new Uint8Array([1, 2, 3]).buffer; + + assert.strictEqual(getXHRBodyLength(arrayBuffer), 3); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(8)), 8); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(8).slice(0, 2)), 2); + assert.strictEqual(getXHRBodyLength(new ArrayBuffer(0)), 0); + }); + it('should compute body length for FormData payload', () => { + const formData = new FormData(); + formData.append('key1', 'true'); + formData.append('key2', 'hello world'); + + assert.strictEqual(getXHRBodyLength(formData), 23); + assert.strictEqual(getXHRBodyLength(new FormData()), 0); + }); + it('should compute body length for FormData payload with a file', () => { + const formData = new FormData(); + const f = new File( + ['hello world hello world hello world'], + 'test_file.txt' + ); + formData.append('file', f); + + // length should be: + // 4 for the key of the file in the form data + // 35 for the file contents + assert.strictEqual(getXHRBodyLength(formData), 39); + }); + it('should compute body length for URLSearchParams payload', () => { + const search = new URLSearchParams({ + key1: 'true', + key2: 'hello world', + }); + + assert.strictEqual(getXHRBodyLength(search), 26); + assert.strictEqual(getXHRBodyLength(new URLSearchParams()), 0); + }); + it('should compute body length for string payload', () => { + const jsonString = JSON.stringify({ + key1: 'true', + key2: 'hello world', + }); + assert.strictEqual(getXHRBodyLength(jsonString), 36); + assert.strictEqual(getXHRBodyLength('hello world'), 11); + assert.strictEqual(getXHRBodyLength('π'), 2); // one character, 2 bytes + assert.strictEqual(getXHRBodyLength('🔥🔪😭'), 12); // each emoji is 4 bytes + assert.strictEqual(getXHRBodyLength('مرحبا بالعالم'), 25); // hello world in Arabic is 25 bytes + assert.strictEqual(getXHRBodyLength(''), 0); + }); +}); diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts index f3685e06a13..481e3f1538f 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts @@ -29,11 +29,11 @@ import { SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH, - SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, } from '@opentelemetry/semantic-conventions'; import { PerformanceTimingNames as PTN, @@ -97,6 +97,41 @@ const getData = ( }); }; +const postData = ( + req: XMLHttpRequest, + url: string, + data: Document | XMLHttpRequestBodyInit, + callbackAfterSend: Function, + async?: boolean +) => { + // eslint-disable-next-line no-async-promise-executor + return new Promise(async (resolve, reject) => { + if (async === undefined) { + async = true; + } + req.timeout = XHR_TIMEOUT; + + req.open('POST', url, async); + req.onload = function () { + resolve(); + }; + + req.onerror = function () { + resolve(); + }; + + req.onabort = function () { + resolve(); + }; + + req.ontimeout = function () { + resolve(); + }; + req.send(data); + callbackAfterSend(); + }); +}; + function createResource(resource = {}): PerformanceResourceTiming { const defaultResource = { connectEnd: 15, @@ -190,7 +225,6 @@ describe('xhr', () => { const testAsync = test.async; describe(`when async='${testAsync}'`, () => { let requests: any[] = []; - let prepareData: any; let clearData: any; let contextManager: ZoneContextManager; @@ -213,7 +247,7 @@ describe('xhr', () => { api.propagation.disable(); }); - describe('when request is successful', () => { + describe('when GET request is successful', () => { let webTracerWithZone: api.Tracer; let webTracerProviderWithZone: WebTracerProvider; let dummySpanExporter: DummySpanExporter; @@ -231,7 +265,7 @@ describe('xhr', () => { sinon.restore(); }; - prepareData = ( + const prepareData = ( done: any, fileUrl: string, config?: XMLHttpRequestInstrumentationConfig @@ -313,7 +347,10 @@ describe('xhr', () => { beforeEach(done => { const propagateTraceHeaderCorsUrls = [window.location.origin]; - prepareData(done, url, { propagateTraceHeaderCorsUrls }); + prepareData(done, url, { + propagateTraceHeaderCorsUrls, + measureRequestSize: true, + }); }); afterEach(() => { @@ -363,40 +400,55 @@ describe('xhr', () => { const keys = Object.keys(attributes); assert.strictEqual( - attributes[keys[0]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); - assert.ok( - (attributes[keys[2]] as number) > 0, + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + 30, `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} <= 0` ); assert.strictEqual( - attributes[keys[3]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 200, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); assert.strictEqual( - attributes[keys[4]], + attributes[AttributeNames.HTTP_STATUS_TEXT], 'OK', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.strictEqual( - attributes[keys[5]], + attributes[SEMATTRS_HTTP_HOST], parseUrl(url).host, `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[6]] === 'http' || attributes[keys[6]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[7]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); @@ -808,7 +860,7 @@ describe('xhr', () => { }); }); - describe('when request is NOT successful', () => { + describe('when GET request is NOT successful', () => { let webTracerWithZoneProvider: WebTracerProvider; let webTracerWithZone: api.Tracer; let dummySpanExporter: DummySpanExporter; @@ -962,41 +1014,55 @@ describe('xhr', () => { const keys = Object.keys(attributes); assert.strictEqual( - attributes[keys[0]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; assert.strictEqual( - attributes[keys[2]], + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, 0, - `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH} is wrong` + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} <= 0` ); assert.strictEqual( - attributes[keys[3]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 400, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); assert.strictEqual( - attributes[keys[4]], + attributes[AttributeNames.HTTP_STATUS_TEXT], 'Bad Request', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.strictEqual( - attributes[keys[5]], + attributes[SEMATTRS_HTTP_HOST], 'raw.githubusercontent.com', `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[6]] === 'http' || attributes[keys[6]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[7]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); @@ -1036,38 +1102,57 @@ describe('xhr', () => { const keys = Object.keys(attributes); assert.strictEqual( - attributes[keys[0]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); assert.strictEqual( - attributes[keys[2]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 0, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); assert.strictEqual( - attributes[keys[3]], + attributes[AttributeNames.HTTP_STATUS_TEXT], '', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.strictEqual( - attributes[keys[4]], + attributes[SEMATTRS_HTTP_HOST], 'raw.githubusercontent.com', `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[5]] === 'http' || attributes[keys[5]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[6]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); }); @@ -1102,38 +1187,57 @@ describe('xhr', () => { const keys = Object.keys(attributes); assert.strictEqual( - attributes[keys[0]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); assert.strictEqual( - attributes[keys[2]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 0, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); assert.strictEqual( - attributes[keys[3]], + attributes[AttributeNames.HTTP_STATUS_TEXT], '', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.strictEqual( - attributes[keys[4]], + attributes[SEMATTRS_HTTP_HOST], 'raw.githubusercontent.com', `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[5]] === 'http' || attributes[keys[5]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[6]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); }); @@ -1168,38 +1272,1238 @@ describe('xhr', () => { const keys = Object.keys(attributes); assert.strictEqual( - attributes[keys[0]], + attributes[SEMATTRS_HTTP_METHOD], 'GET', `attributes ${SEMATTRS_HTTP_METHOD} is wrong` ); assert.strictEqual( - attributes[keys[1]], + attributes[SEMATTRS_HTTP_URL], url, `attributes ${SEMATTRS_HTTP_URL} is wrong` ); assert.strictEqual( - attributes[keys[2]], + attributes[SEMATTRS_HTTP_STATUS_CODE], 0, `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` ); assert.strictEqual( - attributes[keys[3]], + attributes[AttributeNames.HTTP_STATUS_TEXT], '', `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` ); assert.strictEqual( - attributes[keys[4]], + attributes[SEMATTRS_HTTP_HOST], 'raw.githubusercontent.com', `attributes ${SEMATTRS_HTTP_HOST} is wrong` ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; assert.ok( - attributes[keys[5]] === 'http' || attributes[keys[5]] === 'https', + httpScheme === 'http' || httpScheme === 'https', `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` ); - assert.ok( - attributes[keys[6]] !== '', + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); + + assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + EventNames.EVENT_TIMEOUT, + ]); + assert.strictEqual(events.length, 3, 'number of events is wrong'); + }); + }); + + describe('when applyCustomAttributesOnSpan hook is present', () => { + describe('AND request loads and receives an error code', () => { + beforeEach(done => { + clearData(); + prepareData({ + applyCustomAttributesOnSpan: function (span, xhr) { + span.setAttribute('xhr-custom-error-code', xhr.status); + }, + }); + erroredRequest(done); + }); + + it('span should have custom attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + assert.ok(attributes['xhr-custom-error-code'] === 400); + }); + }); + + describe('AND request encounters a network error', () => { + beforeEach(done => { + clearData(); + prepareData({ + applyCustomAttributesOnSpan: function (span, xhr) { + span.setAttribute('xhr-custom-error-code', xhr.status); + }, + }); + networkErrorRequest(done); + }); + + it('span should have custom attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + assert.ok(attributes['xhr-custom-error-code'] === 0); + }); + }); + + describe('AND request is aborted', () => { + before(function () { + // Can only abort Async requests + if (!testAsync) { + this.skip(); + } + }); + + beforeEach(done => { + clearData(); + prepareData({ + applyCustomAttributesOnSpan: function (span, xhr) { + span.setAttribute('xhr-custom-error-code', xhr.status); + }, + }); + abortedRequest(done); + }); + + it('span should have custom attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + assert.ok(attributes['xhr-custom-error-code'] === 0); + }); + }); + + describe('AND request times out', () => { + before(function () { + // Can only set timeout for Async requests + if (!testAsync) { + this.skip(); + } + }); + + beforeEach(done => { + clearData(); + prepareData({ + applyCustomAttributesOnSpan: function (span, xhr) { + span.setAttribute('xhr-custom-error-code', xhr.status); + }, + }); + timedOutRequest(done); + }); + + it('span should have custom attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + assert.ok(attributes['xhr-custom-error-code'] === 0); + }); + }); + }); + }); + + describe('when POST request is successful', () => { + let webTracerWithZone: api.Tracer; + let webTracerProviderWithZone: WebTracerProvider; + let dummySpanExporter: DummySpanExporter; + let exportSpy: any; + let clearResourceTimingsSpy: any; + let rootSpan: api.Span; + let spyEntries: any; + const url = 'http://localhost:8090/xml-http-request.js'; + const secureUrl = 'https://localhost:8090/xml-http-request.js'; + let fakeNow = 0; + let xmlHttpRequestInstrumentation: XMLHttpRequestInstrumentation; + + clearData = () => { + requests = []; + sinon.restore(); + }; + + const prepareData = ( + done: any, + fileUrl: string, + config?: XMLHttpRequestInstrumentationConfig + ) => { + const fakeXhr = sinon.useFakeXMLHttpRequest(); + fakeXhr.onCreate = function (xhr: any) { + requests.push(xhr); + }; + sinon.useFakeTimers(); + + sinon.stub(performance, 'timeOrigin').value(0); + sinon.stub(performance, 'now').callsFake(() => fakeNow); + + const resources: PerformanceResourceTiming[] = []; + resources.push( + createResource({ + name: fileUrl, + }), + createMainResource({ + name: fileUrl, + }) + ); + + spyEntries = sinon.stub( + performance as unknown as Performance, + 'getEntriesByType' + ); + spyEntries.withArgs('resource').returns(resources); + + sinon + .stub(window, 'PerformanceObserver') + .value(createFakePerformanceObs(fileUrl)); + + xmlHttpRequestInstrumentation = new XMLHttpRequestInstrumentation( + config + ); + webTracerProviderWithZone = new WebTracerProvider(); + registerInstrumentations({ + instrumentations: [xmlHttpRequestInstrumentation], + tracerProvider: webTracerProviderWithZone, + }); + webTracerWithZone = webTracerProviderWithZone.getTracer('xhr-test'); + dummySpanExporter = new DummySpanExporter(); + exportSpy = sinon.stub(dummySpanExporter, 'export'); + clearResourceTimingsSpy = sinon.stub( + performance as unknown as Performance, + 'clearResourceTimings' + ); + webTracerProviderWithZone.addSpanProcessor( + new tracing.SimpleSpanProcessor(dummySpanExporter) + ); + + rootSpan = webTracerWithZone.startSpan('root'); + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + new XMLHttpRequest(), + fileUrl, + '{"embedded":"data"}', + () => { + fakeNow = 100; + }, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + assert.strictEqual(requests.length, 1, 'request not called'); + + requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + '{"foo":"bar"}' + ); + } + ); + }; + + beforeEach(done => { + const propagateTraceHeaderCorsUrls = [window.location.origin]; + prepareData(done, url, { + propagateTraceHeaderCorsUrls, + measureRequestSize: true, + }); + }); + + afterEach(() => { + clearData(); + }); + + it('should patch to wrap XML HTTP Requests when enabled', () => { + const xhttp = new XMLHttpRequest(); + assert.ok(isWrapped(xhttp.send)); + xmlHttpRequestInstrumentation.enable(); + assert.ok(isWrapped(xhttp.send)); + }); + + it('should unpatch to unwrap XML HTTP Requests when disabled', () => { + const xhttp = new XMLHttpRequest(); + assert.ok(isWrapped(xhttp.send)); + xmlHttpRequestInstrumentation.disable(); + assert.ok(!isWrapped(xhttp.send)); + }); + + it('should create a span with correct root span', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + assert.strictEqual( + span.parentSpanId, + rootSpan.spanContext().spanId, + 'parent span is not root span' + ); + }); + + it('span should have correct name', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + assert.strictEqual(span.name, 'POST', 'span has wrong name'); + }); + + it('span should have correct kind', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + assert.strictEqual( + span.kind, + api.SpanKind.CLIENT, + 'span has wrong kind' + ); + }); + + it('span should have correct attributes', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[SEMATTRS_HTTP_METHOD], + 'POST', + `attributes ${SEMATTRS_HTTP_METHOD} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + url, + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + 19, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} !== 19` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + 30, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} <= 0` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_STATUS_CODE], + 200, + `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` + ); + assert.strictEqual( + attributes[AttributeNames.HTTP_STATUS_TEXT], + 'OK', + `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_HOST], + parseUrl(url).host, + `attributes ${SEMATTRS_HTTP_HOST} is wrong` + ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; + assert.ok( + httpScheme === 'http' || httpScheme === 'https', + `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` + ); + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', + `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` + ); + + assert.strictEqual(keys.length, 9, 'number of attributes is wrong'); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const events = span.events; + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + EventNames.EVENT_LOAD, + ]); + assert.strictEqual(events.length, 11, 'number of events is wrong'); + }); + + it('should create a span for preflight request', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const parentSpan: tracing.ReadableSpan = exportSpy.args[1][0][0]; + assert.strictEqual( + span.parentSpanId, + parentSpan.spanContext().spanId, + 'parent span is not root span' + ); + }); + + it('preflight request span should have correct name', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + assert.strictEqual( + span.name, + 'CORS Preflight', + 'preflight request span has wrong name' + ); + }); + + it('preflight request span should have correct kind', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + assert.strictEqual( + span.kind, + api.SpanKind.INTERNAL, + 'span has wrong kind' + ); + }); + + it('preflight request span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); + }); + + it('should NOT clear the resources', () => { + assert.ok( + clearResourceTimingsSpy.notCalled, + 'resources have been cleared' + ); + }); + describe('When making https requests', () => { + beforeEach(done => { + clearData(); + // this won't generate a preflight span + const propagateTraceHeaderCorsUrls = [secureUrl]; + prepareData(done, secureUrl, { + propagateTraceHeaderCorsUrls, + }); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const events = span.events; + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + EventNames.EVENT_LOAD, + ]); + assert.strictEqual(events.length, 12, 'number of events is wrong'); + }); + + it('preflight request span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + assert.strictEqual(events.length, 9, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); + }); + }); + + describe('AND origin match with window.location', () => { + beforeEach(done => { + clearData(); + // this won't generate a preflight span + const propagateTraceHeaderCorsUrls = [url]; + prepareData(done, window.location.origin + '/xml-http-request.js', { + propagateTraceHeaderCorsUrls, + }); + }); + + it('should set trace headers', () => { + const span: api.Span = exportSpy.args[0][0][0]; + assert.strictEqual( + requests[0].requestHeaders[X_B3_TRACE_ID], + span.spanContext().traceId, + `trace header '${X_B3_TRACE_ID}' not set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SPAN_ID], + span.spanContext().spanId, + `trace header '${X_B3_SPAN_ID}' not set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SAMPLED], + String(span.spanContext().traceFlags), + `trace header '${X_B3_SAMPLED}' not set` + ); + }); + }); + + describe( + 'AND origin does NOT match window.location but match with' + + ' propagateTraceHeaderCorsUrls', + () => { + beforeEach(done => { + clearData(); + prepareData( + done, + 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/package.json', + { propagateTraceHeaderCorsUrls: /raw\.githubusercontent\.com/ } + ); + }); + it('should set trace headers', () => { + // span at exportSpy.args[0][0][0] is the preflight span + const span: api.Span = exportSpy.args[1][0][0]; + assert.strictEqual( + requests[0].requestHeaders[X_B3_TRACE_ID], + span.spanContext().traceId, + `trace header '${X_B3_TRACE_ID}' not set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SPAN_ID], + span.spanContext().spanId, + `trace header '${X_B3_SPAN_ID}' not set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SAMPLED], + String(span.spanContext().traceFlags), + `trace header '${X_B3_SAMPLED}' not set` + ); + }); + } + ); + describe( + 'AND origin does NOT match window.location And does NOT match' + + ' with propagateTraceHeaderCorsUrls', + () => { + let spyDebug: sinon.SinonSpy; + beforeEach(done => { + const diagLogger = new api.DiagConsoleLogger(); + spyDebug = sinon.spy(); + diagLogger.debug = spyDebug; + api.diag.setLogger(diagLogger, api.DiagLogLevel.ALL); + clearData(); + prepareData( + done, + 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/package.json' + ); + }); + it('should NOT set trace headers', () => { + assert.strictEqual( + requests[0].requestHeaders[X_B3_TRACE_ID], + undefined, + `trace header '${X_B3_TRACE_ID}' should not be set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SPAN_ID], + undefined, + `trace header '${X_B3_SPAN_ID}' should not be set` + ); + assert.strictEqual( + requests[0].requestHeaders[X_B3_SAMPLED], + undefined, + `trace header '${X_B3_SAMPLED}' should not be set` + ); + }); + + it('should debug info that injecting headers was skipped', () => { + assert.strictEqual( + spyDebug.lastCall.args[1], + 'headers inject skipped due to CORS policy' + ); + }); + } + ); + + describe('when url is ignored', () => { + beforeEach(done => { + clearData(); + const propagateTraceHeaderCorsUrls = url; + prepareData(done, url, { + propagateTraceHeaderCorsUrls, + ignoreUrls: [propagateTraceHeaderCorsUrls], + }); + }); + + it('should NOT create any span', () => { + assert.ok(exportSpy.notCalled, "span shouldn't be exported"); + }); + }); + + describe('when clearTimingResources is set', () => { + beforeEach(done => { + clearData(); + const propagateTraceHeaderCorsUrls = url; + prepareData(done, url, { + propagateTraceHeaderCorsUrls, + clearTimingResources: true, + }); + }); + + it('should clear the resources', () => { + assert.ok( + clearResourceTimingsSpy.calledOnce, + "resources haven't been cleared" + ); + }); + }); + + describe('when reusing the same XML Http request', () => { + const firstUrl = 'http://localhost:8090/get'; + const secondUrl = 'http://localhost:8099/get'; + + beforeEach(done => { + requests = []; + const reusableReq = new XMLHttpRequest(); + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + reusableReq, + firstUrl, + '{"embedded":"data"}', + () => { + fakeNow = 100; + }, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + }); + } + ); + + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + reusableReq, + secondUrl, + '{"embedded":"data"}', + () => { + fakeNow = 100; + }, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + + assert.strictEqual( + requests.length, + 1, + 'first request not called' + ); + + requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + '{"foo":"bar"}' + ); + } + ); + }); + + it('should clear previous span information', () => { + const span: tracing.ReadableSpan = exportSpy.args[2][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[keys[1]], + secondUrl, + `attribute ${SEMATTRS_HTTP_URL} is wrong` + ); + }); + }); + + describe('and applyCustomAttributesOnSpan hook is configured', () => { + beforeEach(done => { + clearData(); + const propagateTraceHeaderCorsUrls = [url]; + prepareData(done, url, { + propagateTraceHeaderCorsUrls, + applyCustomAttributesOnSpan: function ( + span: api.Span, + xhr: XMLHttpRequest + ) { + const res = JSON.parse(xhr.response); + span.setAttribute('xhr-custom-attribute', res.foo); + }, + }); + }); + + it('span should have custom attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const attributes = span.attributes; + assert.ok(attributes['xhr-custom-attribute'] === 'bar'); + }); + }); + + describe('when using relative url', () => { + beforeEach(done => { + clearData(); + const propagateTraceHeaderCorsUrls = [window.location.origin]; + prepareData(done, '/get', { propagateTraceHeaderCorsUrls }); + }); + + it('should create correct span with events', () => { + // no prefetch span because mock observer uses location.origin as url when relative + // and prefetch span finding compares url origins + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + + assert.strictEqual( + exportSpy.args.length, + 1, + `Wrong number of spans: ${exportSpy.args.length}` + ); + + assert.strictEqual( + events.length, + 11, + `number of events is wrong: ${events.length}` + ); + assert.strictEqual( + events[7].name, + PTN.REQUEST_START, + `event ${PTN.REQUEST_START} is not defined` + ); + }); + + it('should have an absolute http.url attribute', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + location.origin + '/get', + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + }); + }); + }); + + describe('when POST request is NOT successful', () => { + let webTracerWithZoneProvider: WebTracerProvider; + let webTracerWithZone: api.Tracer; + let dummySpanExporter: DummySpanExporter; + let exportSpy: any; + let rootSpan: api.Span; + let spyEntries: any; + const url = + 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/package.json'; + let fakeNow = 0; + + const prepareData = function ( + config: XMLHttpRequestInstrumentationConfig = {} + ) { + const fakeXhr = sinon.useFakeXMLHttpRequest(); + fakeXhr.onCreate = function (xhr: any) { + requests.push(xhr); + }; + + sinon.useFakeTimers(); + + sinon.stub(performance, 'timeOrigin').value(0); + sinon.stub(performance, 'now').callsFake(() => fakeNow); + + const resources: PerformanceResourceTiming[] = []; + resources.push( + createResource({ + name: url, + }) + ); + + spyEntries = sinon.stub( + performance as unknown as Performance, + 'getEntriesByType' + ); + spyEntries.withArgs('resource').returns(resources); + + webTracerWithZoneProvider = new WebTracerProvider(); + + registerInstrumentations({ + instrumentations: [new XMLHttpRequestInstrumentation(config)], + tracerProvider: webTracerWithZoneProvider, + }); + + dummySpanExporter = new DummySpanExporter(); + exportSpy = sinon.stub(dummySpanExporter, 'export'); + webTracerWithZoneProvider.addSpanProcessor( + new tracing.SimpleSpanProcessor(dummySpanExporter) + ); + webTracerWithZone = webTracerWithZoneProvider.getTracer('xhr-test'); + + rootSpan = webTracerWithZone.startSpan('root'); + }; + + beforeEach(() => { + prepareData(); + }); + + afterEach(() => { + clearData(); + }); + + function timedOutRequest(done: any) { + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + new XMLHttpRequest(), + url, + '{"embedded":"data"}', + () => { + sinon.clock.tick(XHR_TIMEOUT); + }, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + } + ); + } + + function abortedRequest(done: any) { + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + new XMLHttpRequest(), + url, + '{"embedded":"data"}', + () => {}, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + + assert.strictEqual(requests.length, 1, 'request not called'); + requests[0].abort(); + } + ); + } + + function erroredRequest(done: any) { + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + new XMLHttpRequest(), + url, + '{"embedded":"data"}', + () => { + fakeNow = 100; + }, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + assert.strictEqual(requests.length, 1, 'request not called'); + requests[0].respond( + 400, + { 'Content-Type': 'text/plain' }, + 'Bad Request' + ); + } + ); + } + + function networkErrorRequest(done: any) { + api.context.with( + api.trace.setSpan(api.context.active(), rootSpan), + () => { + void postData( + new XMLHttpRequest(), + url, + '{"embedded":"data"}', + () => {}, + testAsync + ).then(() => { + fakeNow = 0; + sinon.clock.tick(1000); + done(); + }); + + assert.strictEqual(requests.length, 1, 'request not called'); + requests[0].error(); + } + ); + } + + describe('when request loads and receives an error code', () => { + beforeEach(done => { + erroredRequest(done); + }); + it('span should have correct attributes', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[SEMATTRS_HTTP_METHOD], + 'POST', + `attributes ${SEMATTRS_HTTP_METHOD} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + url, + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + 0, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} <= 0` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_STATUS_CODE], + 400, + `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` + ); + assert.strictEqual( + attributes[AttributeNames.HTTP_STATUS_TEXT], + 'Bad Request', + `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_HOST], + 'raw.githubusercontent.com', + `attributes ${SEMATTRS_HTTP_HOST} is wrong` + ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; + assert.ok( + httpScheme === 'http' || httpScheme === 'https', + `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` + ); + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', + `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` + ); + + assert.strictEqual(keys.length, 8, 'number of attributes is wrong'); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + EventNames.EVENT_ERROR, + ]); + assert.strictEqual(events.length, 12, 'number of events is wrong'); + }); + }); + + describe('when request encounters a network error', () => { + beforeEach(done => { + networkErrorRequest(done); + }); + + it('span should have correct attributes', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[SEMATTRS_HTTP_METHOD], + 'POST', + `attributes ${SEMATTRS_HTTP_METHOD} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + url, + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_STATUS_CODE], + 0, + `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` + ); + assert.strictEqual( + attributes[AttributeNames.HTTP_STATUS_TEXT], + '', + `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_HOST], + 'raw.githubusercontent.com', + `attributes ${SEMATTRS_HTTP_HOST} is wrong` + ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; + assert.ok( + httpScheme === 'http' || httpScheme === 'https', + `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` + ); + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', + `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` + ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); + + assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + EventNames.EVENT_ERROR, + ]); + assert.strictEqual(events.length, 3, 'number of events is wrong'); + }); + }); + + describe('when request is aborted', () => { + before(function () { + // Can only abort Async requests + if (!testAsync) { + this.skip(); + } + }); + + beforeEach(done => { + abortedRequest(done); + }); + + it('span should have correct attributes', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[SEMATTRS_HTTP_METHOD], + 'POST', + `attributes ${SEMATTRS_HTTP_METHOD} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + url, + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_STATUS_CODE], + 0, + `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` + ); + assert.strictEqual( + attributes[AttributeNames.HTTP_STATUS_TEXT], + '', + `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_HOST], + 'raw.githubusercontent.com', + `attributes ${SEMATTRS_HTTP_HOST} is wrong` + ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; + assert.ok( + httpScheme === 'http' || httpScheme === 'https', + `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` + ); + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', + `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` + ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); + + assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + EventNames.EVENT_ABORT, + ]); + assert.strictEqual(events.length, 3, 'number of events is wrong'); + }); + }); + + describe('when request times out', () => { + before(function () { + // Can only set timeout for Async requests + if (!testAsync) { + this.skip(); + } + }); + + beforeEach(done => { + timedOutRequest(done); + }); + + it('span should have correct attributes', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const attributes = span.attributes; + const keys = Object.keys(attributes); + + assert.strictEqual( + attributes[SEMATTRS_HTTP_METHOD], + 'POST', + `attributes ${SEMATTRS_HTTP_METHOD} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_URL], + url, + `attributes ${SEMATTRS_HTTP_URL} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_STATUS_CODE], + 0, + `attributes ${SEMATTRS_HTTP_STATUS_CODE} is wrong` + ); + assert.strictEqual( + attributes[AttributeNames.HTTP_STATUS_TEXT], + '', + `attributes ${AttributeNames.HTTP_STATUS_TEXT} is wrong` + ); + assert.strictEqual( + attributes[SEMATTRS_HTTP_HOST], + 'raw.githubusercontent.com', + `attributes ${SEMATTRS_HTTP_HOST} is wrong` + ); + + const httpScheme = attributes[SEMATTRS_HTTP_SCHEME]; + assert.ok( + httpScheme === 'http' || httpScheme === 'https', + `attributes ${SEMATTRS_HTTP_SCHEME} is wrong` + ); + assert.notStrictEqual( + attributes[SEMATTRS_HTTP_USER_AGENT], + '', + `attributes ${SEMATTRS_HTTP_USER_AGENT} is not defined` + ); + const requestContentLength = attributes[ + SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + ] as number; + assert.strictEqual( + requestContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED} is defined` + ); + const responseContentLength = attributes[ + SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH + ] as number; + assert.strictEqual( + responseContentLength, + undefined, + `attributes ${SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH} is defined` + ); assert.strictEqual(keys.length, 7, 'number of attributes is wrong'); }); diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 64dfb4a58bd..fca79dc4d40 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.53.0", + "version": "0.55.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -70,7 +70,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", + "@opentelemetry/api-logs": "0.55.0", "@types/shimmer": "^1.2.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", @@ -81,11 +81,11 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", @@ -93,7 +93,6 @@ "babel-loader": "8.4.1", "babel-plugin-istanbul": "7.0.0", "codecov": "3.8.3", - "cpx2": "2.0.0", "cross-var": "1.1.0", "karma": "6.4.4", "karma-chrome-launcher": "3.1.0", @@ -102,12 +101,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts index b69e91dfebf..c99d52ea2c7 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts @@ -287,6 +287,11 @@ export abstract class InstrumentationBase< this._warnOnPreloadedModules(); for (const module of this._modules) { const hookFn: HookFn = (exports, name, baseDir) => { + if (!baseDir && path.isAbsolute(name)) { + const parsedPath = path.parse(name); + name = parsedPath.name; + baseDir = parsedPath.dir; + } return this._onRequire(module, exports, name, baseDir); }; const onRequire: OnRequireFn = (exports, name, baseDir) => { diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs b/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs index a46fdc0fd3e..0a1970668fa 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs +++ b/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs @@ -18,8 +18,15 @@ import * as assert from 'assert'; import { InstrumentationBase, InstrumentationNodeModuleDefinition, + InstrumentationNodeModuleFile, } from '../../build/src/index.js'; import * as exported from 'test-esm-module'; +import * as exportedAbsolute from './esm/test.mjs'; + +import path from 'path'; +import url from 'url'; + +const TEST_DIR_NAME = path.dirname(url.fileURLToPath(import.meta.url)); class TestInstrumentationWrapFn extends InstrumentationBase { constructor(config) { @@ -95,12 +102,51 @@ class TestInstrumentationSimple extends InstrumentationBase { ); } } -describe('when loading esm module', () => { + +class TestAbsoluteFileInstrumentationPatchFn extends InstrumentationBase { + constructor(config) { + super('test-esm-instrumentation', '0.0.1', config); + } + init() { + return new InstrumentationNodeModuleDefinition( + path.join(TEST_DIR_NAME, '/esm/test.mjs'), + ['*'], + undefined, + undefined, + [ + new InstrumentationNodeModuleFile( + 'test', + ['*'], + moduleExports => { + const wrapRetval = this._wrap(moduleExports, 'testFunction', () => { + return function wrappedTestFunction() { + return 'patched'; + }; + }); + assert.strictEqual(typeof wrapRetval, 'function'); + assert.strictEqual( + wrapRetval.name, + 'wrappedTestFunction', + '_wrap(..., "testFunction", ...) return value is the wrapped function' + ); + return moduleExports; + }, + moduleExports => { + this._unwrap(moduleExports, 'testFunction'); + return moduleExports; + } + ), + ] + ); + } +} + +describe('when loading esm module', function () { const instrumentationWrap = new TestInstrumentationWrapFn({ enabled: false, }); - it('should patch module file directly', async () => { + it('should patch module file directly', async function () { const instrumentation = new TestInstrumentationSimple({ enabled: false, }); @@ -108,19 +154,21 @@ describe('when loading esm module', () => { assert.deepEqual(exported.testConstant, 43); }); - it('should patch a module with the wrap function', async () => { + it('should patch a module with the wrap function', async function () { instrumentationWrap.enable(); assert.deepEqual(exported.testFunction(), 'patched'); }); - it('should unwrap a patched function', async () => { + it('should unwrap a patched function', async function () { + // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality + this.skip(); instrumentationWrap.enable(); // disable to trigger unwrap instrumentationWrap.disable(); assert.deepEqual(exported.testFunction(), 'original'); }); - it('should wrap multiple functions with masswrap', () => { + it('should wrap multiple functions with masswrap', function () { const instrumentation = new TestInstrumentationMasswrapFn({ enabled: false, }); @@ -130,7 +178,9 @@ describe('when loading esm module', () => { assert.deepEqual(exported.secondTestFunction(), 'patched'); }); - it('should unwrap multiple functions with massunwrap', () => { + it('should unwrap multiple functions with massunwrap', async function () { + // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality + this.skip(); const instrumentation = new TestInstrumentationMasswrapFn({ enabled: false, }); @@ -140,4 +190,25 @@ describe('when loading esm module', () => { assert.deepEqual(exported.testFunction(), 'original'); assert.deepEqual(exported.secondTestFunction(), 'original'); }); + + it('should patch function from a file with absolute path', async function () { + const instrumentation = new TestAbsoluteFileInstrumentationPatchFn({ + enabled: false, + }); + instrumentation.enable(); + assert.deepEqual(exportedAbsolute.testFunction(), 'patched'); + }); + + it('should unwrap a patched function from a file with absolute path', async function () { + // Test skipped due to https://github.com/nodejs/import-in-the-middle/pull/153 breaking unwrap functionality + this.skip(); + const instrumentation = new TestAbsoluteFileInstrumentationPatchFn({ + enabled: false, + }); + + instrumentation.enable(); + // disable to trigger unwrap + instrumentation.disable(); + assert.deepEqual(exported.testFunction(), 'original'); + }); }); diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts index 75cd0ad6282..8c1be214460 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts +++ b/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts @@ -39,8 +39,8 @@ describe('RequireInTheMiddleSingleton', () => { const onRequireFsPromisesStub = makeOnRequiresStub('fs-promises'); const onRequireCodecovStub = makeOnRequiresStub('codecov'); const onRequireCodecovLibStub = makeOnRequiresStub('codecov-lib'); - const onRequireCpxStub = makeOnRequiresStub('cpx2'); - const onRequireCpxLibStub = makeOnRequiresStub('cpx2-lib'); + const onRequireCpxStub = makeOnRequiresStub('test-non-core-module'); + const onRequireCpxLibStub = makeOnRequiresStub('test-non-core-module-lib'); before(() => { requireInTheMiddleSingleton.register('fs', onRequireFsStub); @@ -53,9 +53,12 @@ describe('RequireInTheMiddleSingleton', () => { 'codecov/lib/codecov.js', onRequireCodecovLibStub ); - requireInTheMiddleSingleton.register('cpx2', onRequireCpxStub); requireInTheMiddleSingleton.register( - 'cpx2/lib/copy-sync.js', + 'test-non-core-module', + onRequireCpxStub + ); + requireInTheMiddleSingleton.register( + 'test-non-core-module/lib/copy-sync.js', onRequireCpxLibStub ); }); @@ -120,8 +123,12 @@ describe('RequireInTheMiddleSingleton', () => { describe('non-core module', () => { describe('AND module name matches', () => { - const baseDir = path.dirname(require.resolve('codecov')); - const modulePath = path.join('codecov', 'lib', 'codecov.js'); + const baseDir = path.normalize( + path.dirname(require.resolve('codecov')) + ); + const modulePath = path.normalize( + path.join('codecov', 'lib', 'codecov.js') + ); it('should call `onRequire`', () => { const exports = require('codecov'); assert.deepStrictEqual(exports.__ritmOnRequires, ['codecov']); @@ -149,20 +156,29 @@ describe('RequireInTheMiddleSingleton', () => { describe('non-core module with sub-path', () => { describe('AND module name matches', () => { - const baseDir = path.resolve( - path.dirname(require.resolve('cpx2')), - '..' + const baseDir = path.normalize( + path.resolve( + path.dirname(require.resolve('test-non-core-module')), + '..' + ) + ); + const modulePath = path.normalize( + path.join('test-non-core-module', 'lib', 'copy-sync.js') ); - const modulePath = path.join('cpx2', 'lib', 'copy-sync.js'); it('should call `onRequire`', () => { - const exports = require('cpx2/lib/copy-sync'); + const exports = require('test-non-core-module/lib/copy-sync'); assert.deepStrictEqual(exports.__ritmOnRequires, [ - 'cpx2', - 'cpx2-lib', + 'test-non-core-module', + 'test-non-core-module-lib', ]); sinon.assert.calledWithMatch( onRequireCpxStub, - { __ritmOnRequires: ['cpx2', 'cpx2-lib'] }, + { + __ritmOnRequires: [ + 'test-non-core-module', + 'test-non-core-module-lib', + ], + }, modulePath, baseDir ); diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/esm/test.mjs b/experimental/packages/opentelemetry-instrumentation/test/node/esm/test.mjs new file mode 100644 index 00000000000..56e1af29552 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/test/node/esm/test.mjs @@ -0,0 +1,3 @@ +export const testFunction = () => { + return 'original'; +}; diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/copy-sync.js b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/copy-sync.js new file mode 100644 index 00000000000..97da7acc8cd --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/copy-sync.js @@ -0,0 +1,3 @@ +module.exports = function copySync() { + console.log('Mock copySync called'); +}; diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/index.js b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/index.js new file mode 100644 index 00000000000..55b19e028b2 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/index.js @@ -0,0 +1,4 @@ +module.exports = { + copy: require('./lib/copy-sync') // matches the original API + }; + \ No newline at end of file diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/package.json b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/package.json new file mode 100644 index 00000000000..f09115be964 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/package.json @@ -0,0 +1,6 @@ +{ + "name": "test-non-core-module", + "version": "0.0.1", + "description": "Local test module for require-in-the-middle singleton", + "main": "lib/index.js" + } \ No newline at end of file diff --git a/experimental/packages/opentelemetry-sdk-node/README.md b/experimental/packages/opentelemetry-sdk-node/README.md index 4d0ffd0b508..bbb5002e9a2 100644 --- a/experimental/packages/opentelemetry-sdk-node/README.md +++ b/experimental/packages/opentelemetry-sdk-node/README.md @@ -102,6 +102,11 @@ Deprecated, please use [logRecordProcessors](#logrecordprocessors) instead. An array of log record processors to register to the logger provider. +### mergeResourceWithDefaults + +Merge user-provided resources with the default resource. Default `true`. +The default will change to `false` in a future iteration of this package. + ### metricReader Add a [MetricReader](../opentelemetry-sdk-metrics/src/export/MetricReader.ts) diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index b8d33a82fab..f48fc7987df 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,37 +44,37 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-logs-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/exporter-logs-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-logs-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/exporter-logs-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/exporter-jaeger": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-sdk-node/src/TracerProviderWithEnvExporter.ts b/experimental/packages/opentelemetry-sdk-node/src/TracerProviderWithEnvExporter.ts deleted file mode 100644 index 4db49699391..00000000000 --- a/experimental/packages/opentelemetry-sdk-node/src/TracerProviderWithEnvExporter.ts +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { diag } from '@opentelemetry/api'; -import { getEnv, getEnvWithoutDefaults } from '@opentelemetry/core'; -import { - ConsoleSpanExporter, - SpanExporter, - BatchSpanProcessor, - SimpleSpanProcessor, - SDKRegistrationConfig, - SpanProcessor, -} from '@opentelemetry/sdk-trace-base'; -import { - NodeTracerConfig, - NodeTracerProvider, -} from '@opentelemetry/sdk-trace-node'; -import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto'; -import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; -import { OTLPTraceExporter as OTLPGrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; -import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; -import { filterBlanksAndNulls } from './utils'; - -export class TracerProviderWithEnvExporters extends NodeTracerProvider { - private _configuredExporters: SpanExporter[] = []; - private _spanProcessors: SpanProcessor[] | undefined; - private _hasSpanProcessors: boolean = false; - - static configureOtlp(): SpanExporter { - const protocol = this.getOtlpProtocol(); - - switch (protocol) { - case 'grpc': - return new OTLPGrpcTraceExporter(); - case 'http/json': - return new OTLPHttpTraceExporter(); - case 'http/protobuf': - return new OTLPProtoTraceExporter(); - default: - diag.warn( - `Unsupported OTLP traces protocol: ${protocol}. Using http/protobuf.` - ); - return new OTLPProtoTraceExporter(); - } - } - - static getOtlpProtocol(): string { - const parsedEnvValues = getEnvWithoutDefaults(); - - return ( - parsedEnvValues.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL ?? - parsedEnvValues.OTEL_EXPORTER_OTLP_PROTOCOL ?? - getEnv().OTEL_EXPORTER_OTLP_TRACES_PROTOCOL ?? - getEnv().OTEL_EXPORTER_OTLP_PROTOCOL - ); - } - - private static configureJaeger() { - // The JaegerExporter does not support being required in bundled - // environments. By delaying the require statement to here, we only crash when - // the exporter is actually used in such an environment. - try { - // eslint-disable-next-line @typescript-eslint/no-var-requires - const { JaegerExporter } = require('@opentelemetry/exporter-jaeger'); - return new JaegerExporter(); - } catch (e) { - throw new Error( - `Could not instantiate JaegerExporter. This could be due to the JaegerExporter's lack of support for bundling. If possible, use @opentelemetry/exporter-trace-otlp-proto instead. Original Error: ${e}` - ); - } - } - - protected static override _registeredExporters = new Map< - string, - () => SpanExporter - >([ - ['otlp', () => this.configureOtlp()], - ['zipkin', () => new ZipkinExporter()], - ['jaeger', () => this.configureJaeger()], - ['console', () => new ConsoleSpanExporter()], - ]); - - public constructor(config: NodeTracerConfig = {}) { - super(config); - let traceExportersList = filterBlanksAndNulls( - Array.from(new Set(getEnv().OTEL_TRACES_EXPORTER.split(','))) - ); - - if (traceExportersList[0] === 'none') { - diag.warn( - 'OTEL_TRACES_EXPORTER contains "none". SDK will not be initialized.' - ); - } else if (traceExportersList.length === 0) { - diag.warn('OTEL_TRACES_EXPORTER is empty. Using default otlp exporter.'); - - traceExportersList = ['otlp']; - this.createExportersFromList(traceExportersList); - - this._spanProcessors = this.configureSpanProcessors( - this._configuredExporters - ); - this._spanProcessors.forEach(processor => { - this.addSpanProcessor(processor); - }); - } else { - if ( - traceExportersList.length > 1 && - traceExportersList.includes('none') - ) { - diag.warn( - 'OTEL_TRACES_EXPORTER contains "none" along with other exporters. Using default otlp exporter.' - ); - traceExportersList = ['otlp']; - } - - this.createExportersFromList(traceExportersList); - - if (this._configuredExporters.length > 0) { - this._spanProcessors = this.configureSpanProcessors( - this._configuredExporters - ); - this._spanProcessors.forEach(processor => { - this.addSpanProcessor(processor); - }); - } else { - diag.warn( - 'Unable to set up trace exporter(s) due to invalid exporter and/or protocol values.' - ); - } - } - } - - override addSpanProcessor(spanProcessor: SpanProcessor) { - super.addSpanProcessor(spanProcessor); - this._hasSpanProcessors = true; - } - - override register(config?: SDKRegistrationConfig) { - if (this._hasSpanProcessors) { - super.register(config); - } - } - - private createExportersFromList(exporterList: string[]) { - exporterList.forEach(exporterName => { - const exporter = this._getSpanExporter(exporterName); - if (exporter) { - this._configuredExporters.push(exporter); - } else { - diag.warn(`Unrecognized OTEL_TRACES_EXPORTER value: ${exporterName}.`); - } - }); - } - - private configureSpanProcessors( - exporters: SpanExporter[] - ): (BatchSpanProcessor | SimpleSpanProcessor)[] { - return exporters.map(exporter => { - if (exporter instanceof ConsoleSpanExporter) { - return new SimpleSpanProcessor(exporter); - } else { - return new BatchSpanProcessor(exporter); - } - }); - } -} diff --git a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts index 727be5d70e9..bd604c760a1 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts @@ -59,9 +59,12 @@ import { } from '@opentelemetry/sdk-trace-node'; import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions'; import { NodeSDKConfiguration } from './types'; -import { TracerProviderWithEnvExporters } from './TracerProviderWithEnvExporter'; import { getEnv, getEnvWithoutDefaults } from '@opentelemetry/core'; -import { getResourceDetectorsFromEnv, filterBlanksAndNulls } from './utils'; +import { + getResourceDetectorsFromEnv, + getSpanProcessorsFromEnv, + filterBlanksAndNulls, +} from './utils'; /** This class represents everything needed to register a fully configured OpenTelemetry Node.js SDK */ @@ -96,10 +99,11 @@ export class NodeSDK { private _resource: IResource; private _resourceDetectors: Array; + private _mergeResourceWithDefaults: boolean; private _autoDetectResources: boolean; - private _tracerProvider?: NodeTracerProvider | TracerProviderWithEnvExporters; + private _tracerProvider?: NodeTracerProvider; private _loggerProvider?: LoggerProvider; private _meterProvider?: MeterProvider; private _serviceName?: string; @@ -131,6 +135,8 @@ export class NodeSDK { this._configuration = configuration; this._resource = configuration.resource ?? new Resource({}); + this._mergeResourceWithDefaults = + configuration.mergeResourceWithDefaults ?? true; this._autoDetectResources = configuration.autoDetectResources ?? true; if (!this._autoDetectResources) { this._resourceDetectors = []; @@ -245,36 +251,33 @@ export class NodeSDK { }) ); - // if there is a tracerProviderConfig (traceExporter/spanProcessor was set manually) or the traceExporter is set manually, use NodeTracerProvider - const Provider = this._tracerProviderConfig - ? NodeTracerProvider - : TracerProviderWithEnvExporters; + const spanProcessors = this._tracerProviderConfig + ? this._tracerProviderConfig.spanProcessors + : getSpanProcessorsFromEnv(); // If the Provider is configured with Env Exporters, we need to check if the SDK had any manual configurations and set them here - const tracerProvider = new Provider({ + this._tracerProvider = new NodeTracerProvider({ ...this._configuration, resource: this._resource, + mergeResourceWithDefaults: this._mergeResourceWithDefaults, + spanProcessors, }); - this._tracerProvider = tracerProvider; - - if (this._tracerProviderConfig) { - for (const spanProcessor of this._tracerProviderConfig.spanProcessors) { - tracerProvider.addSpanProcessor(spanProcessor); - } + // Only register if there is a span processor + if (spanProcessors.length > 0) { + this._tracerProvider.register({ + contextManager: + this._tracerProviderConfig?.contextManager ?? + // _tracerProviderConfig may be undefined if trace-specific settings are not provided - fall back to raw config + this._configuration?.contextManager, + propagator: this._tracerProviderConfig?.textMapPropagator, + }); } - tracerProvider.register({ - contextManager: - this._tracerProviderConfig?.contextManager ?? - // _tracerProviderConfig may be undefined if trace-specific settings are not provided - fall back to raw config - this._configuration?.contextManager, - propagator: this._tracerProviderConfig?.textMapPropagator, - }); - if (this._loggerProviderConfig) { const loggerProvider = new LoggerProvider({ resource: this._resource, + mergeResourceWithDefaults: this._mergeResourceWithDefaults, }); for (const logRecordProcessor of this._loggerProviderConfig @@ -296,6 +299,7 @@ export class NodeSDK { resource: this._resource, views: this._meterProviderConfig?.views ?? [], readers: readers, + mergeResourceWithDefaults: this._mergeResourceWithDefaults, }); this._meterProvider = meterProvider; diff --git a/experimental/packages/opentelemetry-sdk-node/src/types.ts b/experimental/packages/opentelemetry-sdk-node/src/types.ts index 91d2dc461cd..2c451b1295e 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/types.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/types.ts @@ -40,6 +40,7 @@ export interface NodeSDKConfiguration { instrumentations: (Instrumentation | Instrumentation[])[]; resource: IResource; resourceDetectors: Array; + mergeResourceWithDefaults?: boolean; sampler: Sampler; serviceName?: string; /** @deprecated use spanProcessors instead*/ diff --git a/experimental/packages/opentelemetry-sdk-node/src/utils.ts b/experimental/packages/opentelemetry-sdk-node/src/utils.ts index 293a3e34858..8b73744f489 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/utils.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/utils.ts @@ -15,6 +15,11 @@ */ import { diag } from '@opentelemetry/api'; +import { getEnv, getEnvWithoutDefaults } from '@opentelemetry/core'; +import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto'; +import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; +import { OTLPTraceExporter as OTLPGrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; +import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; import { DetectorSync, envDetectorSync, @@ -23,6 +28,13 @@ import { processDetectorSync, serviceInstanceIdDetectorSync, } from '@opentelemetry/resources'; +import { + BatchSpanProcessor, + ConsoleSpanExporter, + SimpleSpanProcessor, + SpanExporter, + SpanProcessor, +} from '@opentelemetry/sdk-trace-base'; const RESOURCE_DETECTOR_ENVIRONMENT = 'env'; const RESOURCE_DETECTOR_HOST = 'host'; @@ -65,3 +77,106 @@ export function getResourceDetectorsFromEnv(): Array { export function filterBlanksAndNulls(list: string[]): string[] { return list.map(item => item.trim()).filter(s => s !== 'null' && s !== ''); } + +export function getOtlpProtocolFromEnv(): string { + const parsedEnvValues = getEnvWithoutDefaults(); + + return ( + parsedEnvValues.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL ?? + parsedEnvValues.OTEL_EXPORTER_OTLP_PROTOCOL ?? + getEnv().OTEL_EXPORTER_OTLP_TRACES_PROTOCOL ?? + getEnv().OTEL_EXPORTER_OTLP_PROTOCOL + ); +} + +function getOtlpExporterFromEnv(): SpanExporter { + const protocol = getOtlpProtocolFromEnv(); + + switch (protocol) { + case 'grpc': + return new OTLPGrpcTraceExporter(); + case 'http/json': + return new OTLPHttpTraceExporter(); + case 'http/protobuf': + return new OTLPProtoTraceExporter(); + default: + diag.warn( + `Unsupported OTLP traces protocol: ${protocol}. Using http/protobuf.` + ); + return new OTLPProtoTraceExporter(); + } +} + +function getJaegerExporter() { + // The JaegerExporter does not support being required in bundled + // environments. By delaying the require statement to here, we only crash when + // the exporter is actually used in such an environment. + try { + // eslint-disable-next-line @typescript-eslint/no-var-requires + const { JaegerExporter } = require('@opentelemetry/exporter-jaeger'); + return new JaegerExporter(); + } catch (e) { + throw new Error( + `Could not instantiate JaegerExporter. This could be due to the JaegerExporter's lack of support for bundling. If possible, use @opentelemetry/exporter-trace-otlp-proto instead. Original Error: ${e}` + ); + } +} + +export function getSpanProcessorsFromEnv(): SpanProcessor[] { + const exportersMap = new Map SpanExporter>([ + ['otlp', () => getOtlpExporterFromEnv()], + ['zipkin', () => new ZipkinExporter()], + ['console', () => new ConsoleSpanExporter()], + ['jaeger', () => getJaegerExporter()], + ]); + const exporters: SpanExporter[] = []; + const processors: SpanProcessor[] = []; + let traceExportersList = filterBlanksAndNulls( + Array.from(new Set(getEnv().OTEL_TRACES_EXPORTER.split(','))) + ); + + if (traceExportersList[0] === 'none') { + diag.warn( + 'OTEL_TRACES_EXPORTER contains "none". SDK will not be initialized.' + ); + return []; + } + + if (traceExportersList.length === 0) { + diag.warn('OTEL_TRACES_EXPORTER is empty. Using default otlp exporter.'); + traceExportersList = ['otlp']; + } else if ( + traceExportersList.length > 1 && + traceExportersList.includes('none') + ) { + diag.warn( + 'OTEL_TRACES_EXPORTER contains "none" along with other exporters. Using default otlp exporter.' + ); + traceExportersList = ['otlp']; + } + + for (const name of traceExportersList) { + const exporter = exportersMap.get(name)?.(); + if (exporter) { + exporters.push(exporter); + } else { + diag.warn(`Unrecognized OTEL_TRACES_EXPORTER value: ${name}.`); + } + } + + for (const exp of exporters) { + if (exp instanceof ConsoleSpanExporter) { + processors.push(new SimpleSpanProcessor(exp)); + } else { + processors.push(new BatchSpanProcessor(exp)); + } + } + + if (exporters.length === 0) { + diag.warn( + 'Unable to set up trace exporter(s) due to invalid exporter and/or protocol values.' + ); + } + + return processors; +} diff --git a/experimental/packages/opentelemetry-sdk-node/test/TracerProviderWithEnvExporter.test.ts b/experimental/packages/opentelemetry-sdk-node/test/TracerProviderWithEnvExporter.test.ts deleted file mode 100644 index 21a1fa93d79..00000000000 --- a/experimental/packages/opentelemetry-sdk-node/test/TracerProviderWithEnvExporter.test.ts +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { diag } from '@opentelemetry/api'; -import { - ConsoleSpanExporter, - SimpleSpanProcessor, - BatchSpanProcessor, -} from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as Sinon from 'sinon'; -import { env } from 'process'; -import { - OTLPTraceExporter as OTLPProtoTraceExporter, - OTLPTraceExporter, -} from '@opentelemetry/exporter-trace-otlp-proto'; -import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; -import { OTLPTraceExporter as OTLPGrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; -import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; -import { JaegerExporter } from '@opentelemetry/exporter-jaeger'; -import { TracerProviderWithEnvExporters } from '../src/TracerProviderWithEnvExporter'; - -describe('set up trace exporter with env exporters', () => { - let spyGetOtlpProtocol: Sinon.SinonSpy; - let stubLoggerError: Sinon.SinonStub; - - beforeEach(() => { - spyGetOtlpProtocol = Sinon.spy( - TracerProviderWithEnvExporters, - 'getOtlpProtocol' - ); - stubLoggerError = Sinon.stub(diag, 'warn'); - }); - afterEach(() => { - spyGetOtlpProtocol.restore(); - stubLoggerError.restore(); - }); - describe('setup otlp exporter from env', () => { - it('set up default exporter when user does not define otel trace exporter', async () => { - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('http/protobuf')); - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof OTLPProtoTraceExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - }); - it('use otlp exporter and grpc exporter protocol env value', async () => { - env.OTEL_TRACES_EXPORTER = 'otlp'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; - - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('grpc')); - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof OTLPGrpcTraceExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - it('sdk will ignore protocol defined with no-signal env and use signal specific protocol instead', async () => { - env.OTEL_TRACES_EXPORTER = 'otlp'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'http/protobuf'; - env.OTEL_EXPORTER_OTLP_PROTOCOL = 'grpc'; - - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('http/protobuf')); - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof OTLPTraceExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_PROTOCOL; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - it('use default otlp exporter when user does not set exporter via env or config', async () => { - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters[0] instanceof OTLPProtoTraceExporter); - assert(listOfExporters.length === 1); - - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - }); - it('use default otlp exporter when empty value is provided for exporter via env', async () => { - env.OTEL_TRACES_EXPORTER = ''; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters[0] instanceof OTLPProtoTraceExporter); - assert(listOfExporters.length === 1); - - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - - env.OTEL_TRACES_EXPORTER = ''; - }); - it('do not use any exporters when none value is only provided', async () => { - env.OTEL_TRACES_EXPORTER = 'none'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.notCalled); - assert(listOfExporters.length === 0); - assert(listOfProcessors === undefined); - delete env.OTEL_TRACES_EXPORTER; - }); - it('log warning that sdk will not be initialized when exporter is set to none', async () => { - env.OTEL_TRACES_EXPORTER = 'none'; - new TracerProviderWithEnvExporters(); - - assert.strictEqual( - stubLoggerError.args[0][0], - 'OTEL_TRACES_EXPORTER contains "none". SDK will not be initialized.' - ); - delete env.OTEL_TRACES_EXPORTER; - }); - it('use default exporter when none value is provided with other exports', async () => { - env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters[0] instanceof OTLPProtoTraceExporter); - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof OTLPHttpTraceExporter === false); - assert(listOfExporters[0] instanceof ZipkinExporter === false); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - delete env.OTEL_TRACES_EXPORTER; - }); - it('log warning that default exporter will be used since exporter list contains none with other exports ', async () => { - env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none'; - new TracerProviderWithEnvExporters(); - - assert.strictEqual( - stubLoggerError.args[0][0], - 'OTEL_TRACES_EXPORTER contains "none" along with other exporters. Using default otlp exporter.' - ); - delete env.OTEL_TRACES_EXPORTER; - }); - it('should warn that exporter is unrecognized and not able to be set up', async () => { - env.OTEL_TRACES_EXPORTER = 'invalid'; - new TracerProviderWithEnvExporters(); - - assert.strictEqual( - stubLoggerError.args[0][0], - 'Unrecognized OTEL_TRACES_EXPORTER value: invalid.' - ); - - assert.strictEqual( - stubLoggerError.args[1][0], - 'Unable to set up trace exporter(s) due to invalid exporter and/or protocol values.' - ); - - delete env.OTEL_TRACES_EXPORTER; - }); - it('should log warning when provided protocol name is not valid', async () => { - env.OTEL_EXPORTER_OTLP_PROTOCOL = 'invalid'; - new TracerProviderWithEnvExporters(); - - assert.strictEqual( - stubLoggerError.args[0][0], - 'OTEL_TRACES_EXPORTER is empty. Using default otlp exporter.' - ); - - assert.strictEqual( - stubLoggerError.args[1][0], - 'Unsupported OTLP traces protocol: invalid. Using http/protobuf.' - ); - delete env.OTEL_EXPORTER_OTLP_PROTOCOL; - }); - }); - describe('setup zipkin exporter from env', () => { - it('use the zipkin exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'zipkin'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof ZipkinExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - delete env.OTEL_TRACES_EXPORTER; - }); - it('setup zipkin exporter and otlp exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'zipkin, otlp'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; - - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('grpc')); - assert(listOfExporters.length === 2); - assert(listOfExporters[0] instanceof ZipkinExporter); - assert(listOfExporters[1] instanceof OTLPGrpcTraceExporter); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - assert(listOfProcessors[1] instanceof BatchSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - }); - describe('setup jaeger exporter from env', () => { - it('use the jaeger exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'jaeger'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof JaegerExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - delete env.OTEL_TRACES_EXPORTER; - }); - it('setup jaeger exporter and otlp exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'jaeger, otlp'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'http/json'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('http/json')); - assert(listOfExporters.length === 2); - assert(listOfExporters[0] instanceof JaegerExporter); - assert(listOfExporters[1] instanceof OTLPHttpTraceExporter); - assert(listOfProcessors.length === 2); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); - assert(listOfProcessors[1] instanceof BatchSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - }); - describe('setup console exporter from env', () => { - it('use the console exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'console'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof ConsoleSpanExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof SimpleSpanProcessor); - delete env.OTEL_TRACES_EXPORTER; - }); - it('ignores the protocol', async () => { - env.OTEL_TRACES_EXPORTER = 'console'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.notCalled); - assert(listOfExporters.length === 1); - assert(listOfExporters[0] instanceof ConsoleSpanExporter); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof SimpleSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - it('setup console exporter and otlp exporter', async () => { - env.OTEL_TRACES_EXPORTER = 'console, otlp'; - env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; - const sdk = new TracerProviderWithEnvExporters(); - const listOfProcessors = sdk['_spanProcessors']!; - const listOfExporters = sdk['_configuredExporters']; - - assert(spyGetOtlpProtocol.returned('grpc')); - assert(listOfExporters.length === 2); - assert(listOfExporters[0] instanceof ConsoleSpanExporter); - assert(listOfExporters[1] instanceof OTLPGrpcTraceExporter); - assert(listOfProcessors.length === 2); - assert(listOfProcessors[0] instanceof SimpleSpanProcessor); - assert(listOfProcessors[1] instanceof BatchSpanProcessor); - - delete env.OTEL_TRACES_EXPORTER; - delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; - }); - }); -}); diff --git a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts index d24fe66b0b0..e5d248889a2 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts @@ -29,6 +29,7 @@ import { AsyncLocalStorageContextManager, } from '@opentelemetry/context-async-hooks'; import { CompositePropagator } from '@opentelemetry/core'; +import { JaegerExporter } from '@opentelemetry/exporter-jaeger'; import { AggregationTemporality, ConsoleMetricExporter, @@ -56,7 +57,6 @@ import * as semver from 'semver'; import * as Sinon from 'sinon'; import { NodeSDK } from '../src'; import { env } from 'process'; -import { TracerProviderWithEnvExporters } from '../src/TracerProviderWithEnvExporter'; import { envDetector, envDetectorSync, @@ -77,10 +77,13 @@ import { import { OTLPLogExporter as OTLPProtoLogExporter } from '@opentelemetry/exporter-logs-otlp-proto'; import { OTLPLogExporter as OTLPHttpLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; import { OTLPLogExporter as OTLPGrpcLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc'; +import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto'; +import { OTLPTraceExporter as OTLPGrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; import { SEMRESATTRS_HOST_NAME, SEMRESATTRS_PROCESS_PID, } from '@opentelemetry/semantic-conventions'; +import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; const DefaultContextManager = semver.gte(process.version, '14.8.0') ? AsyncLocalStorageContextManager @@ -195,7 +198,7 @@ describe('Node SDK', () => { assert.ok( context['_getContextManager']().constructor.name === - DefaultContextManager.name + AsyncLocalStorageContextManager.name ); assert.ok( propagation['_getGlobalPropagator']() instanceof CompositePropagator @@ -218,7 +221,7 @@ describe('Node SDK', () => { assert.ok( context['_getContextManager']().constructor.name === - DefaultContextManager.name + AsyncLocalStorageContextManager.name ); assert.ok( propagation['_getGlobalPropagator']() instanceof CompositePropagator @@ -1095,32 +1098,28 @@ describe('Node SDK', () => { }); describe('setup exporter from env', () => { - let spyGetOtlpProtocol: Sinon.SinonSpy; let stubLoggerError: Sinon.SinonStub; beforeEach(() => { - spyGetOtlpProtocol = Sinon.spy( - TracerProviderWithEnvExporters, - 'getOtlpProtocol' - ); stubLoggerError = Sinon.stub(diag, 'warn'); }); afterEach(() => { - spyGetOtlpProtocol.restore(); stubLoggerError.restore(); }); - it('use default exporter TracerProviderWithEnvExporters when user does not provide span processor or trace exporter to sdk config', async () => { + + it('should use default exporter when nor env neither SDK config is given', async () => { const sdk = new NodeSDK(); sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); assert(listOfProcessors.length === 1); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPProtoTraceExporter); await sdk.shutdown(); }); - it('ignore env exporter when user provides exporter to sdk config', async () => { + + it('should ignore default env exporter when user provides exporter in sdk config', async () => { const traceExporter = new ConsoleSpanExporter(); const sdk = new NodeSDK({ traceExporter, @@ -1129,15 +1128,13 @@ describe('setup exporter from env', () => { const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert( - sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters === false - ); assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof SimpleSpanProcessor === false); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); await sdk.shutdown(); }); - it('ignores default env exporter when user provides span processor to sdk config', async () => { + + it('should ignore default env exporter when user provides span processor in sdk config', async () => { const traceExporter = new ConsoleSpanExporter(); const spanProcessor = new SimpleSpanProcessor(traceExporter); const sdk = new NodeSDK({ @@ -1147,15 +1144,13 @@ describe('setup exporter from env', () => { const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert( - sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters === false - ); assert(listOfProcessors.length === 1); assert(listOfProcessors[0] instanceof SimpleSpanProcessor); - assert(listOfProcessors[0] instanceof BatchSpanProcessor === false); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); await sdk.shutdown(); }); - it('ignores env exporter when user provides tracer exporter to sdk config and sets exporter via env', async () => { + + it('should ignore exporter form env if another is provided in sdk config', async () => { env.OTEL_TRACES_EXPORTER = 'console'; const traceExporter = new OTLPTraceExporter(); const sdk = new NodeSDK({ @@ -1165,15 +1160,13 @@ describe('setup exporter from env', () => { const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert( - sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters === false - ); assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof SimpleSpanProcessor === false); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPTraceExporter); delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); + it('should only create one span processor when configured using env vars and config', async () => { env.OTEL_TRACES_EXPORTER = 'console'; const sdk = new NodeSDK({ @@ -1182,15 +1175,18 @@ describe('setup exporter from env', () => { sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert.ok(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert.ok( sdk['_tracerProvider']!['_config']?.sampler instanceof AlwaysOffSampler ); assert.strictEqual(listOfProcessors.length, 1); + assert(listOfProcessors[0] instanceof SimpleSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); - it('use otlp exporter and defined exporter protocol env value', async () => { + + it('should use otlp exporter and defined exporter protocol env value', async () => { env.OTEL_TRACES_EXPORTER = 'otlp'; env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; const sdk = new NodeSDK(); @@ -1198,90 +1194,91 @@ describe('setup exporter from env', () => { const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert(listOfProcessors.length === 1); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPGrpcTraceExporter); delete env.OTEL_TRACES_EXPORTER; delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; await sdk.shutdown(); }); - it('use noop span processor when user sets env exporter to none', async () => { - env.OTEL_TRACES_EXPORTER = 'none'; + + it('sohuld use exporter and processor from env, signal specific env for protocol takes precedence', async () => { + env.OTEL_TRACES_EXPORTER = 'otlp'; + env.OTEL_EXPORTER_OTLP_PROTOCOL = 'http/protobuf'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; const sdk = new NodeSDK(); sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - const activeProcessor = sdk['_tracerProvider']?.getActiveSpanProcessor(); - assert(listOfProcessors.length === 0); - assert(activeProcessor instanceof NoopSpanProcessor); + assert(listOfProcessors.length === 1); + assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPGrpcTraceExporter); delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; await sdk.shutdown(); }); - it('log warning that sdk will not be initialized when exporter is set to none', async () => { + + it('should use noop span processor when user sets env exporter to none', async () => { env.OTEL_TRACES_EXPORTER = 'none'; const sdk = new NodeSDK(); sdk.start(); + // should warn assert.strictEqual( stubLoggerError.args[0][0], 'OTEL_TRACES_EXPORTER contains "none". SDK will not be initialized.' ); - delete env.OTEL_TRACES_EXPORTER; - await sdk.shutdown(); - }); - it('use default otlp exporter when user does not set exporter via env or config', async () => { - const sdk = new NodeSDK(); - sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); - assert(listOfProcessors.length === 1); - assert(listOfProcessors[0] instanceof BatchSpanProcessor); + const activeProcessor = sdk['_tracerProvider']?.getActiveSpanProcessor(); + + assert(listOfProcessors.length === 0); + assert(activeProcessor instanceof NoopSpanProcessor); + delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); - it('use default otlp exporter when empty value is provided for exporter via env', async () => { + + it('should use default otlp exporter when empty value is provided for exporter via env', async () => { env.OTEL_TRACES_EXPORTER = ''; const sdk = new NodeSDK(); sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert(listOfProcessors.length === 1); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPProtoTraceExporter); env.OTEL_TRACES_EXPORTER = ''; await sdk.shutdown(); }); - it('use only default exporter when none value is provided with other exporters', async () => { + it('should use only default exporter when none value is provided with other exporters', async () => { env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none'; const sdk = new NodeSDK(); sdk.start(); + // also it should warn + assert.strictEqual( + stubLoggerError.args[0][0], + 'OTEL_TRACES_EXPORTER contains "none" along with other exporters. Using default otlp exporter.' + ); + const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert(listOfProcessors.length === 1); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPProtoTraceExporter); delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); - it('log warning that only default exporter will be used since exporter list contains none with other exports ', async () => { - env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none'; - const sdk = new NodeSDK(); - sdk.start(); - assert.strictEqual( - stubLoggerError.args[0][0], - 'OTEL_TRACES_EXPORTER contains "none" along with other exporters. Using default otlp exporter.' - ); - delete env.OTEL_TRACES_EXPORTER; - await sdk.shutdown(); - }); it('should warn that provided exporter value is unrecognized and not able to be set up', async () => { env.OTEL_TRACES_EXPORTER = 'invalid'; const sdk = new NodeSDK(); @@ -1300,7 +1297,84 @@ describe('setup exporter from env', () => { delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); - it('setup zipkin, jaeger and otlp exporters', async () => { + + it('should be able to setup zipkin exporter', async () => { + env.OTEL_TRACES_EXPORTER = 'zipkin'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 1); + assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ZipkinExporter); + + delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; + await sdk.shutdown(); + }); + + it('should be able to setup zipkin and otlp exporters', async () => { + env.OTEL_TRACES_EXPORTER = 'zipkin, otlp'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 2); + assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ZipkinExporter); + assert(listOfProcessors[1] instanceof BatchSpanProcessor); + assert(listOfProcessors[1]['_exporter'] instanceof OTLPGrpcTraceExporter); + + delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; + await sdk.shutdown(); + }); + + it('should be able to setup jaeger exporter', async () => { + env.OTEL_TRACES_EXPORTER = 'jaeger'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 1); + assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof JaegerExporter); + + delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; + await sdk.shutdown(); + }); + + it('should be able to setup jaeger and otlp exporters', async () => { + env.OTEL_TRACES_EXPORTER = 'otlp, jaeger'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 2); + assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof OTLPGrpcTraceExporter); + assert(listOfProcessors[1] instanceof BatchSpanProcessor); + assert(listOfProcessors[1]['_exporter'] instanceof JaegerExporter); + + delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; + await sdk.shutdown(); + }); + + it('should be able to setup zipkin, jaeger and otlp exporters', async () => { env.OTEL_TRACES_EXPORTER = 'zipkin, otlp, jaeger'; env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; const sdk = new NodeSDK(); @@ -1308,27 +1382,66 @@ describe('setup exporter from env', () => { const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; - assert(sdk['_tracerProvider'] instanceof TracerProviderWithEnvExporters); + assert(listOfProcessors.length === 3); assert(listOfProcessors[0] instanceof BatchSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ZipkinExporter); assert(listOfProcessors[1] instanceof BatchSpanProcessor); + assert(listOfProcessors[1]['_exporter'] instanceof OTLPGrpcTraceExporter); assert(listOfProcessors[2] instanceof BatchSpanProcessor); + assert(listOfProcessors[2]['_exporter'] instanceof JaegerExporter); delete env.OTEL_TRACES_EXPORTER; delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; await sdk.shutdown(); }); - it('use the console exporter', async () => { + + it('should be able to use console and otlp exporters', async () => { env.OTEL_TRACES_EXPORTER = 'console, otlp'; const sdk = new NodeSDK(); sdk.start(); const listOfProcessors = sdk['_tracerProvider']!['_registeredSpanProcessors']!; + assert(listOfProcessors.length === 2); assert(listOfProcessors[0] instanceof SimpleSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); assert(listOfProcessors[1] instanceof BatchSpanProcessor); + assert(listOfProcessors[1]['_exporter'] instanceof OTLPProtoTraceExporter); delete env.OTEL_TRACES_EXPORTER; await sdk.shutdown(); }); + + it('should be able to use console exporter but not http/json exporter', async () => { + env.OTEL_TRACES_EXPORTER = 'console, http/json'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 1); + assert(listOfProcessors[0] instanceof SimpleSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); + delete env.OTEL_TRACES_EXPORTER; + await sdk.shutdown(); + }); + + it('should ignore the protocol from env when use the console exporter', async () => { + env.OTEL_TRACES_EXPORTER = 'console'; + env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc'; + const sdk = new NodeSDK(); + sdk.start(); + + const listOfProcessors = + sdk['_tracerProvider']!['_registeredSpanProcessors']!; + + assert(listOfProcessors.length === 1); + assert(listOfProcessors[0] instanceof SimpleSpanProcessor); + assert(listOfProcessors[0]['_exporter'] instanceof ConsoleSpanExporter); + delete env.OTEL_TRACES_EXPORTER; + delete env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL; + await sdk.shutdown(); + }); }); diff --git a/experimental/packages/otlp-exporter-base/README.md b/experimental/packages/otlp-exporter-base/README.md index 2ec8baf1e84..3bf1466fadb 100644 --- a/experimental/packages/otlp-exporter-base/README.md +++ b/experimental/packages/otlp-exporter-base/README.md @@ -7,7 +7,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides a base exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url]. +This module provides base components for OTLP Exporters, both Web and Node.js. ## Installation @@ -19,10 +19,6 @@ npm install --save @opentelemetry/otlp-exporter-base For GRPC please check [npm-url-grpc] -## PROTOBUF - -For PROTOBUF please check [npm-url-proto] - ## Useful links - For more information on OpenTelemetry, visit: @@ -38,6 +34,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat [npm-url]: https://www.npmjs.com/package/@opentelemetry/otlp-exporter-base [npm-url-grpc]: https://www.npmjs.com/package/@opentelemetry/otlp-grpc-exporter-base -[npm-url-proto]: https://www.npmjs.com/package/@opentelemetry/otlp-proto-exporter-base [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fotlp-exporter-base.svg -[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector diff --git a/experimental/packages/otlp-exporter-base/karma.conf.js b/experimental/packages/otlp-exporter-base/karma.conf.js index 4c60b54edba..50fac98bd80 100644 --- a/experimental/packages/otlp-exporter-base/karma.conf.js +++ b/experimental/packages/otlp-exporter-base/karma.conf.js @@ -1,11 +1,11 @@ -/*! +/* * Copyright The OpenTelemetry Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,10 +17,12 @@ const karmaWebpackConfig = require('../../../karma.webpack'); const karmaBaseConfig = require('../../../karma.base'); -module.exports = (config) => { - config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig, - files: ['test/browser/index-webpack.ts'], - preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } - })) +module.exports = config => { + config.set( + Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + files: ['test/browser/index-webpack.ts'], + preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] }, + }) + ); }; diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 9f1f1d0db7b..592d7edda82 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -1,18 +1,45 @@ { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + "exports": { + ".": { + "module": "./build/esm/index.js", + "esnext": "./build/esnext/index.js", + "types": "./build/src/index.d.ts", + "default": "./build/src/index.js" + }, + "./node-http": { + "module": "./build/esm/index-node-http.js", + "esnext": "./build/esnext/index-node-http.js", + "types": "./build/src/index-node-http.d.ts", + "default": "./build/src/index-node-http.js" + }, + "./browser-http": { + "module": "./build/esm/index-browser-http.js", + "esnext": "./build/esnext/index-browser-http.js", + "types": "./build/src/index-browser-http.d.ts", + "default": "./build/src/index-browser-http.js" + } + }, + "typesVersions": { + "*": { + "*": [ + "./build/src/index.d.ts" + ], + "node-http": [ + "./build/src/index-node-http.d.ts" + ], + "browser-http": [ + "./build/src/index-browser-http.d.ts" + ] + } }, + "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", @@ -60,14 +87,14 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-transformer": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-transformer": "0.55.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -79,12 +106,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, diff --git a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts index 986447add25..1459cdaba83 100644 --- a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts +++ b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts @@ -14,41 +14,11 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { - ExportResult, - ExportResultCode, - BindOnceFuture, -} from '@opentelemetry/core'; -import { - OTLPExporterError, - OTLPExporterConfigBase, - ExportServiceError, -} from './types'; +import { ExportResult } from '@opentelemetry/core'; +import { IOtlpExportDelegate } from './otlp-export-delegate'; -/** - * Collector Exporter abstract base class - */ -export abstract class OTLPExporterBase< - T extends OTLPExporterConfigBase, - ExportItem, -> { - protected _concurrencyLimit: number; - protected _sendingPromises: Promise[] = []; - protected _shutdownOnce: BindOnceFuture; - - /** - * @param config - */ - constructor(config: T = {} as T) { - this.shutdown = this.shutdown.bind(this); - this._shutdownOnce = new BindOnceFuture(this._shutdown, this); - - this._concurrencyLimit = - typeof config.concurrencyLimit === 'number' - ? config.concurrencyLimit - : 30; - } +export class OTLPExporterBase { + constructor(private _delegate: IOtlpExportDelegate) {} /** * Export items. @@ -56,74 +26,17 @@ export abstract class OTLPExporterBase< * @param resultCallback */ export( - items: ExportItem[], + items: Internal, resultCallback: (result: ExportResult) => void ): void { - if (this._shutdownOnce.isCalled) { - resultCallback({ - code: ExportResultCode.FAILED, - error: new Error('Exporter has been shutdown'), - }); - return; - } - - if (this._sendingPromises.length >= this._concurrencyLimit) { - resultCallback({ - code: ExportResultCode.FAILED, - error: new Error('Concurrent export limit reached'), - }); - return; - } - - this._export(items) - .then(() => { - resultCallback({ code: ExportResultCode.SUCCESS }); - }) - .catch((error: ExportServiceError) => { - resultCallback({ code: ExportResultCode.FAILED, error }); - }); + this._delegate.export(items, resultCallback); } - private _export(items: ExportItem[]): Promise { - return new Promise((resolve, reject) => { - try { - diag.debug('items to be sent', items); - this.send(items, resolve, reject); - } catch (e) { - reject(e); - } - }); - } - - /** - * Shutdown the exporter. - */ - shutdown(): Promise { - return this._shutdownOnce.call(); - } - - /** - * Exports any pending spans in the exporter - */ forceFlush(): Promise { - return Promise.all(this._sendingPromises).then(() => { - /** ignore resolved values */ - }); + return this._delegate.forceFlush(); } - /** - * Called by _shutdownOnce with BindOnceFuture - */ - private _shutdown(): Promise { - diag.debug('shutdown started'); - this.onShutdown(); - return this.forceFlush(); + shutdown(): Promise { + return this._delegate.shutdown(); } - - abstract onShutdown(): void; - abstract send( - items: ExportItem[], - onSuccess: () => void, - onError: (error: OTLPExporterError) => void - ): void; } diff --git a/experimental/packages/otlp-exporter-base/src/bounded-queue-export-promise-handler.ts b/experimental/packages/otlp-exporter-base/src/bounded-queue-export-promise-handler.ts new file mode 100644 index 00000000000..c930451c90a --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/bounded-queue-export-promise-handler.ts @@ -0,0 +1,64 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export interface IExportPromiseHandler { + pushPromise(promise: Promise): void; + hasReachedLimit(): boolean; + awaitAll(): Promise; +} + +class BoundedQueueExportPromiseHandler implements IExportPromiseHandler { + private readonly _concurrencyLimit: number; + private _sendingPromises: Promise[] = []; + + /** + * @param concurrencyLimit maximum promises allowed in a queue at the same time. + */ + constructor(concurrencyLimit: number) { + this._concurrencyLimit = concurrencyLimit; + } + + public pushPromise(promise: Promise): void { + if (this.hasReachedLimit()) { + throw new Error('Concurrency Limit reached'); + } + + this._sendingPromises.push(promise); + const popPromise = () => { + const index = this._sendingPromises.indexOf(promise); + this._sendingPromises.splice(index, 1); + }; + promise.then(popPromise, popPromise); + } + + public hasReachedLimit(): boolean { + return this._sendingPromises.length >= this._concurrencyLimit; + } + + public async awaitAll(): Promise { + await Promise.all(this._sendingPromises); + } +} + +/** + * Promise queue for keeping track of export promises. Finished promises will be auto-dequeued. + * Allows for awaiting all promises in the queue. + */ +export function createBoundedQueueExportPromiseHandler(options: { + concurrencyLimit: number; +}): IExportPromiseHandler { + return new BoundedQueueExportPromiseHandler(options.concurrencyLimit); +} diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts new file mode 100644 index 00000000000..3f72eda1605 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-browser-http-options.ts @@ -0,0 +1,46 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { + getHttpConfigurationDefaults, + mergeOtlpHttpConfigurationWithDefaults, + OtlpHttpConfiguration, +} from './otlp-http-configuration'; +import { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; +import { wrapStaticHeadersInFunction } from './shared-configuration'; + +/** + * @deprecated this will be removed in 2.0 + * + * @param config + * @param signalResourcePath + * @param requiredHeaders + */ +export function convertLegacyBrowserHttpOptions( + config: OTLPExporterNodeConfigBase, + signalResourcePath: string, + requiredHeaders: Record +): OtlpHttpConfiguration { + return mergeOtlpHttpConfigurationWithDefaults( + { + url: config.url, + timeoutMillis: config.timeoutMillis, + headers: wrapStaticHeadersInFunction(config.headers), + concurrencyLimit: config.concurrencyLimit, + }, + {}, // no fallback for browser case + getHttpConfigurationDefaults(requiredHeaders, signalResourcePath) + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts new file mode 100644 index 00000000000..d2657f5a12d --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/configuration/convert-legacy-node-http-options.ts @@ -0,0 +1,80 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { OTLPExporterNodeConfigBase } from './legacy-node-configuration'; +import { + getHttpConfigurationDefaults, + mergeOtlpHttpConfigurationWithDefaults, + OtlpHttpConfiguration, +} from './otlp-http-configuration'; +import { getHttpConfigurationFromEnvironment } from './otlp-http-env-configuration'; +import type * as http from 'http'; +import type * as https from 'https'; +import { diag } from '@opentelemetry/api'; +import { wrapStaticHeadersInFunction } from './shared-configuration'; + +function convertLegacyAgentOptions( + config: OTLPExporterNodeConfigBase +): http.AgentOptions | https.AgentOptions | undefined { + // populate keepAlive for use with new settings + if (config?.keepAlive != null) { + if (config.httpAgentOptions != null) { + if (config.httpAgentOptions.keepAlive == null) { + // specific setting is not set, populate with non-specific setting. + config.httpAgentOptions.keepAlive = config.keepAlive; + } + // do nothing, use specific setting otherwise + } else { + // populate specific option if AgentOptions does not exist. + config.httpAgentOptions = { + keepAlive: config.keepAlive, + }; + } + } + + return config.httpAgentOptions; +} + +/** + * @deprecated this will be removed in 2.0 + * @param config + * @param signalIdentifier + * @param signalResourcePath + * @param requiredHeaders + */ +export function convertLegacyHttpOptions( + config: OTLPExporterNodeConfigBase, + signalIdentifier: string, + signalResourcePath: string, + requiredHeaders: Record +): OtlpHttpConfiguration { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + if ((config as any).metadata) { + diag.warn('Metadata cannot be set when using http'); + } + + return mergeOtlpHttpConfigurationWithDefaults( + { + url: config.url, + headers: wrapStaticHeadersInFunction(config.headers), + concurrencyLimit: config.concurrencyLimit, + timeoutMillis: config.timeoutMillis, + compression: config.compression, + agentOptions: convertLegacyAgentOptions(config), + }, + getHttpConfigurationFromEnvironment(signalIdentifier, signalResourcePath), + getHttpConfigurationDefaults(requiredHeaders, signalResourcePath) + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts b/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts new file mode 100644 index 00000000000..923ed9919b8 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/configuration/create-legacy-browser-delegate.ts @@ -0,0 +1,51 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { + createOtlpSendBeaconExportDelegate, + createOtlpXhrExportDelegate, +} from '../otlp-browser-http-export-delegate'; +import { convertLegacyBrowserHttpOptions } from './convert-legacy-browser-http-options'; +import { IOtlpExportDelegate } from '../otlp-export-delegate'; +import { OTLPExporterConfigBase } from './legacy-base-configuration'; + +/** + * @deprecated + * @param config + * @param serializer + * @param signalResourcePath + * @param requiredHeaders + */ +export function createLegacyOtlpBrowserExportDelegate( + config: OTLPExporterConfigBase, + serializer: ISerializer, + signalResourcePath: string, + requiredHeaders: Record +): IOtlpExportDelegate { + const useXhr = !!config.headers || typeof navigator.sendBeacon !== 'function'; + + const options = convertLegacyBrowserHttpOptions( + config, + signalResourcePath, + requiredHeaders + ); + + if (useXhr) { + return createOtlpXhrExportDelegate(options, serializer); + } else { + return createOtlpSendBeaconExportDelegate(options, serializer); + } +} diff --git a/experimental/packages/otlp-exporter-base/src/platform/index.ts b/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts similarity index 70% rename from experimental/packages/otlp-exporter-base/src/platform/index.ts rename to experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts index 14deab55500..8a36b267ddf 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/index.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/legacy-base-configuration.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -export { - OTLPExporterNodeBase, - OTLPExporterNodeConfigBase, - CompressionAlgorithm, -} from './node'; -export { OTLPExporterBrowserBase } from './browser'; +export interface OTLPExporterConfigBase { + headers?: Record; + url?: string; + concurrencyLimit?: number; + /** Maximum time the OTLP exporter will wait for each batch export. + * The default value is 10000ms. */ + timeoutMillis?: number; +} diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/types.ts b/experimental/packages/otlp-exporter-base/src/configuration/legacy-node-configuration.ts similarity index 83% rename from experimental/packages/otlp-exporter-base/src/platform/node/types.ts rename to experimental/packages/otlp-exporter-base/src/configuration/legacy-node-configuration.ts index b1e355de2d3..63c5667cbf3 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/types.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/legacy-node-configuration.ts @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +// NOTE: do not change these imports to be actual imports, otherwise they WILL break `@opentelemetry/instrumentation-http` import type * as http from 'http'; import type * as https from 'https'; -import { OTLPExporterConfigBase } from '../../types'; +import { OTLPExporterConfigBase } from './legacy-base-configuration'; /** * Collector Exporter node base config diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts index a303bd5c737..7a1853cca9b 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-configuration.ts @@ -21,33 +21,40 @@ import { } from './shared-configuration'; import { validateAndNormalizeHeaders } from '../util'; +// NOTE: do not change these imports to be actual imports, otherwise they WILL break `@opentelemetry/instrumentation-http` +import type * as http from 'http'; +import type * as https from 'https'; + export interface OtlpHttpConfiguration extends OtlpSharedConfiguration { url: string; - headers: Record; + headers: () => Record; + agentOptions: http.AgentOptions | https.AgentOptions; } function mergeHeaders( - userProvidedHeaders: Record | undefined | null, - fallbackHeaders: Record | undefined | null, - defaultHeaders: Record -): Record { + userProvidedHeaders: (() => Record) | undefined | null, + fallbackHeaders: (() => Record) | undefined | null, + defaultHeaders: () => Record +): () => Record { const requiredHeaders = { - ...defaultHeaders, + ...defaultHeaders(), }; const headers = {}; - // add fallback ones first - if (fallbackHeaders != null) { - Object.assign(headers, fallbackHeaders); - } + return () => { + // add fallback ones first + if (fallbackHeaders != null) { + Object.assign(headers, fallbackHeaders()); + } - // override with user-provided ones - if (userProvidedHeaders != null) { - Object.assign(headers, userProvidedHeaders); - } + // override with user-provided ones + if (userProvidedHeaders != null) { + Object.assign(headers, userProvidedHeaders()); + } - // override required ones. - return Object.assign(headers, requiredHeaders); + // override required ones. + return Object.assign(headers, requiredHeaders); + }; } function validateUserProvidedUrl(url: string | undefined): string | undefined { @@ -89,6 +96,10 @@ export function mergeOtlpHttpConfigurationWithDefaults( validateUserProvidedUrl(userProvidedConfiguration.url) ?? fallbackConfiguration.url ?? defaultConfiguration.url, + agentOptions: + userProvidedConfiguration.agentOptions ?? + fallbackConfiguration.agentOptions ?? + defaultConfiguration.agentOptions, }; } @@ -98,7 +109,8 @@ export function getHttpConfigurationDefaults( ): OtlpHttpConfiguration { return { ...getSharedConfigurationDefaults(), - headers: requiredHeaders, + headers: () => requiredHeaders, url: 'http://localhost:4318/' + signalResourcePath, + agentOptions: { keepAlive: true }, }; } diff --git a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts index af15de4c85a..ba05242c9c1 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/otlp-http-env-configuration.ts @@ -17,8 +17,11 @@ import { baggageUtils } from '@opentelemetry/core'; import { diag } from '@opentelemetry/api'; import { getSharedConfigurationFromEnvironment } from './shared-env-configuration'; import { OtlpHttpConfiguration } from './otlp-http-configuration'; +import { wrapStaticHeadersInFunction } from './shared-configuration'; -function getHeadersFromEnv(signalIdentifier: string) { +function getStaticHeadersFromEnv( + signalIdentifier: string +): Record | undefined { const signalSpecificRawHeaders = process.env[`OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS`]?.trim(); const nonSignalSpecificRawHeaders = @@ -126,6 +129,8 @@ export function getHttpConfigurationFromEnvironment( url: getSpecificUrlFromEnv(signalIdentifier) ?? getNonSpecificUrlFromEnv(signalResourcePath), - headers: getHeadersFromEnv(signalIdentifier), + headers: wrapStaticHeadersInFunction( + getStaticHeadersFromEnv(signalIdentifier) + ), }; } diff --git a/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts b/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts index e69fe35beeb..d9d589e3699 100644 --- a/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts +++ b/experimental/packages/otlp-exporter-base/src/configuration/shared-configuration.ts @@ -41,6 +41,16 @@ export function validateTimeoutMillis(timeoutMillis: number) { ); } +export function wrapStaticHeadersInFunction( + headers: Record | undefined +): (() => Record) | undefined { + if (headers == null) { + return undefined; + } + + return () => headers; +} + /** * @param userProvidedConfiguration Configuration options provided by the user in code. * @param fallbackConfiguration Fallback to use when the {@link userProvidedConfiguration} does not specify an option. diff --git a/packages/propagator-aws-xray/src/index.ts b/experimental/packages/otlp-exporter-base/src/index-browser-http.ts similarity index 65% rename from packages/propagator-aws-xray/src/index.ts rename to experimental/packages/otlp-exporter-base/src/index-browser-http.ts index ff6d1ed17e4..bf10a2be976 100644 --- a/packages/propagator-aws-xray/src/index.ts +++ b/experimental/packages/otlp-exporter-base/src/index-browser-http.ts @@ -15,6 +15,9 @@ */ export { - AWSXRAY_TRACE_ID_HEADER, - AWSXRayPropagator, -} from './AWSXRayPropagator'; + createOtlpXhrExportDelegate, + createOtlpSendBeaconExportDelegate, +} from './otlp-browser-http-export-delegate'; + +export { convertLegacyBrowserHttpOptions } from './configuration/convert-legacy-browser-http-options'; +export { createLegacyOtlpBrowserExportDelegate } from './configuration/create-legacy-browser-delegate'; diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/index.ts b/experimental/packages/otlp-exporter-base/src/index-node-http.ts similarity index 69% rename from experimental/packages/otlp-exporter-base/src/platform/browser/index.ts rename to experimental/packages/otlp-exporter-base/src/index-node-http.ts index 6c0c4bd425d..29c9def42f0 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/browser/index.ts +++ b/experimental/packages/otlp-exporter-base/src/index-node-http.ts @@ -14,4 +14,6 @@ * limitations under the License. */ -export { OTLPExporterBrowserBase } from './OTLPExporterBrowserBase'; +export { createOtlpHttpExportDelegate } from './otlp-http-export-delegate'; +export { getSharedConfigurationFromEnvironment } from './configuration/shared-env-configuration'; +export { convertLegacyHttpOptions } from './configuration/convert-legacy-node-http-options'; diff --git a/experimental/packages/otlp-exporter-base/src/index.ts b/experimental/packages/otlp-exporter-base/src/index.ts index 5edc2d680af..2d1860d391c 100644 --- a/experimental/packages/otlp-exporter-base/src/index.ts +++ b/experimental/packages/otlp-exporter-base/src/index.ts @@ -14,17 +14,8 @@ * limitations under the License. */ -/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] -- - * TODO: Replace export * with named exports before next major version - */ -export * from './platform'; export { OTLPExporterBase } from './OTLPExporterBase'; -export { - OTLPExporterError, - OTLPExporterConfigBase, - ExportServiceError, -} from './types'; -export { validateAndNormalizeHeaders } from './util'; +export { OTLPExporterError } from './types'; export { ExportResponse, @@ -41,4 +32,14 @@ export { getSharedConfigurationDefaults, } from './configuration/shared-configuration'; -export { getSharedConfigurationFromEnvironment } from './configuration/shared-env-configuration'; +export { + OTLPExporterNodeConfigBase, + CompressionAlgorithm, +} from './configuration/legacy-node-configuration'; +export { OTLPExporterConfigBase } from './configuration/legacy-base-configuration'; +export { + createOtlpExportDelegate, + IOtlpExportDelegate, +} from './otlp-export-delegate'; +export { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler'; +export { createOtlpNetworkExportDelegate } from './otlp-network-export-delegate'; diff --git a/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts new file mode 100644 index 00000000000..402348e338a --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/otlp-browser-http-export-delegate.ts @@ -0,0 +1,51 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { OtlpHttpConfiguration } from './configuration/otlp-http-configuration'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { IOtlpExportDelegate } from './otlp-export-delegate'; +import { createRetryingTransport } from './retrying-transport'; +import { createXhrTransport } from './transport/xhr-transport'; +import { createSendBeaconTransport } from './transport/send-beacon-transport'; +import { createOtlpNetworkExportDelegate } from './otlp-network-export-delegate'; + +export function createOtlpXhrExportDelegate( + options: OtlpHttpConfiguration, + serializer: ISerializer +): IOtlpExportDelegate { + return createOtlpNetworkExportDelegate( + options, + serializer, + createRetryingTransport({ + transport: createXhrTransport(options), + }) + ); +} + +export function createOtlpSendBeaconExportDelegate( + options: OtlpHttpConfiguration, + serializer: ISerializer +): IOtlpExportDelegate { + return createOtlpNetworkExportDelegate( + options, + serializer, + createRetryingTransport({ + transport: createSendBeaconTransport({ + url: options.url, + blobType: options.headers()['Content-Type'], + }), + }) + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts new file mode 100644 index 00000000000..df42eb6061a --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/otlp-export-delegate.ts @@ -0,0 +1,145 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { IExporterTransport } from './exporter-transport'; +import { IExportPromiseHandler } from './bounded-queue-export-promise-handler'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { OTLPExporterError } from './types'; +import { diag, DiagLogger } from '@opentelemetry/api'; + +/** + * Internally shared export logic for OTLP. + */ +export interface IOtlpExportDelegate { + export( + internalRepresentation: Internal, + resultCallback: (result: ExportResult) => void + ): void; + forceFlush(): Promise; + shutdown(): Promise; +} + +class OTLPExportDelegate + implements IOtlpExportDelegate +{ + private _diagLogger: DiagLogger; + constructor( + private _transport: IExporterTransport, + private _serializer: ISerializer, + private _promiseQueue: IExportPromiseHandler, + private _timeout: number + ) { + this._diagLogger = diag.createComponentLogger({ + namespace: 'OTLPExportDelegate', + }); + } + + export( + internalRepresentation: Internal, + resultCallback: (result: ExportResult) => void + ): void { + this._diagLogger.debug('items to be sent', internalRepresentation); + + // don't do any work if too many exports are in progress. + if (this._promiseQueue.hasReachedLimit()) { + resultCallback({ + code: ExportResultCode.FAILED, + error: new Error('Concurrent export limit reached'), + }); + return; + } + + const serializedRequest = this._serializer.serializeRequest( + internalRepresentation + ); + + if (serializedRequest == null) { + resultCallback({ + code: ExportResultCode.FAILED, + error: new Error('Nothing to send'), + }); + return; + } + + this._promiseQueue.pushPromise( + this._transport.send(serializedRequest, this._timeout).then( + response => { + if (response.status === 'success') { + // No matter the response, we can consider the export still successful. + resultCallback({ + code: ExportResultCode.SUCCESS, + }); + return; + } else if (response.status === 'failure' && response.error) { + resultCallback({ + code: ExportResultCode.FAILED, + error: response.error, + }); + return; + } else if (response.status === 'retryable') { + resultCallback({ + code: ExportResultCode.FAILED, + error: new OTLPExporterError( + 'Export failed with retryable status' + ), + }); + } else { + resultCallback({ + code: ExportResultCode.FAILED, + error: new OTLPExporterError('Export failed with unknown error'), + }); + } + }, + reason => + resultCallback({ + code: ExportResultCode.FAILED, + error: reason, + }) + ) + ); + } + + forceFlush(): Promise { + return this._promiseQueue.awaitAll(); + } + + async shutdown(): Promise { + this._diagLogger.debug('shutdown started'); + await this.forceFlush(); + this._transport.shutdown(); + } +} + +/** + * Creates a generic delegate for OTLP exports which only contains parts of the OTLP export that are shared across all + * signals. + */ +export function createOtlpExportDelegate( + components: { + transport: IExporterTransport; + serializer: ISerializer; + promiseHandler: IExportPromiseHandler; + }, + settings: { timeout: number } +): IOtlpExportDelegate { + return new OTLPExportDelegate( + components.transport, + components.serializer, + components.promiseHandler, + settings.timeout + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts new file mode 100644 index 00000000000..548372914b8 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/otlp-http-export-delegate.ts @@ -0,0 +1,40 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { + createOtlpExportDelegate, + IOtlpExportDelegate, +} from './otlp-export-delegate'; +import { OtlpHttpConfiguration } from './configuration/otlp-http-configuration'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { createHttpExporterTransport } from './transport/http-exporter-transport'; +import { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler'; +import { createRetryingTransport } from './retrying-transport'; + +export function createOtlpHttpExportDelegate( + options: OtlpHttpConfiguration, + serializer: ISerializer +): IOtlpExportDelegate { + return createOtlpExportDelegate( + { + transport: createRetryingTransport({ + transport: createHttpExporterTransport(options), + }), + serializer: serializer, + promiseHandler: createBoundedQueueExportPromiseHandler(options), + }, + { timeout: options.timeoutMillis } + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts b/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts new file mode 100644 index 00000000000..0b2cb78cad2 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/src/otlp-network-export-delegate.ts @@ -0,0 +1,39 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler'; +import { OtlpSharedConfiguration } from './configuration/shared-configuration'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { IExporterTransport } from './exporter-transport'; +import { + createOtlpExportDelegate, + IOtlpExportDelegate, +} from './otlp-export-delegate'; + +export function createOtlpNetworkExportDelegate( + options: OtlpSharedConfiguration, + serializer: ISerializer, + transport: IExporterTransport +): IOtlpExportDelegate { + return createOtlpExportDelegate( + { + transport: transport, + serializer, + promiseHandler: createBoundedQueueExportPromiseHandler(options), + }, + { timeout: options.timeoutMillis } + ); +} diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts b/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts deleted file mode 100644 index da5401698cc..00000000000 --- a/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { OTLPExporterBase } from '../../OTLPExporterBase'; -import { OTLPExporterConfigBase, OTLPExporterError } from '../../types'; -import { diag } from '@opentelemetry/api'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IExporterTransport } from '../../exporter-transport'; -import { createXhrTransport } from './xhr-transport'; -import { createSendBeaconTransport } from './send-beacon-transport'; -import { createRetryingTransport } from '../../retrying-transport'; -import { - getHttpConfigurationDefaults, - mergeOtlpHttpConfigurationWithDefaults, -} from '../../configuration/otlp-http-configuration'; - -/** - * Collector Metric Exporter abstract base class - */ -export abstract class OTLPExporterBrowserBase< - ExportItem, - ServiceResponse, -> extends OTLPExporterBase { - private _serializer: ISerializer; - private _transport: IExporterTransport; - private _timeoutMillis: number; - - /** - * @param config - * @param serializer - * @param requiredHeaders - * @param signalResourcePath - */ - constructor( - config: OTLPExporterConfigBase = {}, - serializer: ISerializer, - requiredHeaders: Record, - signalResourcePath: string - ) { - super(config); - this._serializer = serializer; - const useXhr = - !!config.headers || typeof navigator.sendBeacon !== 'function'; - - const actualConfig = mergeOtlpHttpConfigurationWithDefaults( - { - url: config.url, - timeoutMillis: config.timeoutMillis, - headers: config.headers, - concurrencyLimit: config.concurrencyLimit, - }, - {}, // no fallback for browser case - getHttpConfigurationDefaults(requiredHeaders, signalResourcePath) - ); - - this._timeoutMillis = actualConfig.timeoutMillis; - this._concurrencyLimit = actualConfig.concurrencyLimit; - - if (useXhr) { - this._transport = createRetryingTransport({ - transport: createXhrTransport({ - headers: actualConfig.headers, - url: actualConfig.url, - }), - }); - } else { - // sendBeacon has no way to signal retry, so we do not wrap it in a RetryingTransport - this._transport = createSendBeaconTransport({ - url: actualConfig.url, - blobType: actualConfig.headers['Content-Type'], - }); - } - } - - onShutdown(): void {} - - send( - objects: ExportItem[], - onSuccess: () => void, - onError: (error: OTLPExporterError) => void - ): void { - if (this._shutdownOnce.isCalled) { - diag.debug('Shutdown already started. Cannot send objects'); - return; - } - - const data = this._serializer.serializeRequest(objects); - - if (data == null) { - onError(new Error('Could not serialize message')); - return; - } - - const promise = this._transport - .send(data, this._timeoutMillis) - .then(response => { - if (response.status === 'success') { - onSuccess(); - } else if (response.status === 'failure' && response.error) { - onError(response.error); - } else if (response.status === 'retryable') { - onError(new OTLPExporterError('Export failed with retryable status')); - } else { - onError(new OTLPExporterError('Export failed with unknown error')); - } - }, onError); - - this._sendingPromises.push(promise); - const popPromise = () => { - const index = this._sendingPromises.indexOf(promise); - this._sendingPromises.splice(index, 1); - }; - promise.then(popPromise, popPromise); - } -} diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts b/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts deleted file mode 100644 index f5d858016c8..00000000000 --- a/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { OTLPExporterBase } from '../../OTLPExporterBase'; -import { OTLPExporterNodeConfigBase } from './types'; -import { diag } from '@opentelemetry/api'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IExporterTransport } from '../../exporter-transport'; -import { createHttpExporterTransport } from './http-exporter-transport'; -import { OTLPExporterError } from '../../types'; -import { createRetryingTransport } from '../../retrying-transport'; -import { convertLegacyAgentOptions } from './convert-legacy-agent-options'; -import { - getHttpConfigurationDefaults, - mergeOtlpHttpConfigurationWithDefaults, -} from '../../configuration/otlp-http-configuration'; -import { getHttpConfigurationFromEnvironment } from '../../configuration/otlp-http-env-configuration'; - -/** - * Collector Metric Exporter abstract base class - */ -export abstract class OTLPExporterNodeBase< - ExportItem, - ServiceResponse, -> extends OTLPExporterBase { - private _serializer: ISerializer; - private _transport: IExporterTransport; - private _timeoutMillis: number; - - constructor( - config: OTLPExporterNodeConfigBase = {}, - serializer: ISerializer, - requiredHeaders: Record, - signalIdentifier: string, - signalResourcePath: string - ) { - super(config); - const actualConfig = mergeOtlpHttpConfigurationWithDefaults( - { - url: config.url, - headers: config.headers, - concurrencyLimit: config.concurrencyLimit, - timeoutMillis: config.timeoutMillis, - compression: config.compression, - }, - getHttpConfigurationFromEnvironment(signalIdentifier, signalResourcePath), - getHttpConfigurationDefaults(requiredHeaders, signalResourcePath) - ); - - this._timeoutMillis = actualConfig.timeoutMillis; - this._concurrencyLimit = actualConfig.concurrencyLimit; - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - if ((config as any).metadata) { - diag.warn('Metadata cannot be set when using http'); - } - this._serializer = serializer; - - this._transport = createRetryingTransport({ - transport: createHttpExporterTransport({ - agentOptions: convertLegacyAgentOptions(config), - compression: actualConfig.compression, - headers: actualConfig.headers, - url: actualConfig.url, - }), - }); - } - - send( - objects: ExportItem[], - onSuccess: () => void, - onError: (error: OTLPExporterError) => void - ): void { - if (this._shutdownOnce.isCalled) { - diag.debug('Shutdown already started. Cannot send objects'); - return; - } - - const data = this._serializer.serializeRequest(objects); - - if (data == null) { - onError(new Error('Could not serialize message')); - return; - } - - const promise = this._transport - .send(data, this._timeoutMillis) - .then(response => { - if (response.status === 'success') { - onSuccess(); - } else if (response.status === 'failure' && response.error) { - onError(response.error); - } else if (response.status === 'retryable') { - onError(new OTLPExporterError('Export failed with retryable status')); - } else { - onError(new OTLPExporterError('Export failed with unknown error')); - } - }, onError); - - this._sendingPromises.push(promise); - const popPromise = () => { - const index = this._sendingPromises.indexOf(promise); - this._sendingPromises.splice(index, 1); - }; - promise.then(popPromise, popPromise); - } - - onShutdown(): void {} -} diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/convert-legacy-agent-options.ts b/experimental/packages/otlp-exporter-base/src/platform/node/convert-legacy-agent-options.ts deleted file mode 100644 index a73c5b7ead7..00000000000 --- a/experimental/packages/otlp-exporter-base/src/platform/node/convert-legacy-agent-options.ts +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { OTLPExporterNodeConfigBase } from './types'; -import type * as http from 'http'; -import type * as https from 'https'; - -/** - * Replicates old config behavior where there's two ways to set keepAlive. - * This function sets keepAlive in AgentOptions if it is defined. In the future, we will remove - * this duplicate to only allow setting keepAlive in AgentOptions. - * @param config - */ -export function convertLegacyAgentOptions( - config: OTLPExporterNodeConfigBase -): http.AgentOptions | https.AgentOptions { - // populate keepAlive for use with new settings - if (config?.keepAlive != null) { - if (config.httpAgentOptions != null) { - if (config.httpAgentOptions.keepAlive == null) { - // specific setting is not set, populate with non-specific setting. - config.httpAgentOptions.keepAlive = config.keepAlive; - } - // do nothing, use specific setting otherwise - } else { - // populate specific option if AgentOptions does not exist. - config.httpAgentOptions = { - keepAlive: config.keepAlive, - }; - } - } - - return config.httpAgentOptions ?? { keepAlive: true }; -} diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/http-exporter-transport.ts b/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts similarity index 95% rename from experimental/packages/otlp-exporter-base/src/platform/node/http-exporter-transport.ts rename to experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts index 1b638f7c41d..bdeb2db00e0 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/http-exporter-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts @@ -23,8 +23,8 @@ import type { // as they'd be imported before the http/https modules can be wrapped. import type * as https from 'https'; import type * as http from 'http'; -import { ExportResponse } from '../../export-response'; -import { IExporterTransport } from '../../exporter-transport'; +import { ExportResponse } from '../export-response'; +import { IExporterTransport } from '../exporter-transport'; class HttpExporterTransport implements IExporterTransport { private _send: sendWithHttp | null = null; diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/http-transport-types.ts b/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts similarity index 91% rename from experimental/packages/otlp-exporter-base/src/platform/node/http-transport-types.ts rename to experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts index 1a041aedf22..593d378e1d1 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/http-transport-types.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts @@ -16,7 +16,7 @@ import type * as http from 'http'; import type * as https from 'https'; -import { ExportResponse } from '../../export-response'; +import { ExportResponse } from '../export-response'; export type sendWithHttp = ( params: HttpRequestParameters, @@ -28,7 +28,7 @@ export type sendWithHttp = ( export interface HttpRequestParameters { url: string; - headers: Record; + headers: () => Record; compression: 'gzip' | 'none'; agentOptions: http.AgentOptions | https.AgentOptions; } diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/http-transport-utils.ts b/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts similarity index 90% rename from experimental/packages/otlp-exporter-base/src/platform/node/http-transport-utils.ts rename to experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts index 8fa7529fdc4..5dab9670b54 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/http-transport-utils.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts @@ -18,12 +18,12 @@ import * as https from 'https'; import * as zlib from 'zlib'; import { Readable } from 'stream'; import { HttpRequestParameters } from './http-transport-types'; -import { ExportResponse } from '../../export-response'; +import { ExportResponse } from '../export-response'; import { isExportRetryable, parseRetryAfterToMills, -} from '../../is-export-retryable'; -import { OTLPExporterError } from '../../types'; +} from '../is-export-retryable'; +import { OTLPExporterError } from '../types'; /** * Sends data using http @@ -49,7 +49,7 @@ export function sendWithHttp( path: parsedUrl.pathname, method: 'POST', headers: { - ...params.headers, + ...params.headers(), }, agent: agent, }; @@ -72,7 +72,11 @@ export function sendWithHttp( retryInMillis: parseRetryAfterToMills(res.headers['retry-after']), }); } else { - const error = new OTLPExporterError(res.statusMessage, res.statusCode); + const error = new OTLPExporterError( + res.statusMessage, + res.statusCode, + Buffer.concat(responseData).toString() + ); onDone({ status: 'failure', error, @@ -111,7 +115,7 @@ export function sendWithHttp( }); } -function compressAndSend( +export function compressAndSend( req: http.ClientRequest, compression: 'gzip' | 'none', data: Uint8Array, @@ -127,7 +131,7 @@ function compressAndSend( .on('error', onError); } - dataStream.pipe(req); + dataStream.pipe(req).on('error', onError); } function readableFromUint8Array(buff: string | Uint8Array): Readable { diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/send-beacon-transport.ts b/experimental/packages/otlp-exporter-base/src/transport/send-beacon-transport.ts similarity index 93% rename from experimental/packages/otlp-exporter-base/src/platform/browser/send-beacon-transport.ts rename to experimental/packages/otlp-exporter-base/src/transport/send-beacon-transport.ts index 79f9bd9ff81..448265c27b0 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/browser/send-beacon-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/send-beacon-transport.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { IExporterTransport } from '../../exporter-transport'; -import { ExportResponse } from '../../export-response'; +import { IExporterTransport } from '../exporter-transport'; +import { ExportResponse } from '../export-response'; import { diag } from '@opentelemetry/api'; export interface SendBeaconParameters { diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/xhr-transport.ts b/experimental/packages/otlp-exporter-base/src/transport/xhr-transport.ts similarity index 87% rename from experimental/packages/otlp-exporter-base/src/platform/browser/xhr-transport.ts rename to experimental/packages/otlp-exporter-base/src/transport/xhr-transport.ts index 6517a994b69..17c02096478 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/browser/xhr-transport.ts +++ b/experimental/packages/otlp-exporter-base/src/transport/xhr-transport.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import { IExporterTransport } from '../../exporter-transport'; -import { ExportResponse } from '../../export-response'; +import { IExporterTransport } from '../exporter-transport'; +import { ExportResponse } from '../export-response'; import { diag } from '@opentelemetry/api'; import { isExportRetryable, parseRetryAfterToMills, -} from '../../is-export-retryable'; +} from '../is-export-retryable'; export interface XhrRequestParameters { url: string; - headers: Record; + headers: () => Record; } class XhrTransport implements IExporterTransport { @@ -35,7 +35,8 @@ class XhrTransport implements IExporterTransport { const xhr = new XMLHttpRequest(); xhr.timeout = timeoutMillis; xhr.open('POST', this._parameters.url); - Object.entries(this._parameters.headers).forEach(([k, v]) => { + const headers = this._parameters.headers(); + Object.entries(headers).forEach(([k, v]) => { xhr.setRequestHeader(k, v); }); @@ -80,9 +81,7 @@ class XhrTransport implements IExporterTransport { }); }; - xhr.send( - new Blob([data], { type: this._parameters.headers['Content-Type'] }) - ); + xhr.send(data); }); } diff --git a/experimental/packages/otlp-exporter-base/src/types.ts b/experimental/packages/otlp-exporter-base/src/types.ts index 7964f0048c1..8d1dae72b2b 100644 --- a/experimental/packages/otlp-exporter-base/src/types.ts +++ b/experimental/packages/otlp-exporter-base/src/types.ts @@ -40,15 +40,3 @@ export interface ExportServiceError { message: string; stack: string; } - -/** - * Collector Exporter base config - */ -export interface OTLPExporterConfigBase { - headers?: Record; - url?: string; - concurrencyLimit?: number; - /** Maximum time the OTLP exporter will wait for each batch export. - * The default value is 10000ms. */ - timeoutMillis?: number; -} diff --git a/experimental/packages/otlp-exporter-base/src/util.ts b/experimental/packages/otlp-exporter-base/src/util.ts index 515b913402d..96ee08366c2 100644 --- a/experimental/packages/otlp-exporter-base/src/util.ts +++ b/experimental/packages/otlp-exporter-base/src/util.ts @@ -21,17 +21,19 @@ import { diag } from '@opentelemetry/api'; * @param partialHeaders */ export function validateAndNormalizeHeaders( - partialHeaders: Partial> = {} -): Record { - const headers: Record = {}; - Object.entries(partialHeaders).forEach(([key, value]) => { - if (typeof value !== 'undefined') { - headers[key] = String(value); - } else { - diag.warn( - `Header "${key}" has invalid value (${value}) and will be ignored` - ); - } - }); - return headers; + partialHeaders: (() => Record) | undefined +): () => Record { + return () => { + const headers: Record = {}; + Object.entries(partialHeaders?.() ?? {}).forEach(([key, value]) => { + if (typeof value !== 'undefined') { + headers[key] = String(value); + } else { + diag.warn( + `Header "${key}" has invalid value (${value}) and will be ignored` + ); + } + }); + return headers; + }; } diff --git a/experimental/packages/otlp-exporter-base/test/browser/send-beacon-transport.test.ts b/experimental/packages/otlp-exporter-base/test/browser/send-beacon-transport.test.ts index e108df7f005..86a44d04352 100644 --- a/experimental/packages/otlp-exporter-base/test/browser/send-beacon-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/browser/send-beacon-transport.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as sinon from 'sinon'; -import { createSendBeaconTransport } from '../../src/platform/browser/send-beacon-transport'; +import { createSendBeaconTransport } from '../../src/transport/send-beacon-transport'; import * as assert from 'assert'; describe('SendBeaconTransport', function () { diff --git a/experimental/packages/otlp-exporter-base/test/browser/xhr-transport.test.ts b/experimental/packages/otlp-exporter-base/test/browser/xhr-transport.test.ts index f1efbe130d6..5928206469a 100644 --- a/experimental/packages/otlp-exporter-base/test/browser/xhr-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/browser/xhr-transport.test.ts @@ -16,7 +16,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { createXhrTransport } from '../../src/platform/browser/xhr-transport'; +import { createXhrTransport } from '../../src/transport/xhr-transport'; import { ExportResponseRetryable, ExportResponseFailure, @@ -26,11 +26,11 @@ import { ensureHeadersContain } from '../testHelper'; const testTransportParameters = { url: 'http://example.test', - headers: { + headers: () => ({ foo: 'foo-value', bar: 'bar-value', 'Content-Type': 'application/json', - }, + }), }; const requestTimeout = 1000; @@ -65,10 +65,7 @@ describe('XhrTransport', function () { undefined ); assert.strictEqual(request.url, testTransportParameters.url); - assert.strictEqual( - (request.requestBody as unknown as Blob).type, - 'application/json' - ); + assert.strictEqual(request.requestBody, testPayload); ensureHeadersContain(request.requestHeaders, { foo: 'foo-value', bar: 'bar-value', diff --git a/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts b/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts deleted file mode 100644 index 89874f353d1..00000000000 --- a/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ExportResultCode } from '@opentelemetry/core'; -import * as assert from 'assert'; -import * as sinon from 'sinon'; -import { OTLPExporterBase } from '../../src/OTLPExporterBase'; -import { OTLPExporterConfigBase } from '../../src/types'; -import { ComplexTestObject, mockedComplexTestObject } from '../testHelper'; -import * as otlpTypes from '../../src/types'; - -type CollectorExporterConfig = OTLPExporterConfigBase; -class OTLPTraceExporter extends OTLPExporterBase< - CollectorExporterConfig, - ComplexTestObject -> { - onShutdown() {} - send( - items: any[], - onSuccess: () => void, - onError: (error: otlpTypes.OTLPExporterError) => void - ) { - const promise = Promise.resolve(null); - this._sendingPromises.push( - promise.then(() => - this._sendingPromises.splice(this._sendingPromises.indexOf(promise), 1) - ) - ); - } - getDefaultUrl(config: CollectorExporterConfig): string { - return config.url || ''; - } -} - -describe('OTLPTraceExporter - common', () => { - let collectorExporter: OTLPTraceExporter; - let collectorExporterConfig: CollectorExporterConfig; - - afterEach(() => { - sinon.restore(); - }); - - describe('constructor', () => { - beforeEach(() => { - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should create an instance', () => { - assert.ok(typeof collectorExporter !== 'undefined'); - }); - }); - - describe('export', () => { - let spySend: any; - beforeEach(() => { - spySend = sinon.stub(OTLPTraceExporter.prototype, 'send'); - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should export spans as otlpTypes.Spans', done => { - const spans: ComplexTestObject[] = []; - spans.push(Object.assign({}, mockedComplexTestObject)); - - collectorExporter.export(spans, () => {}); - setTimeout(() => { - const span1 = spySend.args[0][0][0] as ComplexTestObject; - assert.deepStrictEqual(spans[0], span1); - done(); - }); - assert.strictEqual(spySend.callCount, 1); - }); - - describe('when exporter is shutdown', () => { - it( - 'should not export anything but return callback with code' + - ' "FailedNotRetryable"', - async () => { - const spans: ComplexTestObject[] = []; - spans.push(Object.assign({}, mockedComplexTestObject)); - await collectorExporter.shutdown(); - spySend.resetHistory(); - - const callbackSpy = sinon.spy(); - collectorExporter.export(spans, callbackSpy); - const returnCode = callbackSpy.args[0][0]; - - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual(spySend.callCount, 0, 'should not call send'); - } - ); - }); - describe('when an error occurs', () => { - it('should return failed export result', done => { - const spans: ComplexTestObject[] = []; - spans.push(Object.assign({}, mockedComplexTestObject)); - spySend.throws({ - code: 100, - details: 'Test error', - metadata: {}, - message: 'Non-retryable', - stack: 'Stack', - }); - const callbackSpy = sinon.spy(); - collectorExporter.export(spans, callbackSpy); - setTimeout(() => { - const returnCode = callbackSpy.args[0][0]; - assert.strictEqual( - returnCode.code, - ExportResultCode.FAILED, - 'return value is wrong' - ); - assert.strictEqual( - returnCode.error.message, - 'Non-retryable', - 'return error message is wrong' - ); - assert.strictEqual(spySend.callCount, 1, 'should call send'); - done(); - }); - }); - }); - }); - describe('export - concurrency limit', () => { - it('should error if too many concurrent exports are queued', done => { - const collectorExporterWithConcurrencyLimit = new OTLPTraceExporter({ - ...collectorExporterConfig, - concurrencyLimit: 3, - }); - const spans: ComplexTestObject[] = [{ ...mockedComplexTestObject }]; - const callbackSpy = sinon.spy(); - for (let i = 0; i < 7; i++) { - collectorExporterWithConcurrencyLimit.export(spans, callbackSpy); - } - - setTimeout(() => { - // Expect 4 failures - assert.strictEqual(callbackSpy.args.length, 4); - callbackSpy.args.forEach(([result]) => { - assert.strictEqual(result.code, ExportResultCode.FAILED); - assert.strictEqual( - result.error!.message, - 'Concurrent export limit reached' - ); - }); - done(); - }); - }); - }); - describe('shutdown', () => { - let onShutdownSpy: any; - beforeEach(() => { - onShutdownSpy = sinon.stub(OTLPTraceExporter.prototype, 'onShutdown'); - collectorExporterConfig = { - url: 'http://foo.bar.com', - }; - collectorExporter = new OTLPTraceExporter(collectorExporterConfig); - }); - - it('should call onShutdown', async () => { - await collectorExporter.shutdown(); - assert.strictEqual(onShutdownSpy.callCount, 1); - }); - }); -}); diff --git a/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts b/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts new file mode 100644 index 00000000000..a848e4588bb --- /dev/null +++ b/experimental/packages/otlp-exporter-base/test/common/OTLPExporterBase.test.ts @@ -0,0 +1,100 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { IOtlpExportDelegate, OTLPExporterBase } from '../../src'; + +import * as sinon from 'sinon'; + +describe('OTLPExporterBase', function () { + describe('shutdown', function () { + it('calls delegate shutdown', async function () { + // arrange + const exportStub = sinon.stub(); + const forceFlushStub = sinon.stub(); + const shutdownStub = sinon.stub(); + const delegateStubs: IOtlpExportDelegate = { + export: exportStub, + forceFlush: forceFlushStub, + shutdown: shutdownStub, + }; + const exporterBase = new OTLPExporterBase(delegateStubs); + + // act + await exporterBase.shutdown(); + + // assert + sinon.assert.calledOnce(shutdownStub); + // any extra calls on delegate should be handled by the delegate + sinon.assert.notCalled(exportStub); + sinon.assert.notCalled(forceFlushStub); + }); + }); + + describe('forceFlush', function () { + it('calls delegate forceFlush', async function () { + // arrange + const exportStub = sinon.stub(); + const forceFlushStub = sinon.stub(); + const shutdownStub = sinon.stub(); + const delegateStubs: IOtlpExportDelegate = { + export: exportStub, + forceFlush: forceFlushStub, + shutdown: shutdownStub, + }; + const exporterBase = new OTLPExporterBase(delegateStubs); + + // act + await exporterBase.forceFlush(); + + // assert + sinon.assert.calledOnce(forceFlushStub); + // any extra calls on delegate should be handled by the delegate + sinon.assert.notCalled(exportStub); + sinon.assert.notCalled(shutdownStub); + }); + }); + + describe('export', function () { + it('calls delegate export', function () { + // arrange + const exportStub = sinon.stub(); + const forceFlushStub = sinon.stub(); + const shutdownStub = sinon.stub(); + const delegateStubs: IOtlpExportDelegate = { + export: exportStub, + forceFlush: forceFlushStub, + shutdown: shutdownStub, + }; + const exporterBase = new OTLPExporterBase(delegateStubs); + const expectedExportItem = 'sample-export-item'; + const expectedCallback = sinon.stub(); + + // act + exporterBase.export(expectedExportItem, expectedCallback); + + // assert + sinon.assert.calledOnceWithExactly( + exportStub, + expectedExportItem, + expectedCallback + ); + // should not do anything with the callback, any interaction with it should happen on the delegate + sinon.assert.notCalled(expectedCallback); + // any extra calls on delegate should be handled by the delegate + sinon.assert.notCalled(forceFlushStub); + sinon.assert.notCalled(shutdownStub); + }); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/common/bounded-queue-export-promise-handler.test.ts b/experimental/packages/otlp-exporter-base/test/common/bounded-queue-export-promise-handler.test.ts new file mode 100644 index 00000000000..57cd86a4d2a --- /dev/null +++ b/experimental/packages/otlp-exporter-base/test/common/bounded-queue-export-promise-handler.test.ts @@ -0,0 +1,118 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { createBoundedQueueExportPromiseHandler } from '../../src'; +import * as assert from 'assert'; + +describe('BoundedQueueExportPromiseHandler', function () { + it('respects concurrencyLimit', function () { + const promiseHandler = createBoundedQueueExportPromiseHandler({ + concurrencyLimit: 3, + }); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + assert.ok(promiseHandler.hasReachedLimit()); + assert.throws(() => promiseHandler.pushPromise(Promise.resolve())); + }); + + it('removes from queue when promise resolves without calling awaitAll', function (done) { + const promiseHandler = createBoundedQueueExportPromiseHandler({ + concurrencyLimit: 3, + }); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + assert.ok(promiseHandler.hasReachedLimit()); + + queueMicrotask(() => { + try { + assert.strictEqual( + promiseHandler.hasReachedLimit(), + false, + 'expected that once promises resolve, the queue becomes available again' + ); + done(); + } catch (error) { + done(error); + } + }); + }); + + it('removes from queue when promise rejects without calling awaitAll', function (done) { + const promiseHandler = createBoundedQueueExportPromiseHandler({ + concurrencyLimit: 3, + }); + promiseHandler.pushPromise(Promise.reject()); + promiseHandler.pushPromise(Promise.reject()); + promiseHandler.pushPromise(Promise.reject()); + assert.ok(promiseHandler.hasReachedLimit()); + + queueMicrotask(() => { + try { + assert.strictEqual( + promiseHandler.hasReachedLimit(), + false, + 'expected that once promises resolve, the queue becomes available again' + ); + done(); + } catch (error) { + done(error); + } + }); + }); + + it('removes from queue when promise resolves when calling awaitAll', async function () { + const promiseHandler = createBoundedQueueExportPromiseHandler({ + concurrencyLimit: 3, + }); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + promiseHandler.pushPromise(Promise.resolve()); + assert.ok(promiseHandler.hasReachedLimit()); + + await promiseHandler.awaitAll(); + + assert.strictEqual( + promiseHandler.hasReachedLimit(), + false, + 'expected that once awaitAll() resolves, the queue becomes available again' + ); + }); + + it('does reject in when calling awaitAll when an in the queue rejects', async function () { + const promiseHandler = createBoundedQueueExportPromiseHandler({ + concurrencyLimit: 3, + }); + promiseHandler.pushPromise( + new Promise(resolve => queueMicrotask(() => resolve())) + ); + promiseHandler.pushPromise( + new Promise(resolve => queueMicrotask(() => resolve())) + ); + promiseHandler.pushPromise( + new Promise((_, reject) => queueMicrotask(() => reject())) + ); + assert.ok(promiseHandler.hasReachedLimit()); + + await assert.rejects(() => promiseHandler.awaitAll()); + + assert.strictEqual( + promiseHandler.hasReachedLimit(), + false, + 'expected that once awaitAll() rejects, the queue becomes available again' + ); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts index 03d040b14f4..d44e885b48e 100644 --- a/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/configuration/otlp-http-configuration.test.ts @@ -27,21 +27,22 @@ describe('mergeOtlpHttpConfigurationWithDefaults', function () { timeoutMillis: 1, compression: 'none', concurrencyLimit: 2, - headers: { 'User-Agent': 'default-user-agent' }, + headers: () => ({ 'User-Agent': 'default-user-agent' }), + agentOptions: { keepAlive: true }, }; describe('headers', function () { it('merges headers instead of overriding', function () { const config = mergeOtlpHttpConfigurationWithDefaults( { - headers: { foo: 'user' }, + headers: () => ({ foo: 'user' }), }, { - headers: { foo: 'fallback', bar: 'fallback' }, + headers: () => ({ foo: 'fallback', bar: 'fallback' }), }, testDefaults ); - assert.deepStrictEqual(config.headers, { + assert.deepStrictEqual(config.headers(), { 'User-Agent': 'default-user-agent', foo: 'user', bar: 'fallback', @@ -51,14 +52,14 @@ describe('mergeOtlpHttpConfigurationWithDefaults', function () { it('does not override default (required) header', function () { const config = mergeOtlpHttpConfigurationWithDefaults( { - headers: { 'User-Agent': 'custom' }, + headers: () => ({ 'User-Agent': 'custom' }), }, { - headers: { 'User-Agent': 'custom-fallback' }, + headers: () => ({ 'User-Agent': 'custom-fallback' }), }, testDefaults ); - assert.deepStrictEqual(config.headers, { + assert.deepStrictEqual(config.headers(), { 'User-Agent': 'default-user-agent', }); }); @@ -68,12 +69,16 @@ describe('mergeOtlpHttpConfigurationWithDefaults', function () { { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore simulating plain JavaScript usage, ignoring types - headers: { foo: 'foo-user-provided', bar: undefined, baz: null }, + headers: () => ({ + foo: 'foo-user-provided', + bar: undefined, + baz: null, + }), }, {}, testDefaults ); - assert.deepStrictEqual(config.headers, { + assert.deepStrictEqual(config.headers(), { foo: 'foo-user-provided', baz: 'null', 'User-Agent': 'default-user-agent', diff --git a/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts b/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts new file mode 100644 index 00000000000..1953ceea942 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts @@ -0,0 +1,599 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as sinon from 'sinon'; +import * as assert from 'assert'; +import { IExporterTransport } from '../../src'; +import { ExportResultCode } from '@opentelemetry/core'; +import { createOtlpExportDelegate } from '../../src'; +import { ExportResponse } from '../../src'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { IExportPromiseHandler } from '../../src/bounded-queue-export-promise-handler'; + +interface FakeInternalRepresentation { + foo: string; +} + +interface FakeSignalResponse { + baz: string; +} + +type FakeSerializer = ISerializer< + FakeInternalRepresentation, + FakeSignalResponse +>; + +const internalRepresentation: FakeInternalRepresentation = { + foo: 'internal', +}; + +describe('OTLPExportDelegate', function () { + describe('forceFlush', function () { + afterEach(function () { + sinon.restore(); + }); + + it('awaits promise queue', async function () { + // transport does not need to do anything in this case. + const transportStubs = { + send: sinon.stub(), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + serializeRequest: sinon.stub(), + deserializeResponse: sinon.stub(), + }; + const mockSerializer = serializerStubs; + + // promise queue has not reached capacity yet + const promiseQueueStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub(), + awaitAll: sinon.stub().returns(Promise.resolve()), + }; + const promiseQueue = promiseQueueStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseQueue, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + await exporter.forceFlush(); + sinon.assert.calledOnce(promiseQueueStubs.awaitAll); + }); + }); + + describe('shutdown', function () { + afterEach(function () { + sinon.restore(); + }); + + it('awaits promise queue', async function () { + // transport does not need to do anything in this case. + const transportStubs = { + send: sinon.stub(), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + serializeRequest: sinon.stub(), + deserializeResponse: sinon.stub(), + }; + const mockSerializer = serializerStubs; + + // promise queue has not reached capacity yet + const promiseQueueStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub(), + awaitAll: sinon.stub().returns(Promise.resolve()), + }; + const promiseQueue = promiseQueueStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseQueue, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + await exporter.shutdown(); + sinon.assert.calledOnce(promiseQueueStubs.awaitAll); + }); + }); + + describe('export', function () { + afterEach(function () { + sinon.restore(); + }); + + it('fails if serializer returns undefined', function (done) { + // transport does not need to do anything in this case. + const transportStubs = { + send: sinon.stub(), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + serializeRequest: sinon.stub().returns(undefined), + deserializeResponse: sinon.stub(), + }; + const mockSerializer = serializerStubs; + + // promise queue has not reached capacity yet + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.ok(result.error); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + + sinon.assert.calledOnceWithExactly( + serializerStubs.serializeRequest, + internalRepresentation + ); + sinon.assert.notCalled(serializerStubs.deserializeResponse); + sinon.assert.notCalled(transportStubs.send); + sinon.assert.notCalled(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + }); + + it('fails if promise queue is full', function (done) { + // transport does not need to do anything in this case. + const transportStubs = { + send: sinon.stub(), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + // serializer should be never used when the queue is full, so it does not need to do anything. + const serializerStubs = { + serializeRequest: sinon.stub(), + deserializeResponse: sinon.stub(), + }; + const mockSerializer = serializerStubs; + + // make queue signal that it is full. + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(true), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.ok(result.error); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + + sinon.assert.notCalled(serializerStubs.serializeRequest); + sinon.assert.notCalled(serializerStubs.deserializeResponse); + sinon.assert.notCalled(transportStubs.send); + sinon.assert.notCalled(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + }); + + it('returns success if send promise resolves with success', function (done) { + const exportResponse: ExportResponse = { + data: Uint8Array.from([]), + status: 'success', + }; + // transport fakes empty response + const transportStubs = { + send: sinon.stub().returns(Promise.resolve(exportResponse)), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // simulate that it returns a full success (empty response) + deserializeResponse: sinon.stub().returns({}), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.SUCCESS); + assert.strictEqual(result.error, undefined); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + + it('returns failure if send promise resolves with failure', function (done) { + const exportResponse: ExportResponse = { + status: 'failure', + error: new Error('failure'), + }; + // transport fakes empty response + const transportStubs = { + send: sinon.stub().returns(Promise.resolve(exportResponse)), + shutdown: sinon.stub, + }; + const mockTransport = transportStubs; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // simulate that it returns a full success (empty response) + deserializeResponse: sinon.stub().returns({}), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.strictEqual(result.error, exportResponse.error); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + + it('returns unknown failure if send promise resolves with failure but no error', function (done) { + const exportResponse: ExportResponse = { + status: 'failure', + error: undefined as any, + }; + // transport fakes empty response + const transportStubs = { + send: sinon.stub().returns(Promise.resolve(exportResponse)), + shutdown: sinon.stub, + }; + const mockTransport = transportStubs; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // simulate that it returns a full success (empty response) + deserializeResponse: sinon.stub().returns({}), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.strictEqual( + result.error?.message, + 'Export failed with unknown error' + ); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + + it('returns failure if send promise resolves with retryable', function (done) { + const exportResponse: ExportResponse = { + status: 'retryable', + }; + // transport fakes empty response + const transportStubs = { + send: sinon.stub().returns(Promise.resolve(exportResponse)), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // simulate that it returns a full success (empty response) + deserializeResponse: sinon.stub().returns({}), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.strictEqual( + result.error?.message, + 'Export failed with retryable status' + ); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + + it('returns success if response is returned', function (done) { + // returns full success response (empty body) + const exportResponse: ExportResponse = { + data: Uint8Array.from([]), + status: 'success', + }; + + // transport does not need to do anything in this case. + const transportStubs = { + send: sinon.stub().returns(Promise.resolve(exportResponse)), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const response: FakeSignalResponse = { + baz: 'partial success', + }; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // simulate that it returns a partial success (response with contents) + deserializeResponse: sinon.stub().returns(response), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.SUCCESS); + assert.strictEqual(result.error, undefined); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + + it('returns failure when send rejects', function (done) { + const transportStubs = { + // make transport reject + send: sinon.stub().returns(Promise.reject(new Error())), + shutdown: sinon.stub(), + }; + const mockTransport = transportStubs; + + const serializerStubs = { + // simulate that the serializer returns something to send + serializeRequest: sinon.stub().returns(Uint8Array.from([1])), + // does not need to do anything, should never be called. + deserializeResponse: sinon.stub(), + }; + const mockSerializer = serializerStubs; + + // mock a queue that has not yet reached capacity + const promiseHandlerStubs = { + pushPromise: sinon.stub(), + hasReachedLimit: sinon.stub().returns(false), + awaitAll: sinon.stub(), + }; + const promiseHandler = promiseHandlerStubs; + + const exporter = createOtlpExportDelegate( + { + promiseHandler: promiseHandler, + serializer: mockSerializer, + transport: mockTransport, + }, + { + timeout: 1000, + } + ); + + exporter.export(internalRepresentation, result => { + try { + assert.strictEqual(result.code, ExportResultCode.FAILED); + assert.ok(result.error); + + // assert here as otherwise the promise will not have executed yet + sinon.assert.calledOnce(serializerStubs.serializeRequest); + sinon.assert.notCalled(serializerStubs.deserializeResponse); + sinon.assert.calledOnce(transportStubs.send); + sinon.assert.calledOnce(promiseHandlerStubs.pushPromise); + sinon.assert.calledOnce(promiseHandlerStubs.hasReachedLimit); + sinon.assert.notCalled(promiseHandlerStubs.awaitAll); + done(); + } catch (err) { + // ensures we throw if there are more calls to result; + done(err); + } + }); + }); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/common/util.test.ts b/experimental/packages/otlp-exporter-base/test/common/util.test.ts index 3bd00a2f226..d9f6c11ce38 100644 --- a/experimental/packages/otlp-exporter-base/test/common/util.test.ts +++ b/experimental/packages/otlp-exporter-base/test/common/util.test.ts @@ -31,7 +31,9 @@ describe('parseHeaders', function () { foo2: 'bar', foo3: 1, }; - const result = validateAndNormalizeHeaders(headers); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore simulating plain JS usage + const result = validateAndNormalizeHeaders(() => headers)(); assert.deepStrictEqual(result, { foo2: 'bar', foo3: '1', @@ -44,7 +46,7 @@ describe('parseHeaders', function () { }); it('should parse undefined', function () { - const result = validateAndNormalizeHeaders(undefined); + const result = validateAndNormalizeHeaders(undefined)(); assert.deepStrictEqual(result, {}); }); }); diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/convert-legacy-node-otlp-http-options.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/convert-legacy-node-otlp-http-options.test.ts new file mode 100644 index 00000000000..73fe38b52e5 --- /dev/null +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/convert-legacy-node-otlp-http-options.test.ts @@ -0,0 +1,85 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { diag } from '@opentelemetry/api'; + +import * as sinon from 'sinon'; +import * as assert from 'assert'; +import { convertLegacyHttpOptions } from '../../../src/configuration/convert-legacy-node-http-options'; + +describe('convertLegacyHttpOptions', function () { + afterEach(function () { + sinon.restore(); + }); + + it('should warn when used with metadata', function () { + const warnStub = sinon.stub(); + diag.setLogger({ + verbose: sinon.stub(), + debug: sinon.stub(), + info: sinon.stub(), + warn: warnStub, + error: sinon.stub(), + }); + + convertLegacyHttpOptions( + { metadata: { foo: 'bar' } } as any, + 'SIGNAL', + 'v1/signal', + {} + ); + + sinon.assert.calledOnceWithExactly( + warnStub, + 'Metadata cannot be set when using http' + ); + }); + + it('should keep specific keepAlive', () => { + // act + const options = convertLegacyHttpOptions( + { + keepAlive: true, + }, + 'SIGNAL', + 'v1/signal', + {} + ); + + // assert + assert.ok(options.agentOptions.keepAlive); + }); + + it('should set keepAlive on AgentOptions when not explicitly set in AgentOptions but set in config', () => { + // act + const options = convertLegacyHttpOptions( + { + keepAlive: true, + httpAgentOptions: { + // set anything so that we can check that it's still there once options have been merged + port: 1234, + }, + }, + 'SIGNAL', + 'v1/signal', + {} + ); + + // assert + assert.ok(options.agentOptions.keepAlive); + assert.strictEqual(options.agentOptions.port, 1234); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-env-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-env-configuration.test.ts index 5b4bc4dc473..13913b1f1c4 100644 --- a/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-env-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/otlp-http-env-configuration.test.ts @@ -49,7 +49,7 @@ describe('getHttpConfigurationFromEnvironment', function () { 'METRICS', 'v1/metrics' ); - assert.deepEqual(config.headers, { + assert.deepEqual(config.headers?.(), { key1: 'metrics', key2: 'value2', }); @@ -62,7 +62,7 @@ describe('getHttpConfigurationFromEnvironment', function () { 'METRICS', 'v1/metrics' ); - assert.deepEqual(config.headers, { + assert.deepEqual(config.headers?.(), { key1: 'value1', key2: 'value2', }); @@ -76,7 +76,7 @@ describe('getHttpConfigurationFromEnvironment', function () { 'METRICS', 'v1/metrics' ); - assert.deepEqual(config.headers, { + assert.deepEqual(config.headers?.(), { key1: 'value1', key2: 'value2', }); diff --git a/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts b/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts index 51d55d4980a..28f38c4e358 100644 --- a/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/configuration/shared-env-configuration.test.ts @@ -18,10 +18,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { diag } from '@opentelemetry/api'; import * as process from 'process'; -import { - getSharedConfigurationFromEnvironment, - OtlpSharedConfiguration, -} from '../../../src'; +import { OtlpSharedConfiguration } from '../../../src'; +import { getSharedConfigurationFromEnvironment } from '../../../src/index-node-http'; export function testSharedConfigurationFromEnvironment( sut: (signalIdentifier: string) => Partial diff --git a/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts b/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts index f94a58760c1..2e511893eda 100644 --- a/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts +++ b/experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createHttpExporterTransport } from '../../src/platform/node/http-exporter-transport'; +import { createHttpExporterTransport } from '../../src/transport/http-exporter-transport'; import * as http from 'http'; import * as assert from 'assert'; import sinon = require('sinon'); @@ -22,6 +22,7 @@ import { ExportResponseRetryable, ExportResponseFailure, ExportResponseSuccess, + OTLPExporterError, } from '../../src'; import * as zlib from 'zlib'; @@ -54,7 +55,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -80,7 +81,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -104,7 +105,7 @@ describe('HttpExporterTransport', function () { // act const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -123,13 +124,13 @@ describe('HttpExporterTransport', function () { // arrange server = http.createServer((_, res) => { res.statusCode = 404; - res.end(); + res.end('response-body'); }); server.listen(8080); const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -143,6 +144,14 @@ describe('HttpExporterTransport', function () { (result as ExportResponseFailure).error.message, 'Not Found' ); + assert.strictEqual( + ((result as ExportResponseFailure).error as OTLPExporterError).data, + 'response-body' + ); + assert.strictEqual( + ((result as ExportResponseFailure).error as OTLPExporterError).code, + 404 + ); }); it('returns failure when request times out', function (done) { @@ -158,7 +167,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -191,7 +200,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -212,7 +221,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ // use wrong port url: 'http://example.test', - headers: {}, + headers: () => ({}), compression: 'none', agentOptions: {}, }); @@ -262,7 +271,7 @@ describe('HttpExporterTransport', function () { // act const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: { foo: 'foo-value', bar: 'bar-value' }, + headers: () => ({ foo: 'foo-value', bar: 'bar-value' }), compression: 'none', agentOptions: {}, }); @@ -311,7 +320,7 @@ describe('HttpExporterTransport', function () { const transport = createHttpExporterTransport({ url: 'http://localhost:8080', - headers: { foo: 'foo-value', bar: 'bar-value' }, + headers: () => ({ foo: 'foo-value', bar: 'bar-value' }), compression: 'gzip', agentOptions: {}, }); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/otlp-exporter-base/test/node/http-transport-utils.test.ts similarity index 52% rename from experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts rename to experimental/packages/otlp-exporter-base/test/node/http-transport-utils.test.ts index e63d21b17c9..c7f673f3520 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts +++ b/experimental/packages/otlp-exporter-base/test/node/http-transport-utils.test.ts @@ -13,27 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import * as http from 'http'; +import * as assert from 'assert'; +import { compressAndSend } from '../../src/transport/http-transport-utils'; -import { Stream } from 'stream'; - -export class MockedResponse extends Stream { - constructor( - private _code: number, - private _msg?: string - ) { - super(); - } - - send(data: Uint8Array) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} +describe('compressAndSend', function () { + it('compressAndSend on destroyed request should handle error', function (done) { + const request = http.request({}); + request.destroy(); + compressAndSend(request, 'gzip', Buffer.from([1, 2, 3]), error => { + try { + assert.match(error.message, /socket hang up/); + done(); + } catch (e) { + done(e); + } + }); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts b/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts new file mode 100644 index 00000000000..e5cafc4df9d --- /dev/null +++ b/experimental/packages/otlp-exporter-base/test/node/otlp-http-export-delegate.test.ts @@ -0,0 +1,76 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { createOtlpHttpExportDelegate } from '../../src/otlp-http-export-delegate'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { ExportResultCode } from '@opentelemetry/core'; + +import * as sinon from 'sinon'; +import * as http from 'http'; +import * as assert from 'assert'; + +// IMPLEMENTATION NOTE: +// +// This file should only include rather simple test cases for integration testing the used components. +// Think: "is the correct component used?", rather than "does the underlying component work correctly?" +// Features and fixes for components that are used by createOtlpHttpExportDelegate() should be tested in-depth +// in the component's respective unit-test files. + +describe('createOtlpHttpExportDelegate', function () { + let server: http.Server; + beforeEach(function (done) { + server = http.createServer((request, response) => { + response.statusCode = 200; + response.end('Test Server Response'); + }); + server.listen(8083); + server.once('listening', () => { + done(); + }); + }); + + afterEach(function (done) { + server.close(() => { + done(); + }); + }); + + it('creates delegate that exports via http', function (done) { + const serializer: ISerializer = { + serializeRequest: sinon.stub().returns(Buffer.from([1, 2, 3])), + deserializeResponse: sinon.stub().returns('response'), + }; + const delegate = createOtlpHttpExportDelegate( + { + url: 'http://localhost:8083', + agentOptions: {}, + compression: 'none', + concurrencyLimit: 30, + headers: () => ({}), + timeoutMillis: 1000, + }, + serializer + ); + + delegate.export('foo', result => { + try { + assert.strictEqual(result.code, ExportResultCode.SUCCESS); + done(); + } catch (e) { + done(e); + } + }); + }); +}); diff --git a/experimental/packages/otlp-exporter-base/test/node/util.test.ts b/experimental/packages/otlp-exporter-base/test/node/util.test.ts deleted file mode 100644 index 93b70db1973..00000000000 --- a/experimental/packages/otlp-exporter-base/test/node/util.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { OTLPExporterNodeBase } from '../../src/platform/node/OTLPExporterNodeBase'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; - -class Exporter extends OTLPExporterNodeBase {} - -const noopSerializer: ISerializer = { - serializeRequest(request: object): Uint8Array | undefined { - return new Uint8Array(); - }, - deserializeResponse(data: Uint8Array): object { - return {}; - }, -}; - -describe('force flush', () => { - it('forceFlush should flush spans and return', async () => { - const exporter = new Exporter({}, noopSerializer, {}, 'TEST', 'v1/test'); - await exporter.forceFlush(); - }); -}); diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index a9f9677c29e..078acafb5d4 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -47,14 +47,14 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -65,9 +65,9 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", "sideEffects": false diff --git a/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts b/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts deleted file mode 100644 index e2ba61779bd..00000000000 --- a/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { diag } from '@opentelemetry/api'; -import { OTLPGRPCExporterConfigNode } from './types'; -import { - OTLPExporterBase, - OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; -import { - createEmptyMetadata, - GrpcExporterTransport, -} from './grpc-exporter-transport'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import { IExporterTransport } from '@opentelemetry/otlp-exporter-base'; -import { - getOtlpGrpcDefaultConfiguration, - mergeOtlpGrpcConfigurationWithDefaults, -} from './configuration/otlp-grpc-configuration'; -import { getOtlpGrpcConfigurationFromEnv } from './configuration/otlp-grpc-env-configuration'; - -/** - * OTLP Exporter abstract base class - */ -export abstract class OTLPGRPCExporterNodeBase< - ExportItem, - ServiceResponse, -> extends OTLPExporterBase { - private _transport: IExporterTransport; - private _serializer: ISerializer; - private _timeoutMillis: number; - - constructor( - config: OTLPGRPCExporterConfigNode = {}, - serializer: ISerializer, - grpcName: string, - grpcPath: string, - signalIdentifier: string - ) { - super(config); - // keep credentials locally in case user updates the reference on the config object - const userProvidedCredentials = config.credentials; - const actualConfig = mergeOtlpGrpcConfigurationWithDefaults( - { - url: config.url, - metadata: () => { - // metadata resolution strategy is merge, so we can return empty here, and it will not override the rest of the settings. - return config.metadata ?? createEmptyMetadata(); - }, - compression: config.compression, - timeoutMillis: config.timeoutMillis, - concurrencyLimit: config.concurrencyLimit, - credentials: - userProvidedCredentials != null - ? () => userProvidedCredentials - : undefined, - }, - getOtlpGrpcConfigurationFromEnv(signalIdentifier), - getOtlpGrpcDefaultConfiguration() - ); - this._serializer = serializer; - this._timeoutMillis = actualConfig.timeoutMillis; - this._concurrencyLimit = actualConfig.concurrencyLimit; - if (config.headers) { - diag.warn('Headers cannot be set when using grpc'); - } - - this._transport = new GrpcExporterTransport({ - address: actualConfig.url, - compression: actualConfig.compression, - credentials: actualConfig.credentials, - grpcName: grpcName, - grpcPath: grpcPath, - metadata: actualConfig.metadata, - }); - } - - override onShutdown() { - this._transport.shutdown(); - } - - send( - objects: ExportItem[], - onSuccess: () => void, - onError: (error: OTLPExporterError) => void - ): void { - if (this._shutdownOnce.isCalled) { - diag.debug('Shutdown already started. Cannot send objects'); - return; - } - - const data = this._serializer.serializeRequest(objects); - - if (data == null) { - onError(new Error('Could not serialize message')); - return; - } - - const promise = this._transport - .send(data, this._timeoutMillis) - .then(response => { - if (response.status === 'success') { - onSuccess(); - } else if (response.status === 'failure' && response.error) { - onError(response.error); - } else if (response.status === 'retryable') { - onError(new OTLPExporterError('Export failed with retryable status')); - } else { - onError(new OTLPExporterError('Export failed with unknown error')); - } - }, onError); - - this._sendingPromises.push(promise); - const popPromise = () => { - const index = this._sendingPromises.indexOf(promise); - this._sendingPromises.splice(index, 1); - }; - promise.then(popPromise, popPromise); - } -} diff --git a/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts b/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts new file mode 100644 index 00000000000..2144f647fc6 --- /dev/null +++ b/experimental/packages/otlp-grpc-exporter-base/src/configuration/convert-legacy-otlp-grpc-options.ts @@ -0,0 +1,59 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { OTLPGRPCExporterConfigNode } from '../types'; +import { diag } from '@opentelemetry/api'; +import { + getOtlpGrpcDefaultConfiguration, + mergeOtlpGrpcConfigurationWithDefaults, + OtlpGrpcConfiguration, +} from './otlp-grpc-configuration'; +import { createEmptyMetadata } from '../grpc-exporter-transport'; +import { getOtlpGrpcConfigurationFromEnv } from './otlp-grpc-env-configuration'; + +/** + * @deprecated + * @param config + * @param signalIdentifier + */ +export function convertLegacyOtlpGrpcOptions( + config: OTLPGRPCExporterConfigNode, + signalIdentifier: string +): OtlpGrpcConfiguration { + if (config.headers) { + diag.warn('Headers cannot be set when using grpc'); + } + + // keep credentials locally in case user updates the reference on the config object + const userProvidedCredentials = config.credentials; + return mergeOtlpGrpcConfigurationWithDefaults( + { + url: config.url, + metadata: () => { + // metadata resolution strategy is merge, so we can return empty here, and it will not override the rest of the settings. + return config.metadata ?? createEmptyMetadata(); + }, + compression: config.compression, + timeoutMillis: config.timeoutMillis, + concurrencyLimit: config.concurrencyLimit, + credentials: + userProvidedCredentials != null + ? () => userProvidedCredentials + : undefined, + }, + getOtlpGrpcConfigurationFromEnv(signalIdentifier), + getOtlpGrpcDefaultConfiguration() + ); +} diff --git a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts index 6ad8926604d..e0c10adcd45 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/configuration/otlp-grpc-env-configuration.ts @@ -21,7 +21,7 @@ import { createInsecureCredentials, createSslCredentials, } from '../grpc-exporter-transport'; -import { getSharedConfigurationFromEnvironment } from '@opentelemetry/otlp-exporter-base'; +import { getSharedConfigurationFromEnvironment } from '@opentelemetry/otlp-exporter-base/node-http'; import * as fs from 'fs'; import * as path from 'path'; import { diag } from '@opentelemetry/api'; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts b/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts index d3f3b193e63..40044d94485 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts @@ -177,3 +177,9 @@ export class GrpcExporterTransport implements IExporterTransport { }); } } + +export function createOtlpGrpcExporterTransport( + options: GrpcExporterTransportParameters +): IExporterTransport { + return new GrpcExporterTransport(options); +} diff --git a/experimental/packages/otlp-grpc-exporter-base/src/index.ts b/experimental/packages/otlp-grpc-exporter-base/src/index.ts index 3a445ed91bf..ef58b2a0345 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/index.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/index.ts @@ -14,5 +14,6 @@ * limitations under the License. */ -export { OTLPGRPCExporterNodeBase } from './OTLPGRPCExporterNodeBase'; +export { convertLegacyOtlpGrpcOptions } from './configuration/convert-legacy-otlp-grpc-options'; +export { createOtlpGrpcExportDelegate } from './otlp-grpc-export-delegate'; export { OTLPGRPCExporterConfigNode } from './types'; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts b/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts new file mode 100644 index 00000000000..d8ad1a8bba7 --- /dev/null +++ b/experimental/packages/otlp-grpc-exporter-base/src/otlp-grpc-export-delegate.ts @@ -0,0 +1,43 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + createOtlpNetworkExportDelegate, + IOtlpExportDelegate, +} from '@opentelemetry/otlp-exporter-base'; +import { ISerializer } from '@opentelemetry/otlp-transformer'; +import { OtlpGrpcConfiguration } from './configuration/otlp-grpc-configuration'; +import { createOtlpGrpcExporterTransport } from './grpc-exporter-transport'; + +export function createOtlpGrpcExportDelegate( + options: OtlpGrpcConfiguration, + serializer: ISerializer, + grpcName: string, + grpcPath: string +): IOtlpExportDelegate { + return createOtlpNetworkExportDelegate( + options, + serializer, + createOtlpGrpcExporterTransport({ + address: options.url, + compression: options.compression, + credentials: options.credentials, + metadata: options.metadata, + grpcName, + grpcPath, + }) + ); +} diff --git a/experimental/packages/otlp-grpc-exporter-base/test/OTLPGRPCExporterNodeBase.test.ts b/experimental/packages/otlp-grpc-exporter-base/test/OTLPGRPCExporterNodeBase.test.ts deleted file mode 100644 index 037fc53895e..00000000000 --- a/experimental/packages/otlp-grpc-exporter-base/test/OTLPGRPCExporterNodeBase.test.ts +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import { OTLPGRPCExporterNodeBase } from '../src/OTLPGRPCExporterNodeBase'; -import { mockedReadableSpan } from './traceHelper'; -import { - ExportResponse, - ExportResponseSuccess, - IExporterTransport, -} from '@opentelemetry/otlp-exporter-base'; -import { ISerializer } from '@opentelemetry/otlp-transformer'; -import sinon = require('sinon'); - -class MockCollectorExporter extends OTLPGRPCExporterNodeBase< - ReadableSpan, - any -> {} - -const successfulResponse: ExportResponseSuccess = { - status: 'success', -}; - -describe('OTLPGRPCExporterNodeBase', () => { - let exporter: MockCollectorExporter; - const concurrencyLimit = 5; - - beforeEach(done => { - const transportStubs = { - // make transport succeed - send: sinon.stub().resolves(successfulResponse), - shutdown: sinon.stub(), - }; - const mockTransport = transportStubs; - - const serializerStubs = { - serializeRequest: sinon.stub().resolves(Buffer.from([1, 2, 3])), - deserializeResponse: sinon - .stub() - .resolves({ responseKey: 'responseValue' }), - }; - - const serializer = >serializerStubs; - - exporter = new MockCollectorExporter( - { concurrencyLimit }, - serializer, - 'grpcName', - 'grpcPath', - 'SIGNAL' - ); - - exporter['_transport'] = mockTransport; - done(); - }); - - afterEach(function () { - sinon.restore(); - }); - - describe('export', () => { - it('should export requests concurrently', async () => { - const sendResolveFunctions: ((response: ExportResponse) => void)[] = []; - const transportStubs = { - send: sinon.stub().returns( - new Promise(resolve => { - sendResolveFunctions.push(resolve); - }) - ), - shutdown: sinon.stub(), - }; - exporter['_transport'] = transportStubs; - - const spans = [Object.assign({}, mockedReadableSpan)]; - const numToExport = concurrencyLimit; - - for (let i = 0; i < numToExport; ++i) { - exporter.export(spans, () => {}); - } - - assert.strictEqual(exporter['_sendingPromises'].length, numToExport); - const promisesAllDone = Promise.all(exporter['_sendingPromises']); - // Mock that all requests finish sending - sendResolveFunctions.forEach(resolve => resolve(successfulResponse)); - - // All finished promises should be popped off - await promisesAllDone; - assert.strictEqual(exporter['_sendingPromises'].length, 0); - }); - - it('should drop new export requests when already sending at concurrencyLimit', async () => { - const sendResolveFunctions: ((response: ExportResponse) => void)[] = []; - const transportStubs = { - send: sinon.stub().returns( - new Promise(resolve => { - sendResolveFunctions.push(resolve); - }) - ), - shutdown: sinon.stub(), - }; - exporter['_transport'] = transportStubs; - - const spans = [Object.assign({}, mockedReadableSpan)]; - const numToExport = concurrencyLimit + 5; - - for (let i = 0; i < numToExport; ++i) { - exporter.export(spans, () => {}); - } - - assert.strictEqual(exporter['_sendingPromises'].length, concurrencyLimit); - const promisesAllDone = Promise.all(exporter['_sendingPromises']); - // Mock that all requests finish sending - sendResolveFunctions.forEach(resolve => resolve(successfulResponse)); - - // All finished promises should be popped off - await promisesAllDone; - assert.strictEqual(exporter['_sendingPromises'].length, 0); - }); - - it('should pop export request promises even if they failed', async () => { - const sendRejectFunctions: ((error: Error) => void)[] = []; - const transportStubs = { - send: sinon.stub().returns( - new Promise((_, reject) => { - sendRejectFunctions.push(reject); - }) - ), - shutdown: sinon.stub(), - }; - exporter['_transport'] = transportStubs; - - const spans = [Object.assign({}, mockedReadableSpan)]; - - exporter.export(spans, () => {}); - assert.strictEqual(exporter['_sendingPromises'].length, 1); - const promisesAllDone = Promise.all(exporter['_sendingPromises']); - // Mock that all requests fail sending - sendRejectFunctions.forEach(reject => reject(new Error('export failed'))); - - // All finished promises should be popped off - await promisesAllDone; - assert.strictEqual(exporter['_sendingPromises'].length, 0); - }); - - it('should pop export request promises even if resolve throws error', async () => { - const transportStubs = { - send: sinon.stub().returns( - new Promise(_ => { - throw new Error('this failed'); - }) - ), - shutdown: sinon.stub(), - }; - exporter['_transport'] = transportStubs; - - const spans = [Object.assign({}, mockedReadableSpan)]; - exporter.export(spans, () => {}); - - assert.strictEqual(exporter['_sendingPromises'].length, 1); - - const promisesAllDone = Promise.all(exporter['_sendingPromises']) - // catch expected unhandled exception - .catch(() => {}); - - // All finished promises should be popped off - await promisesAllDone; - assert.strictEqual(exporter['_sendingPromises'].length, 0); - }); - }); - - describe('shutdown', function () { - it('calls shutdown on transport', function () { - const transportStubs = { - send: sinon.stub(), - shutdown: sinon.stub(), - }; - exporter['_transport'] = transportStubs; - exporter.shutdown(); - sinon.assert.calledOnce(transportStubs.shutdown); - }); - }); -}); diff --git a/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts b/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts index 28acc9cba15..69b906e895a 100644 --- a/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts +++ b/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts @@ -16,6 +16,7 @@ import { createEmptyMetadata, createInsecureCredentials, + createOtlpGrpcExporterTransport, createSslCredentials, GrpcExporterTransport, GrpcExporterTransportParameters, @@ -110,6 +111,40 @@ function startServer(context: ServerTestContext): Promise<() => void> { }); } +/** + * Starts a customizable server that saves all responses to context.responses + * Returns data as defined in context.ServerResponseProvider + * + * @return shutdown handle, needs to be called to ensure that mocha exits + * @param context context for storing responses and to define server behavior. + */ +function startUdsServer(context: ServerTestContext): Promise<() => void> { + const server = new Server(); + server.addService(testServiceDefinition, { + export: (data: ExportedData, callback: any) => { + context.requests.push(data); + const response = context.serverResponseProvider(); + callback(response.error, response.buffer); + }, + }); + + return new Promise<() => void>((resolve, reject) => { + server.bindAsync( + 'unix:///tmp/otlp-test.sock', + ServerCredentials.createInsecure(), + (error, port) => { + server.start(); + if (error != null) { + reject(error); + } + resolve(() => { + server.forceShutdown(); + }); + } + ); + }); +} + describe('GrpcExporterTransport', function () { describe('utilities', function () { describe('createEmptyMetadata', function () { @@ -177,7 +212,7 @@ describe('GrpcExporterTransport', function () { }); it('before send() does not error', function () { - const transport = new GrpcExporterTransport(simpleClientConfig); + const transport = createOtlpGrpcExporterTransport(simpleClientConfig); transport.shutdown(); // no assertions, just checking that it does not throw any errors. @@ -198,149 +233,202 @@ describe('GrpcExporterTransport', function () { }); }); describe('send', function () { - let shutdownHandle: () => void | undefined; - const serverTestContext: ServerTestContext = { - requests: [], - serverResponseProvider: () => { - return { error: null, buffer: Buffer.from([]) }; - }, - }; + describe('http2', function () { + let shutdownHandle: () => void | undefined; + const serverTestContext: ServerTestContext = { + requests: [], + serverResponseProvider: () => { + return { error: null, buffer: Buffer.from([]) }; + }, + }; - beforeEach(async function () { - shutdownHandle = await startServer(serverTestContext); - }); + beforeEach(async function () { + shutdownHandle = await startServer(serverTestContext); + }); - afterEach(function () { - shutdownHandle(); + afterEach(function () { + shutdownHandle(); - // clear context - serverTestContext.requests = []; - serverTestContext.serverResponseProvider = () => { - return { error: null, buffer: Buffer.from([]) }; - }; - }); + // clear context + serverTestContext.requests = []; + serverTestContext.serverResponseProvider = () => { + return { error: null, buffer: Buffer.from([]) }; + }; + }); - it('sends data', async function () { - const transport = new GrpcExporterTransport(simpleClientConfig); + it('sends data', async function () { + const transport = createOtlpGrpcExporterTransport(simpleClientConfig); - const result = (await transport.send( - Buffer.from([1, 2, 3]), - timeoutMillis - )) as ExportResponseSuccess; - - assert.strictEqual(result.status, 'success'); - assert.deepEqual(result.data, Buffer.from([])); - assert.strictEqual(serverTestContext.requests.length, 1); - assert.deepEqual( - serverTestContext.requests[0].request, - Buffer.from([1, 2, 3]) - ); - assert.deepEqual( - serverTestContext.requests[0].metadata.get('foo'), - simpleClientConfig.metadata().get('foo') - ); - }); + const result = (await transport.send( + Buffer.from([1, 2, 3]), + timeoutMillis + )) as ExportResponseSuccess; - it('forwards response', async function () { - const expectedResponseData = Buffer.from([1, 2, 3]); - serverTestContext.serverResponseProvider = () => { - return { - buffer: expectedResponseData, - error: null, + assert.strictEqual(result.status, 'success'); + assert.deepEqual(result.data, Buffer.from([])); + assert.strictEqual(serverTestContext.requests.length, 1); + assert.deepEqual( + serverTestContext.requests[0].request, + Buffer.from([1, 2, 3]) + ); + assert.deepEqual( + serverTestContext.requests[0].metadata.get('foo'), + simpleClientConfig.metadata().get('foo') + ); + }); + + it('forwards response', async function () { + const expectedResponseData = Buffer.from([1, 2, 3]); + serverTestContext.serverResponseProvider = () => { + return { + buffer: expectedResponseData, + error: null, + }; }; - }; - const transport = new GrpcExporterTransport(simpleClientConfig); + const transport = createOtlpGrpcExporterTransport(simpleClientConfig); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseSuccess; + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseSuccess; - assert.strictEqual(result.status, 'success'); - assert.deepEqual(result.data, expectedResponseData); - }); + assert.strictEqual(result.status, 'success'); + assert.deepEqual(result.data, expectedResponseData); + }); - it('forwards handled server error as failure', async function () { - serverTestContext.serverResponseProvider = () => { - return { - buffer: Buffer.from([]), - error: new Error('handled server error'), + it('forwards handled server error as failure', async function () { + serverTestContext.serverResponseProvider = () => { + return { + buffer: Buffer.from([]), + error: new Error('handled server error'), + }; }; - }; - const transport = new GrpcExporterTransport(simpleClientConfig); + const transport = createOtlpGrpcExporterTransport(simpleClientConfig); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseFailure; + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseFailure; - assert.strictEqual(result.status, 'failure'); - assert.ok(types.isNativeError(result.error)); - }); + assert.strictEqual(result.status, 'failure'); + assert.ok(types.isNativeError(result.error)); + }); - it('forwards unhandled server error as failure', async function () { - serverTestContext.serverResponseProvider = () => { - throw new Error('unhandled server error'); - }; - const transport = new GrpcExporterTransport(simpleClientConfig); + it('forwards unhandled server error as failure', async function () { + serverTestContext.serverResponseProvider = () => { + throw new Error('unhandled server error'); + }; + const transport = createOtlpGrpcExporterTransport(simpleClientConfig); + + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseFailure; + assert.strictEqual(result.status, 'failure'); + assert.ok(types.isNativeError(result.error)); + }); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseFailure; - assert.strictEqual(result.status, 'failure'); - assert.ok(types.isNativeError(result.error)); - }); + it('forwards metadataProvider error as failure', async function () { + const expectedError = new Error('metadata provider error'); + const config = Object.assign({}, simpleClientConfig); + config.metadata = () => { + throw expectedError; + }; - it('forwards metadataProvider error as failure', async function () { - const expectedError = new Error('metadata provider error'); - const config = Object.assign({}, simpleClientConfig); - config.metadata = () => { - throw expectedError; - }; + const transport = createOtlpGrpcExporterTransport(config); - const transport = new GrpcExporterTransport(config); + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseFailure; + assert.strictEqual(result.status, 'failure'); + assert.strictEqual(result.error, expectedError); + }); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseFailure; - assert.strictEqual(result.status, 'failure'); - assert.strictEqual(result.error, expectedError); - }); + it('forwards metadataProvider returns null value as failure', async function () { + const expectedError = new Error('metadata was null'); + const config = Object.assign({}, simpleClientConfig); + config.metadata = () => { + return null as unknown as Metadata; + }; - it('forwards metadataProvider returns null value as failure', async function () { - const expectedError = new Error('metadata was null'); - const config = Object.assign({}, simpleClientConfig); - config.metadata = () => { - return null as unknown as Metadata; - }; + const transport = createOtlpGrpcExporterTransport(config); - const transport = new GrpcExporterTransport(config); + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseFailure; + assert.strictEqual(result.status, 'failure'); + assert.deepEqual(result.error, expectedError); + }); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseFailure; - assert.strictEqual(result.status, 'failure'); - assert.deepEqual(result.error, expectedError); - }); + it('forwards credential error as failure', async function () { + const expectedError = new Error('credential provider error'); + const config = Object.assign({}, simpleClientConfig); + config.credentials = () => { + throw expectedError; + }; + + const transport = createOtlpGrpcExporterTransport(config); - it('forwards credential error as failure', async function () { - const expectedError = new Error('credential provider error'); - const config = Object.assign({}, simpleClientConfig); - config.credentials = () => { - throw expectedError; + const result = (await transport.send( + Buffer.from([]), + timeoutMillis + )) as ExportResponseFailure; + assert.strictEqual(result.status, 'failure'); + assert.strictEqual(result.error, expectedError); + }); + }); + describe('uds', function () { + let shutdownHandle: (() => void) | undefined; + const serverTestContext: ServerTestContext = { + requests: [], + serverResponseProvider: () => { + return { error: null, buffer: Buffer.from([]) }; + }, }; - const transport = new GrpcExporterTransport(config); + beforeEach(async function () { + // skip uds tests on windows + if (process.platform === 'win32') { + this.skip(); + } + shutdownHandle = await startUdsServer(serverTestContext); + }); + + afterEach(function () { + shutdownHandle?.(); + + // clear context + serverTestContext.requests = []; + serverTestContext.serverResponseProvider = () => { + return { error: null, buffer: Buffer.from([]) }; + }; + }); + + it('sends data', async function () { + const transport = createOtlpGrpcExporterTransport({ + ...simpleClientConfig, + address: 'unix:///tmp/otlp-test.sock', + }); - const result = (await transport.send( - Buffer.from([]), - timeoutMillis - )) as ExportResponseFailure; - assert.strictEqual(result.status, 'failure'); - assert.strictEqual(result.error, expectedError); + const result = (await transport.send( + Buffer.from([1, 2, 3]), + timeoutMillis + )) as ExportResponseSuccess; + + assert.strictEqual(result.status, 'success'); + assert.deepEqual(result.data, Buffer.from([])); + assert.strictEqual(serverTestContext.requests.length, 1); + assert.deepEqual( + serverTestContext.requests[0].request, + Buffer.from([1, 2, 3]) + ); + assert.deepEqual( + serverTestContext.requests[0].metadata.get('foo'), + simpleClientConfig.metadata().get('foo') + ); + }); }); }); }); diff --git a/experimental/packages/otlp-grpc-exporter-base/test/traceHelper.ts b/experimental/packages/otlp-grpc-exporter-base/test/traceHelper.ts deleted file mode 100644 index 13103b405bf..00000000000 --- a/experimental/packages/otlp-grpc-exporter-base/test/traceHelper.ts +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import * as assert from 'assert'; -import * as grpc from '@grpc/grpc-js'; -import { VERSION } from '@opentelemetry/core'; -import { - IEvent, - IKeyValue, - ILink, - IResource, - ISpan, -} from '@opentelemetry/otlp-transformer'; - -const traceIdArr = [ - 31, 16, 8, 220, 142, 39, 14, 133, 196, 10, 13, 124, 57, 57, 178, 120, -]; -const spanIdArr = [94, 16, 114, 97, 246, 79, 165, 62]; -const parentIdArr = [120, 168, 145, 80, 152, 134, 67, 136]; - -export const mockedReadableSpan: ReadableSpan = { - name: 'documentFetch', - kind: 0, - spanContext: () => { - return { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '5e107261f64fa53e', - traceFlags: TraceFlags.SAMPLED, - }; - }, - parentSpanId: '78a8915098864388', - startTime: [1574120165, 429803070], - endTime: [1574120165, 438688070], - ended: true, - status: { code: SpanStatusCode.OK }, - attributes: { component: 'document-load' }, - links: [ - { - context: { - traceId: '1f1008dc8e270e85c40a0d7c3939b278', - spanId: '78a8915098864388', - traceFlags: TraceFlags.SAMPLED, - }, - attributes: { component: 'document-load' }, - }, - ], - events: [ - { - name: 'fetchStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupStart', - time: [1574120165, 429803070], - }, - { - name: 'domainLookupEnd', - time: [1574120165, 429803070], - }, - { - name: 'connectStart', - time: [1574120165, 429803070], - }, - { - name: 'connectEnd', - time: [1574120165, 429803070], - }, - { - name: 'requestStart', - time: [1574120165, 435513070], - }, - { - name: 'responseStart', - time: [1574120165, 436923070], - }, - { - name: 'responseEnd', - time: [1574120165, 438688070], - }, - ], - duration: [0, 8885000], - resource: Resource.default().merge( - new Resource({ - service: 'ui', - version: 1, - cost: 112.12, - }) - ), - instrumentationLibrary: { name: 'default', version: '0.0.1' }, - droppedAttributesCount: 0, - droppedEventsCount: 0, - droppedLinksCount: 0, -}; - -export function ensureExportedEventsAreCorrect(events: IEvent[]) { - assert.deepStrictEqual( - events, - [ - { - attributes: [], - timeUnixNano: '1574120165429803008', - name: 'fetchStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803008', - name: 'domainLookupStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803008', - name: 'domainLookupEnd', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803008', - name: 'connectStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165429803008', - name: 'connectEnd', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165435513088', - name: 'requestStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165436923136', - name: 'responseStart', - droppedAttributesCount: 0, - }, - { - attributes: [], - timeUnixNano: '1574120165438688000', - name: 'responseEnd', - droppedAttributesCount: 0, - }, - ], - 'exported events are incorrect' - ); -} - -export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { - assert.deepStrictEqual( - attributes, - [ - { - key: 'component', - value: { - stringValue: 'document-load', - value: 'stringValue', - }, - }, - ], - 'exported attributes are incorrect' - ); -} - -export function ensureExportedLinksAreCorrect(attributes: ILink[]) { - assert.deepStrictEqual( - attributes, - [ - { - attributes: [ - { - key: 'component', - value: { - stringValue: 'document-load', - value: 'stringValue', - }, - }, - ], - traceId: Buffer.from(traceIdArr), - spanId: Buffer.from(parentIdArr), - traceState: '', - droppedAttributesCount: 0, - }, - ], - 'exported links are incorrect' - ); -} - -export function ensureExportedSpanIsCorrect(span: ISpan) { - if (span.attributes) { - ensureExportedAttributesAreCorrect(span.attributes); - } - if (span.events) { - ensureExportedEventsAreCorrect(span.events); - } - if (span.links) { - ensureExportedLinksAreCorrect(span.links); - } - assert.deepStrictEqual( - span.traceId, - Buffer.from(traceIdArr), - 'traceId is wrong' - ); - assert.deepStrictEqual( - span.spanId, - Buffer.from(spanIdArr), - 'spanId is wrong' - ); - assert.strictEqual(span.traceState, '', 'traceState is wrong'); - assert.deepStrictEqual( - span.parentSpanId, - Buffer.from(parentIdArr), - 'parentIdArr is wrong' - ); - assert.strictEqual(span.name, 'documentFetch', 'name is wrong'); - assert.strictEqual(span.kind, 'SPAN_KIND_INTERNAL', 'kind is wrong'); - assert.strictEqual( - span.startTimeUnixNano, - '1574120165429803008', - 'startTimeUnixNano is wrong' - ); - assert.strictEqual( - span.endTimeUnixNano, - '1574120165438688000', - 'endTimeUnixNano is wrong' - ); - assert.strictEqual( - span.droppedAttributesCount, - 0, - 'droppedAttributesCount is wrong' - ); - assert.strictEqual(span.droppedEventsCount, 0, 'droppedEventsCount is wrong'); - assert.strictEqual(span.droppedLinksCount, 0, 'droppedLinksCount is wrong'); - assert.deepStrictEqual( - span.status, - { - code: 'STATUS_CODE_OK', - deprecatedCode: 'DEPRECATED_STATUS_CODE_OK', - message: '', - }, - 'status is wrong' - ); -} - -export function ensureResourceIsCorrect(resource: IResource) { - assert.deepStrictEqual(resource, { - attributes: [ - { - key: 'service.name', - value: { - stringValue: `unknown_service:${process.argv0}`, - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.language', - value: { - stringValue: 'nodejs', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.name', - value: { - stringValue: 'opentelemetry', - value: 'stringValue', - }, - }, - { - key: 'telemetry.sdk.version', - value: { - stringValue: VERSION, - value: 'stringValue', - }, - }, - { - key: 'service', - value: { - stringValue: 'ui', - value: 'stringValue', - }, - }, - { - key: 'version', - value: { - intValue: '1', - value: 'intValue', - }, - }, - { - key: 'cost', - value: { - doubleValue: 112.12, - value: 'doubleValue', - }, - }, - ], - droppedAttributesCount: 0, - }); -} - -export function ensureMetadataIsCorrect( - actual: grpc.Metadata, - expected: grpc.Metadata -) { - //ignore user agent - expected.remove('user-agent'); - actual.remove('user-agent'); - assert.deepStrictEqual(actual.getMap(), expected.getMap()); -} diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 413fc04ac70..640f8a43dde 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.53.0", + "version": "0.55.0", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -62,7 +62,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", "cross-var": "1.1.0", @@ -73,20 +73,20 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "protobufjs-cli": "1.1.3", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "protobufjs": "^7.3.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", diff --git a/experimental/packages/otlp-transformer/src/json/serializers.ts b/experimental/packages/otlp-transformer/src/json/serializers.ts index 5d360faf47f..d21070d98ce 100644 --- a/experimental/packages/otlp-transformer/src/json/serializers.ts +++ b/experimental/packages/otlp-transformer/src/json/serializers.ts @@ -43,11 +43,11 @@ export const JsonTraceSerializer: ISerializer< }; export const JsonMetricsSerializer: ISerializer< - ResourceMetrics[], + ResourceMetrics, IExportMetricsServiceResponse > = { - serializeRequest: (arg: ResourceMetrics[]) => { - const request = createExportMetricsServiceRequest(arg, { + serializeRequest: (arg: ResourceMetrics) => { + const request = createExportMetricsServiceRequest([arg], { useLongBits: false, }); const encoder = new TextEncoder(); diff --git a/experimental/packages/otlp-transformer/src/protobuf/serializers.ts b/experimental/packages/otlp-transformer/src/protobuf/serializers.ts index ce2d0d94098..ff73ab67f22 100644 --- a/experimental/packages/otlp-transformer/src/protobuf/serializers.ts +++ b/experimental/packages/otlp-transformer/src/protobuf/serializers.ts @@ -68,11 +68,11 @@ export const ProtobufLogsSerializer: ISerializer< }; export const ProtobufMetricsSerializer: ISerializer< - ResourceMetrics[], + ResourceMetrics, IExportMetricsServiceResponse > = { - serializeRequest: (arg: ResourceMetrics[]) => { - const request = createExportMetricsServiceRequest(arg); + serializeRequest: (arg: ResourceMetrics) => { + const request = createExportMetricsServiceRequest([arg]); return metricsRequestType.encode(request).finish(); }, deserializeResponse: (arg: Uint8Array) => { diff --git a/experimental/packages/otlp-transformer/test/metrics.test.ts b/experimental/packages/otlp-transformer/test/metrics.test.ts index 54d67cde86f..06d357102ef 100644 --- a/experimental/packages/otlp-transformer/test/metrics.test.ts +++ b/experimental/packages/otlp-transformer/test/metrics.test.ts @@ -788,11 +788,11 @@ describe('Metrics', () => { describe('ProtobufMetricsSerializer', function () { it('serializes an export request', () => { - const serialized = ProtobufMetricsSerializer.serializeRequest([ + const serialized = ProtobufMetricsSerializer.serializeRequest( createResourceMetrics([ createCounterData(10, AggregationTemporality.DELTA), - ]), - ]); + ]) + ); assert.ok(serialized, 'serialized response is undefined'); const decoded = root.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest.decode( @@ -873,11 +873,11 @@ describe('Metrics', () => { describe('JsonMetricsSerializer', function () { it('serializes an export request', () => { - const serialized = JsonMetricsSerializer.serializeRequest([ + const serialized = JsonMetricsSerializer.serializeRequest( createResourceMetrics([ createCounterData(10, AggregationTemporality.DELTA), - ]), - ]); + ]) + ); const decoder = new TextDecoder(); const expected = { diff --git a/experimental/packages/propagator-aws-xray-lambda/.eslintignore b/experimental/packages/propagator-aws-xray-lambda/.eslintignore deleted file mode 100644 index 378eac25d31..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/experimental/packages/propagator-aws-xray-lambda/.eslintrc.js b/experimental/packages/propagator-aws-xray-lambda/.eslintrc.js deleted file mode 100644 index 9baf1b49565..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.base.js') -} diff --git a/experimental/packages/propagator-aws-xray-lambda/.npmignore b/experimental/packages/propagator-aws-xray-lambda/.npmignore deleted file mode 100644 index 9505ba9450f..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -/bin -/coverage -/doc -/test diff --git a/experimental/packages/propagator-aws-xray-lambda/LICENSE b/experimental/packages/propagator-aws-xray-lambda/LICENSE deleted file mode 100644 index 261eeb9e9f8..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/experimental/packages/propagator-aws-xray-lambda/README.md b/experimental/packages/propagator-aws-xray-lambda/README.md deleted file mode 100644 index 33c1885ed98..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# OpenTelemetry Propagator AWS X-Ray-Lambda - -[![NPM Published Version][npm-img]][npm-url] -[![Apache License][license-image]][license-image] - -**Note: This is an experimental package under active development. New releases may include breaking changes.** - -The OpenTelemetry Propagator for AWS X-Ray Lambda provides propagation based on the X-Ray `_X_AMZN_TRACE_ID` environment -variable in addition to the AWS X-Ray HTTP headers. This propagator should be used only for an AWS Lambda instrumentation. - -## Usage - -The preferred method for using this propagator is by using the `OTEL_PROPAGATORS` environment variable. For more details, -see the [semantic conventions specification for AWS Lambda](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/faas/aws-lambda.md). - -## Propagator Details - -The propagator extracts context from the `_X_AMZN_TRACE_ID` environment variable, except when there is already another -context active. It also automatically uses the [AWS X-Ray propagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-aws-xray). - -## Useful links - -- For more information on OpenTelemetry, visit: -- For more about OpenTelemetry JavaScript: -- For help or feedback on this project, join us in [GitHub Discussions][discussions-url] - -## License - -Apache 2.0 - See [LICENSE][license-url] for more information. - -[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions -[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE -[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[npm-url]: https://www.npmjs.com/package/@opentelemetry/propagator-aws-xray -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fpropagator-aws-xray.svg diff --git a/experimental/packages/propagator-aws-xray-lambda/package.json b/experimental/packages/propagator-aws-xray-lambda/package.json deleted file mode 100644 index fe49aa4ce72..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "@opentelemetry/propagator-aws-xray-lambda", - "version": "0.53.0", - "description": "OpenTelemetry AWS Xray propagator provides context propagation for systems that are using AWS X-Ray format.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-aws-xray-lambda --include-dependencies", - "prewatch": "npm run precompile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc mocha test/**/*.test.ts", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "prepublishOnly": "npm run compile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "align-api-deps": "node ../../../scripts/align-api-deps.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "awsxray" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts" - ], - "publishConfig": { - "access": "public" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - }, - "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", - "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/sinon": "17.0.3", - "babel-loader": "8.4.1", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "9.5.1", - "typescript": "4.4.4" - }, - "dependencies": { - "@opentelemetry/propagator-aws-xray": "1.26.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/propagator-aws-xray-lambda#readme" -} diff --git a/experimental/packages/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts b/experimental/packages/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts deleted file mode 100644 index 51d7ca48891..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - Context, - TextMapPropagator, - TextMapSetter, - TextMapGetter, - isSpanContextValid, - defaultTextMapGetter, - trace, -} from '@opentelemetry/api'; -import { - AWSXRayPropagator, - AWSXRAY_TRACE_ID_HEADER, -} from '@opentelemetry/propagator-aws-xray'; - -export const AWSXRAY_TRACE_ID_ENV_VAR = '_X_AMZN_TRACE_ID'; - -/** - * Implementation of the AWS X-Ray Trace Header propagation protocol with special - * logic for handling Lambda X-ray environment variable. - * - * An example AWS Xray Tracing Header is shown below: - * X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1 - */ -export class AWSXRayLambdaPropagator implements TextMapPropagator { - private _awsXrayPropagator = new AWSXRayPropagator(); - - inject(context: Context, carrier: unknown, setter: TextMapSetter) { - this._awsXrayPropagator.inject(context, carrier, setter); - } - - extract(context: Context, carrier: unknown, getter: TextMapGetter): Context { - const xrayContext = this._awsXrayPropagator.extract( - context, - carrier, - getter - ); - - const spanContext = trace.getSpanContext(context); - if (spanContext && isSpanContextValid(spanContext)) { - return xrayContext; - } - - const xrayEnvVar = process.env[AWSXRAY_TRACE_ID_ENV_VAR]; - if (!xrayEnvVar) { - return xrayContext; - } - - return this._awsXrayPropagator.extract( - xrayContext, - { [AWSXRAY_TRACE_ID_HEADER]: xrayEnvVar }, - defaultTextMapGetter - ); - } - - fields(): string[] { - return this._awsXrayPropagator.fields(); - } -} diff --git a/experimental/packages/propagator-aws-xray-lambda/src/index.ts b/experimental/packages/propagator-aws-xray-lambda/src/index.ts deleted file mode 100644 index 0841580d074..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/src/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export { AWSXRayLambdaPropagator } from './AWSXRayLambdaPropagator'; diff --git a/experimental/packages/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts b/experimental/packages/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts deleted file mode 100644 index 23f01482c70..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import * as assert from 'assert'; - -import { - defaultTextMapGetter, - defaultTextMapSetter, - ROOT_CONTEXT, - SpanContext, - TraceFlags, - trace, - context, -} from '@opentelemetry/api'; -import * as sinon from 'sinon'; - -import { AWSXRayLambdaPropagator } from '../src'; -import { AWSXRAY_TRACE_ID_ENV_VAR } from '../src/AWSXRayLambdaPropagator'; -import { - AWSXRAY_TRACE_ID_HEADER, - AWSXRayPropagator, -} from '@opentelemetry/propagator-aws-xray'; - -describe('AWSXRayPropagator', () => { - const xrayLambdaPropagator = new AWSXRayLambdaPropagator(); - - let carrier: { [key: string]: unknown }; - - beforeEach(() => { - carrier = {}; - }); - - describe('.inject()', () => { - it('should use AWSXRayPropagator inject()', () => { - const spy = sinon.spy(AWSXRayPropagator.prototype, 'inject'); - assert.equal(spy.callCount, 0); - xrayLambdaPropagator.inject( - context.active(), - carrier, - defaultTextMapSetter - ); - sinon.assert.calledOnceWithExactly( - spy, - context.active(), - carrier, - defaultTextMapSetter - ); - }); - }); - - describe('.extract()', () => { - it('should extract context from the _X_AMZN_TRACE_ID env variable', () => { - const xrayEnvSpanId = '53995c3f42cd8ad8'; - const xrayEnvTraceId = '8a3c60f7d188f8fa79d48a391a778fa6'; - process.env[AWSXRAY_TRACE_ID_ENV_VAR] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - const extractedSpanContext = trace - .getSpan( - xrayLambdaPropagator.extract( - ROOT_CONTEXT, - carrier, - defaultTextMapGetter - ) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: xrayEnvTraceId, - spanId: xrayEnvSpanId, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should return current context if one exists', () => { - const traceId = 'fd14414f1e61351035c43863714b4aa8'; - const spanId = '81e77faacf9f61f3'; - const existingContext: SpanContext = { - traceId: traceId, - spanId: spanId, - traceFlags: TraceFlags.SAMPLED, - isRemote: true, - }; - const ctx = trace.setSpanContext(context.active(), existingContext); - - process.env[AWSXRAY_TRACE_ID_ENV_VAR] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - - const extractedSpanContext = trace - .getSpan( - xrayLambdaPropagator.extract(ctx, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: traceId, - spanId: spanId, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should return X-ray context from carrier when there is an existing context', () => { - const traceId = 'fd14414f1e61351035c43863714b4aa8'; - const spanId = '81e77faacf9f61f3'; - const existingContext: SpanContext = { - traceId: traceId, - spanId: spanId, - traceFlags: TraceFlags.SAMPLED, - isRemote: true, - }; - const ctx = trace.setSpanContext(context.active(), existingContext); - - process.env[AWSXRAY_TRACE_ID_ENV_VAR] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - - const xrayHeaderSpanId = '4635c8688f46eb5d'; - const xrayHeaderTraceId = '48165d1ad6255f4cb1ddf9999ef6d536'; - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-48165d1a-d6255f4cb1ddf9999ef6d536;Parent=4635c8688f46eb5d;Sampled=1'; - - const extractedSpanContext = trace - .getSpan( - xrayLambdaPropagator.extract(ctx, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: xrayHeaderTraceId, - spanId: xrayHeaderSpanId, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should return env variable context if there is no active context but carrier also has xray headers', () => { - const xrayEnvSpanId = '53995c3f42cd8ad8'; - const xrayEnvTraceId = '8a3c60f7d188f8fa79d48a391a778fa6'; - process.env[AWSXRAY_TRACE_ID_ENV_VAR] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-48165d1a-d6255f4cb1ddf9999ef6d536;Parent=4635c8688f46eb5d;Sampled=1'; - - const extractedSpanContext = trace - .getSpan( - xrayLambdaPropagator.extract( - context.active(), - carrier, - defaultTextMapGetter - ) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: xrayEnvTraceId, - spanId: xrayEnvSpanId, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should return current context if one exists', () => { - delete process.env[AWSXRAY_TRACE_ID_ENV_VAR]; - - const xrayHeaderSpanId = '53995c3f42cd8ad8'; - const xrayHeaderTraceId = '8a3c60f7d188f8fa79d48a391a778fa6'; - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - const extractedSpanContext = trace - .getSpan( - xrayLambdaPropagator.extract( - ROOT_CONTEXT, - carrier, - defaultTextMapGetter - ) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: xrayHeaderTraceId, - spanId: xrayHeaderSpanId, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - }); - - describe('.fields()', () => { - it('should return a field with AWS X-Ray Trace ID header', () => { - const actualFields = xrayLambdaPropagator.fields(); - assert.deepStrictEqual([AWSXRAY_TRACE_ID_HEADER], actualFields); - }); - }); -}); diff --git a/experimental/packages/propagator-aws-xray-lambda/test/index-webpack.ts b/experimental/packages/propagator-aws-xray-lambda/test/index-webpack.ts deleted file mode 100644 index 061a48ccfa7..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/test/index-webpack.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -const testsContext = require.context('.', true, /test$/); -testsContext.keys().forEach(testsContext); - -const srcContext = require.context('.', true, /src$/); -srcContext.keys().forEach(srcContext); diff --git a/experimental/packages/propagator-aws-xray-lambda/tsconfig.esm.json b/experimental/packages/propagator-aws-xray-lambda/tsconfig.esm.json deleted file mode 100644 index ed538d42992..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/propagator-aws-xray" - } - ] -} diff --git a/experimental/packages/propagator-aws-xray-lambda/tsconfig.esnext.json b/experimental/packages/propagator-aws-xray-lambda/tsconfig.esnext.json deleted file mode 100644 index 2eb63c9fd9d..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/propagator-aws-xray" - } - ] -} diff --git a/experimental/packages/propagator-aws-xray-lambda/tsconfig.json b/experimental/packages/propagator-aws-xray-lambda/tsconfig.json deleted file mode 100644 index 48c9ac9c8ab..00000000000 --- a/experimental/packages/propagator-aws-xray-lambda/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/propagator-aws-xray" - } - ] -} diff --git a/experimental/packages/sampler-jaeger-remote/package.json b/experimental/packages/sampler-jaeger-remote/package.json index c2c2572881b..096b74a895c 100644 --- a/experimental/packages/sampler-jaeger-remote/package.json +++ b/experimental/packages/sampler-jaeger-remote/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sampler-jaeger-remote", - "version": "0.53.0", + "version": "0.55.0", "description": "Jaeger Remote Sampler", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,13 +42,13 @@ "access": "public" }, "dependencies": { - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-trace-base": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", @@ -56,7 +56,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^5.1.3", "lerna": "6.6.2", - "mocha": "10.2.0", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", diff --git a/experimental/packages/sdk-events/package.json b/experimental/packages/sdk-events/package.json index 03c72bb8ada..29d5a471baa 100644 --- a/experimental/packages/sdk-events/package.json +++ b/experimental/packages/sdk-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-events", - "version": "0.53.0", + "version": "0.55.0", "publishConfig": { "access": "public" }, @@ -66,9 +66,9 @@ "@opentelemetry/api": ">=1.4.0 <1.10.0" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -82,18 +82,18 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, "dependencies": { - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" } } diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index c66114ee046..95817dc11d4 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-logs", - "version": "0.53.0", + "version": "0.55.0", "publishConfig": { "access": "public" }, @@ -95,11 +95,11 @@ "@opentelemetry/api": ">=1.4.0 <1.10.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.4.0 <1.10.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -111,18 +111,18 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" } } diff --git a/experimental/packages/sdk-logs/src/LoggerProvider.ts b/experimental/packages/sdk-logs/src/LoggerProvider.ts index bb15bfb33d5..0c59247d9a1 100644 --- a/experimental/packages/sdk-logs/src/LoggerProvider.ts +++ b/experimental/packages/sdk-logs/src/LoggerProvider.ts @@ -28,14 +28,27 @@ import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState' export const DEFAULT_LOGGER_NAME = 'unknown'; +function prepareResource( + mergeWithDefaults: boolean, + providedResource: Resource | undefined +) { + const resource = providedResource ?? Resource.empty(); + + if (mergeWithDefaults) { + return Resource.default().merge(resource); + } + return resource; +} + export class LoggerProvider implements logsAPI.LoggerProvider { protected _shutdownOnce: BindOnceFuture; protected readonly _sharedState: LoggerProviderSharedState; constructor(config: LoggerProviderConfig = {}) { const mergedConfig = merge({}, loadDefaultConfig(), config); - const resource = Resource.default().merge( - mergedConfig.resource ?? Resource.empty() + const resource = prepareResource( + mergedConfig.mergeResourceWithDefaults, + config.resource ); this._sharedState = new LoggerProviderSharedState( resource, diff --git a/experimental/packages/sdk-logs/src/config.ts b/experimental/packages/sdk-logs/src/config.ts index 91b2c3e4884..b61163b2fa8 100644 --- a/experimental/packages/sdk-logs/src/config.ts +++ b/experimental/packages/sdk-logs/src/config.ts @@ -31,6 +31,7 @@ export function loadDefaultConfig() { attributeCountLimit: getEnv().OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT, }, includeTraceContext: true, + mergeResourceWithDefaults: true, }; } diff --git a/experimental/packages/sdk-logs/src/types.ts b/experimental/packages/sdk-logs/src/types.ts index 27aefa540fe..de316a0e34a 100644 --- a/experimental/packages/sdk-logs/src/types.ts +++ b/experimental/packages/sdk-logs/src/types.ts @@ -28,6 +28,12 @@ export interface LoggerProviderConfig { /** Log Record Limits*/ logRecordLimits?: LogRecordLimits; + + /** + * Merge resource with {@link Resource.default()}? + * Default: {@code true} + */ + mergeResourceWithDefaults?: boolean; } export interface LogRecordLimits { diff --git a/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts b/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts index 1c5a8aa2312..b2499fce7e9 100644 --- a/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts +++ b/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts @@ -73,6 +73,29 @@ describe('LoggerProvider', () => { ); }); + it('should not merge with default resource attrs when flag is set to false', function () { + const passedInResource = new Resource({ foo: 'bar' }); + const provider = new LoggerProvider({ + resource: passedInResource, + mergeResourceWithDefaults: false, + }); + const { resource } = provider['_sharedState']; + assert.deepStrictEqual(resource, passedInResource); + }); + + it('should merge with default resource attrs when flag is set to true', function () { + const passedInResource = new Resource({ foo: 'bar' }); + const provider = new LoggerProvider({ + resource: passedInResource, + mergeResourceWithDefaults: true, + }); + const { resource } = provider['_sharedState']; + assert.deepStrictEqual( + resource, + Resource.default().merge(passedInResource) + ); + }); + it('should have default forceFlushTimeoutMillis if not pass', () => { const provider = new LoggerProvider(); const sharedState = provider['_sharedState']; diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 240c506b76f..6ebc9c1149d 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.53.0", + "version": "0.55.0", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,14 +50,14 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -67,9 +67,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2" }, diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index c0ba90589cd..226bf7a107a 100644 --- a/experimental/packages/web-common/package.json +++ b/experimental/packages/web-common/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/web-common", - "version": "0.53.0", + "version": "0.55.0", "publishConfig": { "access": "public" }, @@ -66,16 +66,16 @@ "@opentelemetry/api": ">=1.4.0 <1.10.0" }, "dependencies": { - "@opentelemetry/sdk-logs": "^0.53.0", - "@opentelemetry/sdk-trace-base": "^1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -89,12 +89,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json index 1edf1de0c28..15c5b83fea9 100644 --- a/integration-tests/api/package.json +++ b/integration-tests/api/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/integration-tests-api", - "version": "1.26.0", + "version": "1.28.0", "private": true, "publishConfig": { "access": "restricted" @@ -28,12 +28,12 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0" } } diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 8334545392b..b5be318ddb4 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.27.0", + "version": "1.29.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,10 +12,10 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "axios": "1.7.4", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "axios": "1.7.8", "body-parser": "1.20.3", "express": "4.20.0" }, diff --git a/package-lock.json b/package-lock.json index 29e06882ce9..8dae41dcac4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "5.0.1", - "gh-pages": "6.0.0", + "gh-pages": "6.2.0", "glob": "^11.0.0", "karma": "6.4.4", "karma-chrome-launcher": "3.1.0", @@ -44,9 +44,9 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "linkinator": "6.0.6", - "markdownlint-cli2": "0.13.0", - "prettier": "3.0.3", + "linkinator": "6.1.2", + "markdownlint-cli2": "0.15.0", + "prettier": "3.3.3", "process": "0.11.10", "semver": "7.6.3", "typedoc": "0.22.18", @@ -61,7 +61,7 @@ "version": "1.9.0", "license": "Apache-2.0", "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack": "5.28.5", @@ -78,30 +78,30 @@ "karma-webpack": "5.0.1", "lerna": "6.6.2", "memfs": "3.5.3", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", "unionfs": "4.5.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=8.0.0" } }, "examples/esm-http-ts": { - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "engines": { "node": ">=14" @@ -109,18 +109,18 @@ }, "examples/http": { "name": "http-example", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -131,18 +131,18 @@ }, "examples/https": { "name": "https-example", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -153,24 +153,24 @@ }, "examples/opentelemetry-web": { "name": "web-opentelemetry-example", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@babel/core": "^7.23.6", @@ -202,21 +202,21 @@ }, "examples/otlp-exporter-node": { "name": "example-otlp-exporter-node", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "engines": { "node": ">=14" @@ -224,11 +224,11 @@ }, "experimental/backwards-compatibility/node14": { "name": "backcompat-node14", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { "@types/node": "14.18.25", @@ -246,11 +246,11 @@ }, "experimental/backwards-compatibility/node16": { "name": "backcompat-node16", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { "@types/node": "16.11.52", @@ -268,14 +268,14 @@ }, "experimental/examples/events": { "name": "events-example", - "version": "0.53.0", + "version": "0.55.0", "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/sdk-events": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/sdk-events": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { "@types/node": "18.6.5", @@ -284,11 +284,11 @@ }, "experimental/examples/logs": { "name": "logs-example", - "version": "0.53.0", + "version": "0.55.0", "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { "@types/node": "18.6.5", @@ -296,20 +296,20 @@ } }, "experimental/examples/opencensus-shim": { - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opencensus/core": "0.1.0", "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@opentelemetry/shim-opencensus": "0.53.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@opentelemetry/shim-opencensus": "0.55.0" }, "engines": { "node": ">=14" @@ -317,24 +317,24 @@ }, "experimental/examples/prometheus": { "name": "prometheus-example", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0" } }, "experimental/packages/api-events": { "name": "@opentelemetry/api-events", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/api-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -346,11 +346,11 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -358,13 +358,13 @@ }, "experimental/packages/api-logs": { "name": "@opentelemetry/api-logs", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -376,11 +376,11 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -388,27 +388,27 @@ }, "experimental/packages/exporter-logs-otlp-grpc": { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -423,21 +423,21 @@ }, "experimental/packages/exporter-logs-otlp-http": { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -451,12 +451,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -469,22 +469,22 @@ }, "experimental/packages/exporter-logs-otlp-proto": { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -496,12 +496,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -514,26 +514,26 @@ }, "experimental/packages/exporter-trace-otlp-grpc": { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -548,20 +548,20 @@ }, "experimental/packages/exporter-trace-otlp-http": { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -575,12 +575,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -593,20 +593,20 @@ }, "experimental/packages/exporter-trace-otlp-proto": { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -618,12 +618,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -636,16 +636,16 @@ }, "experimental/packages/opentelemetry-browser-detector": { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/resources": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -657,12 +657,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -675,27 +675,27 @@ }, "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc": { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "devDependencies": { "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -710,20 +710,20 @@ }, "experimental/packages/opentelemetry-exporter-metrics-otlp-http": { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -737,12 +737,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -755,24 +755,24 @@ }, "experimental/packages/opentelemetry-exporter-metrics-otlp-proto": { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -787,22 +787,22 @@ }, "experimental/packages/opentelemetry-exporter-prometheus": { "name": "@opentelemetry/exporter-prometheus", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -816,10 +816,10 @@ }, "experimental/packages/opentelemetry-instrumentation": { "name": "@opentelemetry/instrumentation", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", + "@opentelemetry/api-logs": "0.55.0", "@types/shimmer": "^1.2.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", @@ -827,11 +827,11 @@ "shimmer": "^1.2.1" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", @@ -839,7 +839,6 @@ "babel-loader": "8.4.1", "babel-plugin-istanbul": "7.0.0", "codecov": "3.8.3", - "cpx2": "2.0.0", "cross-var": "1.1.0", "karma": "6.4.4", "karma-chrome-launcher": "3.1.0", @@ -848,12 +847,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -866,22 +865,22 @@ }, "experimental/packages/opentelemetry-instrumentation-fetch": { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -895,12 +894,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -913,31 +912,31 @@ }, "experimental/packages/opentelemetry-instrumentation-grpc": { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@bufbuild/buf": "1.21.0-1", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", "@protobuf-ts/grpc-transport": "2.9.4", "@protobuf-ts/runtime": "2.9.4", "@protobuf-ts/runtime-rpc": "2.9.4", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", @@ -952,31 +951,31 @@ }, "experimental/packages/opentelemetry-instrumentation-http": { "name": "@opentelemetry/instrumentation-http", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/semantic-conventions": "1.28.0", "forwarded-parse": "2.1.2", "semver": "^7.5.2" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "@types/superagent": "8.1.9", - "axios": "1.7.4", + "axios": "1.7.8", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "request": "2.88.2", @@ -992,35 +991,24 @@ "@opentelemetry/api": "^1.3.0" } }, - "experimental/packages/opentelemetry-instrumentation-http/node_modules/axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "experimental/packages/opentelemetry-instrumentation-xml-http-request": { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -1034,12 +1022,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -1052,37 +1040,37 @@ }, "experimental/packages/opentelemetry-sdk-node": { "name": "@opentelemetry/sdk-node", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-logs-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/exporter-logs-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-logs-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/exporter-logs-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/exporter-jaeger": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", @@ -1098,17 +1086,17 @@ }, "experimental/packages/otlp-exporter-base": { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-transformer": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-transformer": "0.55.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -1120,12 +1108,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -1138,24 +1126,24 @@ }, "experimental/packages/otlp-grpc-exporter-base": { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -1170,20 +1158,20 @@ }, "experimental/packages/otlp-transformer": { "name": "@opentelemetry/otlp-transformer", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "protobufjs": "^7.3.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", "cross-var": "1.1.0", @@ -1194,12 +1182,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "protobufjs-cli": "1.1.3", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -1208,46 +1196,15 @@ "@opentelemetry/api": "^1.3.0" } }, - "experimental/packages/propagator-aws-xray-lambda": { - "name": "@opentelemetry/propagator-aws-xray-lambda", - "version": "0.53.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/propagator-aws-xray": "1.26.0" - }, - "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", - "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/sinon": "17.0.3", - "babel-loader": "8.4.1", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "9.5.1", - "typescript": "4.4.4" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - } - }, "experimental/packages/sampler-jaeger-remote": { "name": "@opentelemetry/sampler-jaeger-remote", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-trace-base": "1.26.0" + "@opentelemetry/sdk-trace-base": "1.28.0" }, "devDependencies": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", @@ -1255,7 +1212,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^5.1.3", "lerna": "6.6.2", - "mocha": "10.2.0", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", @@ -1268,16 +1225,6 @@ "@opentelemetry/api": "^1.3.0" } }, - "experimental/packages/sampler-jaeger-remote/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "experimental/packages/sampler-jaeger-remote/node_modules/eslint-plugin-prettier": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", @@ -1308,79 +1255,6 @@ } } }, - "experimental/packages/sampler-jaeger-remote/node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "experimental/packages/sampler-jaeger-remote/node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "experimental/packages/sampler-jaeger-remote/node_modules/mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", - "dev": true, - "dependencies": { - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.4", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.2.0", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "5.0.1", - "ms": "2.1.3", - "nanoid": "3.3.3", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "workerpool": "6.2.1", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha.js" - }, - "engines": { - "node": ">= 14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" - } - }, "experimental/packages/sampler-jaeger-remote/node_modules/ts-loader": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.4.0.tgz", @@ -1403,17 +1277,17 @@ }, "experimental/packages/sdk-events": { "name": "@opentelemetry/sdk-events", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0" + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -1427,12 +1301,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -1454,19 +1328,19 @@ }, "experimental/packages/sdk-logs": { "name": "@opentelemetry/sdk-logs", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.4.0 <1.10.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -1478,12 +1352,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -1546,26 +1420,26 @@ }, "experimental/packages/shim-opencensus": { "name": "@opentelemetry/shim-opencensus", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2" }, "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -1580,19 +1454,19 @@ }, "experimental/packages/web-common": { "name": "@opentelemetry/web-common", - "version": "0.53.0", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/sdk-logs": "^0.53.0", - "@opentelemetry/sdk-trace-base": "^1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -1606,12 +1480,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -1633,16 +1507,16 @@ }, "integration-tests/api": { "name": "@opentelemetry/integration-tests-api", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0" }, "engines": { @@ -1650,14 +1524,14 @@ } }, "integration-tests/propagation-validation-server": { - "version": "1.27.0", + "version": "1.29.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "axios": "1.7.4", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "axios": "1.7.8", "body-parser": "1.20.3", "express": "4.20.0" }, @@ -1668,16 +1542,6 @@ "node": ">=14" } }, - "integration-tests/propagation-validation-server/node_modules/axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -1698,12 +1562,13 @@ "dev": true }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "dependencies": { - "@babel/highlight": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -1711,30 +1576,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", - "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -1759,54 +1624,55 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "dev": true, "dependencies": { - "@babel/types": "^7.25.6", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", + "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -1824,17 +1690,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", "semver": "^6.3.1" }, "engines": { @@ -1854,13 +1720,13 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", + "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.25.9", + "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, "engines": { @@ -1880,9 +1746,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz", + "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==", "dev": true, "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -1896,41 +1762,40 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1940,35 +1805,35 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1978,14 +1843,14 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", + "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", "dev": true, "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1995,178 +1860,92 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", + "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "dependencies": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", - "dev": true, - "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "dev": true, "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -2176,13 +1955,13 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz", + "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2192,12 +1971,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz", + "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2207,12 +1986,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2222,14 +2001,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2239,13 +2018,13 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", + "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2272,14 +2051,14 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz", - "integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz", + "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-decorators": "^7.24.7" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-syntax-decorators": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2300,52 +2079,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz", - "integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz", + "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2354,37 +2094,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz", + "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2394,138 +2110,12 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", - "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2551,12 +2141,12 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2566,15 +2156,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz", - "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz", + "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-remap-async-to-generator": "^7.25.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/traverse": "^7.25.4" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2584,14 +2173,14 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", - "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2601,12 +2190,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", + "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2616,12 +2205,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2631,13 +2220,13 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", + "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2647,14 +2236,13 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz", + "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2664,16 +2252,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", "globals": "^11.1.0" }, "engines": { @@ -2684,13 +2272,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2700,12 +2288,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2715,13 +2303,13 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2731,12 +2319,12 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2746,13 +2334,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2762,13 +2350,12 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", + "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2778,13 +2365,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", + "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2794,13 +2381,12 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", + "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2810,13 +2396,13 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2826,14 +2412,14 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2843,13 +2429,12 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", + "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2859,12 +2444,12 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2874,13 +2459,12 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", + "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2890,12 +2474,12 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2905,13 +2489,13 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2921,14 +2505,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", + "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2938,15 +2522,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2956,13 +2540,13 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2972,13 +2556,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2988,12 +2572,12 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3003,13 +2587,12 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz", + "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3019,13 +2602,12 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", + "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3035,15 +2617,14 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", + "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3053,13 +2634,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3069,13 +2650,12 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", + "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3085,14 +2665,13 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3102,12 +2681,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3117,13 +2696,13 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", + "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3133,15 +2712,14 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", + "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3151,12 +2729,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3166,12 +2744,12 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.9", "regenerator-transform": "^0.15.2" }, "engines": { @@ -3181,13 +2759,29 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-regexp-modifiers": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz", + "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3197,15 +2791,15 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz", - "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz", + "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.1", + "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", "semver": "^6.3.1" }, @@ -3226,12 +2820,12 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3241,13 +2835,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3257,12 +2851,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3272,12 +2866,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", + "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3287,12 +2881,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", + "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3302,12 +2896,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3317,13 +2911,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", + "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3333,13 +2927,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3349,13 +2943,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", + "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3365,93 +2959,79 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz", - "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.25.4", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz", + "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.7", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-import-assertions": "^7.26.0", + "@babel/plugin-syntax-import-attributes": "^7.26.0", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.4", - "@babel/plugin-transform-async-to-generator": "^7.24.7", - "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.25.0", - "@babel/plugin-transform-class-properties": "^7.25.4", - "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.25.4", - "@babel/plugin-transform-computed-properties": "^7.24.7", - "@babel/plugin-transform-destructuring": "^7.24.8", - "@babel/plugin-transform-dotall-regex": "^7.24.7", - "@babel/plugin-transform-duplicate-keys": "^7.24.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", - "@babel/plugin-transform-dynamic-import": "^7.24.7", - "@babel/plugin-transform-exponentiation-operator": "^7.24.7", - "@babel/plugin-transform-export-namespace-from": "^7.24.7", - "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.25.1", - "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.25.2", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", - "@babel/plugin-transform-member-expression-literals": "^7.24.7", - "@babel/plugin-transform-modules-amd": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.25.0", - "@babel/plugin-transform-modules-umd": "^7.24.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", - "@babel/plugin-transform-new-target": "^7.24.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", - "@babel/plugin-transform-numeric-separator": "^7.24.7", - "@babel/plugin-transform-object-rest-spread": "^7.24.7", - "@babel/plugin-transform-object-super": "^7.24.7", - "@babel/plugin-transform-optional-catch-binding": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.8", - "@babel/plugin-transform-parameters": "^7.24.7", - "@babel/plugin-transform-private-methods": "^7.25.4", - "@babel/plugin-transform-private-property-in-object": "^7.24.7", - "@babel/plugin-transform-property-literals": "^7.24.7", - "@babel/plugin-transform-regenerator": "^7.24.7", - "@babel/plugin-transform-reserved-words": "^7.24.7", - "@babel/plugin-transform-shorthand-properties": "^7.24.7", - "@babel/plugin-transform-spread": "^7.24.7", - "@babel/plugin-transform-sticky-regex": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/plugin-transform-typeof-symbol": "^7.24.8", - "@babel/plugin-transform-unicode-escapes": "^7.24.7", - "@babel/plugin-transform-unicode-property-regex": "^7.24.7", - "@babel/plugin-transform-unicode-regex": "^7.24.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.25.4", + "@babel/plugin-transform-arrow-functions": "^7.25.9", + "@babel/plugin-transform-async-generator-functions": "^7.25.9", + "@babel/plugin-transform-async-to-generator": "^7.25.9", + "@babel/plugin-transform-block-scoped-functions": "^7.25.9", + "@babel/plugin-transform-block-scoping": "^7.25.9", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-class-static-block": "^7.26.0", + "@babel/plugin-transform-classes": "^7.25.9", + "@babel/plugin-transform-computed-properties": "^7.25.9", + "@babel/plugin-transform-destructuring": "^7.25.9", + "@babel/plugin-transform-dotall-regex": "^7.25.9", + "@babel/plugin-transform-duplicate-keys": "^7.25.9", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-dynamic-import": "^7.25.9", + "@babel/plugin-transform-exponentiation-operator": "^7.25.9", + "@babel/plugin-transform-export-namespace-from": "^7.25.9", + "@babel/plugin-transform-for-of": "^7.25.9", + "@babel/plugin-transform-function-name": "^7.25.9", + "@babel/plugin-transform-json-strings": "^7.25.9", + "@babel/plugin-transform-literals": "^7.25.9", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-transform-member-expression-literals": "^7.25.9", + "@babel/plugin-transform-modules-amd": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.25.9", + "@babel/plugin-transform-modules-systemjs": "^7.25.9", + "@babel/plugin-transform-modules-umd": "^7.25.9", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-new-target": "^7.25.9", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9", + "@babel/plugin-transform-numeric-separator": "^7.25.9", + "@babel/plugin-transform-object-rest-spread": "^7.25.9", + "@babel/plugin-transform-object-super": "^7.25.9", + "@babel/plugin-transform-optional-catch-binding": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@babel/plugin-transform-property-literals": "^7.25.9", + "@babel/plugin-transform-regenerator": "^7.25.9", + "@babel/plugin-transform-regexp-modifiers": "^7.26.0", + "@babel/plugin-transform-reserved-words": "^7.25.9", + "@babel/plugin-transform-shorthand-properties": "^7.25.9", + "@babel/plugin-transform-spread": "^7.25.9", + "@babel/plugin-transform-sticky-regex": "^7.25.9", + "@babel/plugin-transform-template-literals": "^7.25.9", + "@babel/plugin-transform-typeof-symbol": "^7.25.9", + "@babel/plugin-transform-unicode-escapes": "^7.25.9", + "@babel/plugin-transform-unicode-property-regex": "^7.25.9", + "@babel/plugin-transform-unicode-regex": "^7.25.9", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.9", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.37.1", + "core-js-compat": "^3.38.1", "semver": "^6.3.1" }, "engines": { @@ -3484,16 +3064,10 @@ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true - }, "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -3509,30 +3083,30 @@ "dev": true }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -3541,14 +3115,13 @@ } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -3714,24 +3287,27 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", - "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -3760,15 +3336,11 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.24.0", @@ -3785,16 +3357,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "argparse": "^2.0.1" }, - "engines": { - "node": "*" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { @@ -3825,9 +3397,9 @@ "dev": true }, "node_modules/@grpc/grpc-js": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.3.tgz", - "integrity": "sha512-i9UraDzFHMR+Iz/MhFLljT+fCpgxZ3O6CxwGJ8YuNYHJItIHUzKJpW2LvoFZNnGPwqc9iWy9RAucxV0JoR9aUQ==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.2.tgz", + "integrity": "sha512-bgxdZmgTrJZX50OjyVwz3+mNEnCTNkh3cIqGPWVNeW9jX6bn1ZkU80uPd+67/ZpIJIjRQ9qaHCjhavyoWYxumg==", "dependencies": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" @@ -3940,28 +3512,6 @@ "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -4057,86 +3607,6 @@ "node": ">=8" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -4390,16 +3860,6 @@ "node": ">= 6.0.0" } }, - "node_modules/@lerna/legacy-package-management/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/@lerna/legacy-package-management/node_modules/chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -4422,6 +3882,22 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "node_modules/@lerna/legacy-package-management/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@lerna/legacy-package-management/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -4449,6 +3925,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@lerna/legacy-package-management/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/@lerna/legacy-package-management/node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -4510,6 +3998,21 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/@lerna/legacy-package-management/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@lerna/legacy-package-management/node_modules/lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", @@ -4655,6 +4158,36 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@lerna/legacy-package-management/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@lerna/legacy-package-management/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -4711,18 +4244,6 @@ "node": ">=8" } }, - "node_modules/@lerna/legacy-package-management/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@lerna/legacy-package-management/node_modules/validate-npm-package-name": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", @@ -4896,6 +4417,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/arborist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@npmcli/arborist/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5104,6 +4634,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/map-workspaces/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@npmcli/map-workspaces/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -5252,6 +4791,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/package-json/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@npmcli/package-json/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -6013,14 +5561,6 @@ "resolved": "experimental/packages/otlp-transformer", "link": true }, - "node_modules/@opentelemetry/propagator-aws-xray": { - "resolved": "packages/propagator-aws-xray", - "link": true - }, - "node_modules/@opentelemetry/propagator-aws-xray-lambda": { - "resolved": "experimental/packages/propagator-aws-xray-lambda", - "link": true - }, "node_modules/@opentelemetry/propagator-b3": { "resolved": "packages/opentelemetry-propagator-b3", "link": true @@ -6212,12 +5752,12 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "node_modules/@puppeteer/browsers": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", - "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.1.tgz", + "integrity": "sha512-0kdAbmic3J09I6dT8e9vE2JOCSt13wHCW5x/ly8TSt2bDtuIWe2TgLZZDHdcziw9AVCzflMAXCrVyRIhIs44Ng==", "dev": true, "dependencies": { - "debug": "^4.3.6", + "debug": "^4.3.7", "extract-zip": "^2.0.1", "progress": "^2.0.3", "proxy-agent": "^6.4.0", @@ -6247,23 +5787,6 @@ "node": ">=12" } }, - "node_modules/@puppeteer/browsers/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/@puppeteer/browsers/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -6579,21 +6102,21 @@ } }, "node_modules/@size-limit/file": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/file/-/file-11.1.5.tgz", - "integrity": "sha512-oz/XBVUJh95GpzDb9/f4sEQD/ACJ9zEKSRgBtvMUTN0c+O/9uq+RzvFeXFN2Kjpx3Dmur1ta+oZsp3zQFxlb3Q==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/file/-/file-11.1.6.tgz", + "integrity": "sha512-ojzzJMrTfcSECRnaTjGy0wNIolTCRdyqZTSWG9sG5XEoXG6PNgHXDDS6gf6YNxnqb+rWfCfVe93u6aKi3wEocQ==", "dev": true, "engines": { "node": "^18.0.0 || >=20.0.0" }, "peerDependencies": { - "size-limit": "11.1.5" + "size-limit": "11.1.6" } }, "node_modules/@size-limit/time": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/time/-/time-11.1.5.tgz", - "integrity": "sha512-5nNkTuafGZplkrzLWUgobx2xZtyDnwau3kQLRMQbcme6M3LtDWpFZj4FMU0+a4zRQLWgBHdFkOMYpMgQ7IUiSA==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/time/-/time-11.1.6.tgz", + "integrity": "sha512-NIlJEPvUIxw87gHjriHpPhvd9fIC94S9wq7OW25K7Ctn14FZ2NlOTezPCfVViPmdlXjBYdi8vjsbc7kLCF1EpA==", "dev": true, "dependencies": { "estimo": "^3.0.3" @@ -6602,29 +6125,29 @@ "node": "^18.0.0 || >=20.0.0" }, "peerDependencies": { - "size-limit": "11.1.5" + "size-limit": "11.1.6" } }, "node_modules/@size-limit/webpack": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/webpack/-/webpack-11.1.5.tgz", - "integrity": "sha512-h4uJINq5/Y8qJ2oiATg4SGDgszn07b4TFWWT/w58OGt2+avrLSWgUfVM+ghkhplzKWLJK/UtvcqTg6ym2XnU9w==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/webpack/-/webpack-11.1.6.tgz", + "integrity": "sha512-PTZCgwJsgdzdEj2wPFuLm0cCge8N2WbswMcKWNwMJibxQxPAmiF+sZ2F6GYBS7G7K3Fb4ovCliuN+wnnRACPNg==", "dev": true, "dependencies": { "nanoid": "^5.0.7", - "webpack": "^5.94.0" + "webpack": "^5.95.0" }, "engines": { "node": "^18.0.0 || >=20.0.0" }, "peerDependencies": { - "size-limit": "11.1.5" + "size-limit": "11.1.6" } }, "node_modules/@size-limit/webpack/node_modules/nanoid": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz", - "integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.8.tgz", + "integrity": "sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==", "dev": true, "funding": [ { @@ -6724,6 +6247,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@tufjs/models/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", @@ -6777,9 +6309,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.19", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.19.tgz", - "integrity": "sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw==", + "version": "4.3.20", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", + "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==", "dev": true }, "node_modules/@types/connect": { @@ -6822,6 +6354,26 @@ "@types/node": "*" } }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -6841,9 +6393,21 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", - "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz", + "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/express/node_modules/@types/express-serve-static-core": { + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "dev": true, "dependencies": { "@types/node": "*", @@ -6874,9 +6438,9 @@ } }, "node_modules/@types/jquery": { - "version": "3.5.31", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.31.tgz", - "integrity": "sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==", + "version": "3.5.32", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz", + "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==", "dev": true, "dependencies": { "@types/sizzle": "*" @@ -6944,9 +6508,9 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.8.tgz", - "integrity": "sha512-HfMcUmy9hTMJh66VNcmeC9iVErIZJli2bszuXc6julh5YGuRb/W5OnkHjwLNYdFlMis0sY3If5SEAp+PktdJjw==", + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", "dev": true }, "node_modules/@types/node": { @@ -6976,9 +6540,9 @@ "dev": true }, "node_modules/@types/qs": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", - "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==", + "version": "6.9.17", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz", + "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==", "dev": true }, "node_modules/@types/range-parser": { @@ -7009,14 +6573,15 @@ } }, "node_modules/@types/request/node_modules/form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.2.tgz", + "integrity": "sha512-GgwY0PS7DbXqajuGf4OYlsrIu3zgxD6Vvql43IBhm6MahqA5SK/7mwhtNj2AdH2z35YR34ujJ7BN+3fFC3jP5Q==", "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "mime-types": "^2.1.12", + "safe-buffer": "^5.2.1" }, "engines": { "node": ">= 0.12" @@ -7038,9 +6603,9 @@ "dev": true }, "node_modules/@types/selenium-webdriver": { - "version": "4.1.26", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.26.tgz", - "integrity": "sha512-PUgqsyNffal0eAU0bzGlh37MJo558aporAPZoKqBeB/pF7zhKl1S3zqza0GpwFqgoigNxWhEIJzru75eeYco/w==", + "version": "4.1.27", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.27.tgz", + "integrity": "sha512-ALqsj8D7Swb6MnBQuAQ58J3KC3yh6fLGtAmpBmnZX8j+0kmP7NaLt56CuzBw2W2bXPrvHFTgn8iekOQFUKXEQA==", "dev": true, "dependencies": { "@types/node": "*", @@ -7104,9 +6669,9 @@ "dev": true }, "node_modules/@types/sizzle": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", - "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz", + "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", "dev": true }, "node_modules/@types/sockjs": { @@ -7163,9 +6728,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", + "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "dev": true, "dependencies": { "@types/node": "*" @@ -7386,148 +6951,148 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -7606,34 +7171,6 @@ "node": ">=14.15.0" } }, - "node_modules/@yarnpkg/parsers/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/@yarnpkg/parsers/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, "node_modules/@zkochan/js-yaml": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", @@ -7646,6 +7183,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@zkochan/js-yaml/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -7675,9 +7218,9 @@ } }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "bin": { "acorn": "bin/acorn" }, @@ -7884,9 +7427,9 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, "engines": { "node": ">=6" @@ -8035,16 +7578,6 @@ "node": ">= 6" } }, - "node_modules/archiver-utils/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/archiver-utils/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -8066,18 +7599,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/archiver-utils/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/archiver/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -8133,10 +7654,13 @@ "dev": true }, "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } }, "node_modules/argv": { "version": "0.0.2", @@ -8186,15 +7710,6 @@ "node": ">=8" } }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -8333,19 +7848,18 @@ "dev": true }, "node_modules/axe-core": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz", - "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==", + "version": "4.10.2", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz", + "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==", "dev": true, "engines": { "node": ">=4" } }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "dev": true, + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -8353,9 +7867,9 @@ } }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true }, "node_modules/babel-code-frame": { @@ -8466,16 +7980,6 @@ "source-map": "^0.5.7" } }, - "node_modules/babel-core/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/babel-core/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -8500,18 +8004,6 @@ "json5": "lib/cli.js" } }, - "node_modules/babel-core/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/babel-core/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -8757,13 +8249,13 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz", + "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.3", "semver": "^6.3.1" }, "peerDependencies": { @@ -8793,12 +8285,12 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz", + "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.3" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -9198,6 +8690,12 @@ "regjsparser": "^0.1.4" } }, + "node_modules/babel-plugin-transform-es2015-unicode-regex/node_modules/regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==", + "dev": true + }, "node_modules/babel-plugin-transform-es2015-unicode-regex/node_modules/regjsparser": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", @@ -9469,15 +8967,6 @@ "to-fast-properties": "^1.0.3" } }, - "node_modules/babel-types/node_modules/to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/babylon": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", @@ -9502,9 +8991,9 @@ "dev": true }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "dev": true, "optional": true }, @@ -9538,13 +9027,12 @@ } }, "node_modules/bare-stream": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", - "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.4.2.tgz", + "integrity": "sha512-XZ4ln/KV4KT+PXdIWTKjsLY+quqCaEtqqtgGJVPw9AoM73By03ij64YjepK0aQvHSWDb6AfAZwqKaFu68qkrdA==", "dev": true, "optional": true, "dependencies": { - "b4a": "^1.6.6", "streamx": "^2.20.0" } }, @@ -9766,9 +9254,9 @@ } }, "node_modules/bonjour-service": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", - "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz", + "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", @@ -9888,12 +9376,13 @@ } }, "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==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, "node_modules/braces": { @@ -9921,9 +9410,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, "funding": [ { @@ -9940,10 +9429,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -10081,6 +9570,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/cacache/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -10297,9 +9795,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001663", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz", - "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==", + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", "dev": true, "funding": [ { @@ -10362,18 +9860,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chalk/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", @@ -10390,16 +9876,10 @@ } }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -10412,10 +9892,25 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -10435,9 +9930,9 @@ } }, "node_modules/chromedriver": { - "version": "130.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-130.0.0.tgz", - "integrity": "sha512-1g1eMoKF22Uh6l8DTFOPvWLovINPrkAMw7yDHlF6Rx+4W4JI9aGdCZ2Cx7c181hUgALU1oSKGH3uKNryYM5DaQ==", + "version": "131.0.1", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.1.tgz", + "integrity": "sha512-LHRh+oaNU1WowJjAkWsviN8pTzQYJDbv/FvJyrQ7XhjKdIzVh/s3GV1iU7IjMTsxIQnBsTjx+9jWjzCWIXC7ug==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -10677,16 +10172,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true, - "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" - } - }, "node_modules/codecov": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.8.3.tgz", @@ -10707,25 +10192,6 @@ "node": ">=4.0" } }, - "node_modules/codecov/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/codecov/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/codecov/node_modules/ignore-walk": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", @@ -10735,37 +10201,6 @@ "minimatch": "^3.0.4" } }, - "node_modules/codecov/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/codecov/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/codecov/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -10930,32 +10365,23 @@ } }, "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", + "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", "dev": true, "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", + "bytes": "3.1.2", + "compressible": "~2.0.18", "debug": "2.6.9", + "negotiator": "~0.6.4", "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", + "safe-buffer": "5.2.1", "vary": "~1.1.2" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/compression/node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/compression/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -10971,11 +10397,14 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/compression/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "node_modules/compression/node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "dev": true, + "engines": { + "node": ">= 0.6" + } }, "node_modules/concat-map": { "version": "0.0.1", @@ -11055,6 +10484,15 @@ "ms": "2.0.0" } }, + "node_modules/connect/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/connect/node_modules/finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -11347,12 +10785,12 @@ "hasInstallScript": true }, "node_modules/core-js-compat": { - "version": "3.38.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", - "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", + "version": "3.39.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz", + "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==", "dev": true, "dependencies": { - "browserslist": "^4.23.3" + "browserslist": "^4.24.2" }, "funding": { "type": "opencollective", @@ -11394,107 +10832,6 @@ "node": ">=10" } }, - "node_modules/cpx2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cpx2/-/cpx2-2.0.0.tgz", - "integrity": "sha512-hSkh9xHmUnHMxVS99SpACbAw6jOCaji0KyepBQ4/ULZQ+RB+3uP2PB/zylOCjSxZv9/cvoeG1XuQbZPyNuYftA==", - "dev": true, - "dependencies": { - "co": "^4.6.0", - "debounce": "^1.2.0", - "debug": "^4.1.1", - "duplexer": "^0.1.1", - "fs-extra": "^8.1.0", - "glob": "^7.1.4", - "glob2base": "0.0.12", - "minimatch": "^3.0.4", - "resolve": "^1.12.0", - "safe-buffer": "^5.2.0", - "shell-quote": "^1.7.1", - "subarg": "^1.0.0" - }, - "bin": { - "cpx": "bin/index.js" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/cpx2/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/cpx2/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/cpx2/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cpx2/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/cpx2/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/cpx2/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/crc-32": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", @@ -11557,9 +10894,9 @@ } }, "node_modules/cross-env/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -11775,18 +11112,12 @@ "node": "*" } }, - "node_modules/debounce": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", - "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", - "dev": true - }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -11797,11 +11128,6 @@ } } }, - "node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -12132,9 +11458,9 @@ "dev": true }, "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "engines": { "node": ">=0.3.1" @@ -12313,6 +11639,15 @@ "dpdm": "lib/bin/dpdm.js" } }, + "node_modules/dpdm/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/dpdm/node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -12421,9 +11756,9 @@ } }, "node_modules/dpdm/node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -12526,9 +11861,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.27", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.27.tgz", - "integrity": "sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==", + "version": "1.5.64", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", + "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==", "dev": true }, "node_modules/email-addresses": { @@ -12561,9 +11896,9 @@ } }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -12601,9 +11936,9 @@ } }, "node_modules/engine.io": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.1.tgz", - "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz", + "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==", "dev": true, "dependencies": { "@types/cookie": "^0.4.1", @@ -12611,7 +11946,7 @@ "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "~0.4.1", + "cookie": "~0.7.2", "cors": "~2.8.5", "debug": "~4.3.1", "engine.io-parser": "~5.2.1", @@ -12631,9 +11966,9 @@ } }, "node_modules/engine.io/node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true, "engines": { "node": ">= 0.6" @@ -12867,6 +12202,7 @@ "version": "8.44.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz", "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -12979,28 +12315,6 @@ "eslint": ">=5.16.0" } }, - "node_modules/eslint-plugin-node/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint-plugin-node/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/eslint-plugin-node/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -13104,20 +12418,16 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/eslint/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -13153,16 +12463,20 @@ "node": ">=4.0" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "dependencies": { - "is-glob": "^4.0.3" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint/node_modules/globals": { @@ -13180,16 +12494,61 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" }, "engines": { - "node": "*" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint/node_modules/shebang-command": { @@ -13468,9 +12827,9 @@ } }, "node_modules/execa/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -13599,30 +12958,11 @@ "ms": "2.0.0" } }, - "node_modules/express/node_modules/debug/node_modules/ms": { + "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/express/node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/express/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/express/node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -13637,37 +12977,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/express/node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/express/node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -13762,6 +13071,18 @@ "node": ">=8.6.0" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -13781,9 +13102,9 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", "dev": true }, "node_modules/fast-url-parser": { @@ -13888,6 +13209,27 @@ "minimatch": "^5.0.1" } }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/filename-reserved-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", @@ -13951,6 +13293,14 @@ "ms": "2.0.0" } }, + "node_modules/finalhandler/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -13985,26 +13335,17 @@ "node": ">=18.0.0" } }, - "node_modules/find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==", - "dev": true - }, "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "dependencies": { - "locate-path": "^6.0.0", + "locate-path": "^5.0.0", "path-exists": "^4.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/flat": { @@ -14031,9 +13372,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true }, "node_modules/follow-redirects": { @@ -14081,9 +13422,9 @@ } }, "node_modules/foreground-child/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -14140,9 +13481,9 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -14153,13 +13494,13 @@ } }, "node_modules/formidable": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz", - "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", + "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", "dev": true, "dependencies": { "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", + "hexoid": "^2.0.0", "once": "^1.4.0" }, "funding": { @@ -14177,8 +13518,7 @@ "node_modules/forwarded-parse": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/forwarded-parse/-/forwarded-parse-2.1.2.tgz", - "integrity": "sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==", - "license": "MIT" + "integrity": "sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==" }, "node_modules/fresh": { "version": "0.5.2", @@ -14639,9 +13979,9 @@ } }, "node_modules/gh-pages": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz", - "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.2.0.tgz", + "integrity": "sha512-HMXJ8th9u5wRXaZCnLcs/d3oVvCHiZkaP5KQExQljYGwJjQbSPyTdHe/Gc1IvYUR/rWiZLxNobIqfoMHKTKjHQ==", "dev": true, "dependencies": { "async": "^3.2.4", @@ -14650,7 +13990,7 @@ "filenamify": "^4.3.0", "find-cache-dir": "^3.3.1", "fs-extra": "^11.1.1", - "globby": "^6.1.0" + "globby": "^11.1.0" }, "bin": { "gh-pages": "bin/gh-pages.js", @@ -14660,86 +14000,6 @@ "node": ">=10" } }, - "node_modules/gh-pages/node_modules/array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", - "dev": true, - "dependencies": { - "array-uniq": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gh-pages/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/gh-pages/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/gh-pages/node_modules/globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", - "dev": true, - "dependencies": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gh-pages/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/gh-pages/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/git-raw-commits": { "version": "2.0.11", "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", @@ -14858,15 +14118,15 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { @@ -14875,6 +14135,15 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/glob/node_modules/minimatch": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", @@ -14890,18 +14159,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==", - "dev": true, - "dependencies": { - "find-index": "^0.1.1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -15243,9 +14500,9 @@ } }, "node_modules/hexoid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", - "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", + "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", "dev": true, "engines": { "node": ">=8" @@ -15265,9 +14522,9 @@ } }, "node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.3.tgz", + "integrity": "sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==", "dev": true, "dependencies": { "lru-cache": "^7.5.1" @@ -15428,9 +14685,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, "dependencies": { "@types/http-proxy": "^1.17.8", @@ -15578,6 +14835,27 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", @@ -15610,9 +14888,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz", - "integrity": "sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz", + "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==", "dependencies": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", @@ -15863,6 +15141,12 @@ "node": ">= 12" } }, + "node_modules/ip-address/node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true + }, "node_modules/ip-regex": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", @@ -16361,9 +15645,9 @@ } }, "node_modules/istanbul-lib-processinfo/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -16451,18 +15735,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/istanbul-lib-report/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/istanbul-lib-source-maps": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", @@ -16500,9 +15772,9 @@ } }, "node_modules/jackspeak": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", - "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", + "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -16512,9 +15784,6 @@ }, "funding": { "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" } }, "node_modules/jaeger-client": { @@ -16550,28 +15819,6 @@ "node": ">=10" } }, - "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jake/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/jest-worker": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", @@ -16586,25 +15833,13 @@ "node": ">= 10.13.0" } }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/jiti": { - "version": "1.21.6", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", - "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.0.tgz", + "integrity": "sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==", "dev": true, "bin": { - "jiti": "bin/jiti.js" + "jiti": "lib/jiti-cli.mjs" } }, "node_modules/js-tokens": { @@ -16614,12 +15849,13 @@ "dev": true }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "dependencies": { - "argparse": "^2.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, "bin": { "js-yaml": "bin/js-yaml.js" @@ -16641,9 +15877,9 @@ "dev": true }, "node_modules/jsdoc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", - "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", + "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", "dev": true, "dependencies": { "@babel/parser": "^7.20.15", @@ -16774,15 +16010,15 @@ } }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -16863,9 +16099,9 @@ } }, "node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", "dev": true }, "node_modules/jsonfile": { @@ -17014,16 +16250,6 @@ "node": ">=10.0.0" } }, - "node_modules/karma-coverage/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/karma-coverage/node_modules/istanbul-lib-instrument": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", @@ -17040,18 +16266,6 @@ "node": ">=8" } }, - "node_modules/karma-coverage/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/karma-coverage/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -17092,28 +16306,6 @@ "mocha": "*" } }, - "node_modules/karma-mocha-webworker/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/karma-mocha-webworker/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/karma-spec-reporter": { "version": "0.0.36", "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz", @@ -17164,16 +16356,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/karma-webpack/node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/karma-webpack/node_modules/glob/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -17201,6 +16383,15 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/karma-webpack/node_modules/minimatch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/karma-webpack/node_modules/webpack-merge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", @@ -17210,16 +16401,6 @@ "lodash": "^4.17.15" } }, - "node_modules/karma/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/karma/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -17241,18 +16422,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/karma/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/karma/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -17401,15 +16570,11 @@ "node": "^14.17.0 || >=16.0.0" } }, - "node_modules/lerna/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "node_modules/lerna/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/lerna/node_modules/chalk": { "version": "4.1.0", @@ -17472,6 +16637,18 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/lerna/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/lerna/node_modules/glob/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -17502,6 +16679,18 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/lerna/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/lerna/node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -17587,18 +16776,6 @@ "node": ">=8" } }, - "node_modules/lerna/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -17818,9 +16995,9 @@ } }, "node_modules/linkinator": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.0.6.tgz", - "integrity": "sha512-5Hc0qIB8pSXeNQej30ruUHqu37gbJf8o3tu4qNeJCZX9/jZ80BkOrRhst3fR9ipizLFy24HgKmqCFilGOrtZjQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.1.2.tgz", + "integrity": "sha512-PndSrQe21Hf4sn2vZldEzJmD0EUJbIsEy4jcZLcHd6IZfQ6rC6iv+Fwo666TWM9DcXjbCrHpxnVX6xaGrcJ/eA==", "dev": true, "dependencies": { "chalk": "^5.0.0", @@ -17841,6 +17018,15 @@ "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, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/linkinator/node_modules/chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", @@ -18000,18 +17186,15 @@ } }, "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "dependencies": { - "p-locate": "^5.0.0" + "p-locate": "^4.1.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/lodash": { @@ -18380,6 +17563,15 @@ "node": ">= 6.0.0" } }, + "node_modules/make-fetch-happen/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/make-fetch-happen/node_modules/cacache": { "version": "16.1.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", @@ -18463,6 +17655,18 @@ "node": ">=12" } }, + "node_modules/make-fetch-happen/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/make-fetch-happen/node_modules/minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -18562,14 +17766,20 @@ "markdown-it": "*" } }, + "node_modules/markdown-it/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/markdownlint": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", - "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.36.1.tgz", + "integrity": "sha512-s73fU2CQN7WCgjhaQUQ8wYESQNzGRNOKDd+3xgVqu8kuTEhmwepd/mxOv1LR2oV046ONrTLBFsM7IoKWNvmy5g==", "dev": true, "dependencies": { "markdown-it": "14.1.0", - "markdownlint-micromark": "0.1.9" + "markdownlint-micromark": "0.1.12" }, "engines": { "node": ">=18" @@ -18579,17 +17789,17 @@ } }, "node_modules/markdownlint-cli2": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.13.0.tgz", - "integrity": "sha512-Pg4nF7HlopU97ZXtrcVISWp3bdsuc5M0zXyLp2/sJv2zEMlInrau0ZKK482fQURzVezJzWBpNmu4u6vGAhij+g==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.15.0.tgz", + "integrity": "sha512-4P/lnxQxU2R5lywRJs4b2ajm8z65CW8qqR1bTIcdQ5EG+nZpC6HJlJUnmIR5ee+uecUkoMroazxWcLB7etSmrg==", "dev": true, "dependencies": { - "globby": "14.0.1", + "globby": "14.0.2", "js-yaml": "4.1.0", - "jsonc-parser": "3.2.1", - "markdownlint": "0.34.0", - "markdownlint-cli2-formatter-default": "0.0.4", - "micromatch": "4.0.5" + "jsonc-parser": "3.3.1", + "markdownlint": "0.36.1", + "markdownlint-cli2-formatter-default": "0.0.5", + "micromatch": "4.0.8" }, "bin": { "markdownlint-cli2": "markdownlint-cli2.js" @@ -18602,18 +17812,27 @@ } }, "node_modules/markdownlint-cli2-formatter-default": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.4.tgz", - "integrity": "sha512-xm2rM0E+sWgjpPn1EesPXx5hIyrN2ddUnUwnbCsD/ONxYtw3PX6LydvdH6dciWAoFDpwzbHM1TO7uHfcMd6IYg==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.5.tgz", + "integrity": "sha512-4XKTwQ5m1+Txo2kuQ3Jgpo/KmnG+X90dWt4acufg6HVGadTUG5hzHF/wssp9b5MBYOMCnZ9RMPaU//uHsszF8Q==", "dev": true, + "funding": { + "url": "https://github.com/sponsors/DavidAnson" + }, "peerDependencies": { "markdownlint-cli2": ">=0.0.4" } }, + "node_modules/markdownlint-cli2/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/markdownlint-cli2/node_modules/globby": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", - "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", + "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", "dev": true, "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", @@ -18630,17 +17849,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/markdownlint-cli2/node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "node_modules/markdownlint-cli2/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" + "argparse": "^2.0.1" }, - "engines": { - "node": ">=8.6" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, "node_modules/markdownlint-cli2/node_modules/path-type": { @@ -18668,9 +17886,9 @@ } }, "node_modules/markdownlint-micromark": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", - "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.12.tgz", + "integrity": "sha512-RlB6EwMGgc0sxcIhOQ2+aq7Zw1V2fBnzbXKGgYK/mVWdT7cz34fteKSwfYeo4rL6+L/q2tyC9QtD/PgZbkdyJQ==", "dev": true, "engines": { "node": ">=18" @@ -18755,19 +17973,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/meow/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/meow/node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -18780,18 +17985,6 @@ "node": ">=10" } }, - "node_modules/meow/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/meow/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -18819,33 +18012,6 @@ "node": ">=10" } }, - "node_modules/meow/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/meow/node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -19050,15 +18216,15 @@ "dev": true }, "node_modules/minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=10" + "node": "*" } }, "node_modules/minimist": { @@ -19351,9 +18517,9 @@ } }, "node_modules/mocha": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", - "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, "dependencies": { "ansi-colors": "^4.1.3", @@ -19385,39 +18551,35 @@ "node": ">= 14.0.0" } }, - "node_modules/mocha/node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "node_modules/mocha/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/mocha/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, - "engines": { - "node": ">=6" + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/mocha/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "node_modules/mocha/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "dependencies": { - "ms": "^2.1.3" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": ">=6.0" + "node": ">=10" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/mocha/node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true, - "engines": { - "node": ">=0.3.1" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/mocha/node_modules/glob": { @@ -19440,6 +18602,33 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/mocha/node_modules/minimatch": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", @@ -19452,20 +18641,50 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "node_modules/mocha/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "dependencies": { - "randombytes": "^2.1.0" + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mocha/node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "node_modules/mocha/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } }, "node_modules/mocha/node_modules/yargs-parser": { "version": "20.2.9", @@ -19542,28 +18761,6 @@ "node": ">=8" } }, - "node_modules/multimatch/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/multimatch/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", @@ -19571,24 +18768,18 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", + "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==", + "dev": true }, "node_modules/nanospinner": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.1.0.tgz", - "integrity": "sha512-yFvNYMig4AthKYfHFl1sLj7B2nkHL4lzdig4osvl9/LdGbXwrdFRoqBS98gsEsOakr0yH+r5NZ/1Y9gdVB8trA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.2.0.tgz", + "integrity": "sha512-dGxYcEj8YhuxjVO3PYmnj1nBhtwUkvuwYbLl/MduBPmQUPy3xBtG/ScJgqZgntQkX44UQaCSlFeW4rS5fUR/Sw==", "dev": true, "dependencies": { - "picocolors": "^1.0.0" + "picocolors": "^1.1.1" } }, "node_modules/natural-compare": { @@ -19716,14 +18907,46 @@ "axe-core": "^4.9.1" } }, - "node_modules/nightwatch/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/nightwatch/node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/nightwatch/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/nightwatch/node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, "node_modules/nightwatch/node_modules/ci-info": { @@ -19755,6 +18978,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/nightwatch/node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/nightwatch/node_modules/dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -19791,6 +19023,22 @@ "node": ">=4" } }, + "node_modules/nightwatch/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/nightwatch/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -19826,28 +19074,55 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/nightwatch/node_modules/lru-cache": { + "node_modules/nightwatch/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/nightwatch/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/nightwatch/node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "p-locate": "^5.0.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/nightwatch/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/nightwatch/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "yallist": "^4.0.0" }, "engines": { - "node": "*" + "node": ">=10" } }, "node_modules/nightwatch/node_modules/minimist": { @@ -19956,6 +19231,36 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/nightwatch/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nightwatch/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/nightwatch/node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -19971,6 +19276,30 @@ "node": ">=10" } }, + "node_modules/nightwatch/node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/nightwatch/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/nightwatch/node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -20123,9 +19452,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", - "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", "dev": true, "bin": { "node-gyp-build": "bin.js", @@ -20139,16 +19468,6 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/node-gyp/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -20170,18 +19489,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/node-gyp/node_modules/nopt": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", @@ -20396,6 +19703,15 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/npm-packlist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/npm-packlist/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -20416,6 +19732,18 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/npm-packlist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/npm-packlist/node_modules/npm-bundled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", @@ -20657,9 +19985,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.12", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", - "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", + "version": "2.2.13", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz", + "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==", "dev": true }, "node_modules/nx": { @@ -20732,15 +20060,11 @@ } } }, - "node_modules/nx/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "node_modules/nx/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/nx/node_modules/dotenv": { "version": "10.0.0", @@ -20791,6 +20115,30 @@ "node": "*" } }, + "node_modules/nx/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/nx/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/nx/node_modules/jsonc-parser": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", @@ -20955,16 +20303,6 @@ "node": ">=8.9" } }, - "node_modules/nyc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/nyc/node_modules/cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -20983,9 +20321,9 @@ "dev": true }, "node_modules/nyc/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -21002,19 +20340,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "node_modules/nyc/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/nyc/node_modules/foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -21064,57 +20389,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/nyc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/nyc/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nyc/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/nyc/node_modules/p-map": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", @@ -21266,9 +20540,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "engines": { "node": ">= 0.4" }, @@ -21490,33 +20764,30 @@ } }, "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "p-try": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=6" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "dependencies": { - "p-limit": "^3.0.2" + "p-limit": "^2.2.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/p-map": { @@ -21738,9 +21009,9 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true }, "node_modules/pacote": { @@ -21791,6 +21062,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/pacote/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/pacote/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -22133,9 +21413,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", - "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", + "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", "dev": true, "engines": { "node": "20 || >=22" @@ -22186,9 +21466,9 @@ "dev": true }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true }, "node_modules/picomatch": { @@ -22215,27 +21495,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "dev": true, - "dependencies": { - "pinkie": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/piscina": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", @@ -22262,58 +21521,6 @@ "node": ">=8" } }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/platform": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz", @@ -22384,9 +21591,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -22470,9 +21677,9 @@ "dev": true }, "node_modules/process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", + "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", "dev": true, "dependencies": { "fromentries": "^1.2.0" @@ -22610,6 +21817,15 @@ "protobufjs": "^7.0.0" } }, + "node_modules/protobufjs-cli/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/protobufjs-cli/node_modules/escodegen": { "version": "1.14.3", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", @@ -22683,6 +21899,18 @@ "node": ">= 0.8.0" } }, + "node_modules/protobufjs-cli/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/protobufjs-cli/node_modules/optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -22862,10 +22090,22 @@ "dev": true }, "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz", + "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==", + "dev": true, + "dependencies": { + "punycode": "^2.3.1" + } + }, + "node_modules/psl/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } }, "node_modules/pump": { "version": "3.0.2", @@ -22944,6 +22184,23 @@ "node": ">=12" } }, + "node_modules/puppeteer-core/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/puppeteer-core/node_modules/devtools-protocol": { "version": "0.0.1262051", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1262051.tgz", @@ -22968,6 +22225,12 @@ "node": ">=10" } }, + "node_modules/puppeteer-core/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "node_modules/puppeteer-core/node_modules/semver": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", @@ -23258,6 +22521,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/read-package-json/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/read-package-json/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -23305,6 +22577,18 @@ "node": ">=12" } }, + "node_modules/read-package-json/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/read-package-json/node_modules/normalize-package-data": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.1.tgz", @@ -23535,6 +22819,15 @@ "minimatch": "^5.1.0" } }, + "node_modules/readdir-glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/readdir-glob/node_modules/minimatch": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", @@ -23618,15 +22911,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -23648,15 +22941,15 @@ } }, "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "dependencies": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -23665,32 +22958,23 @@ } }, "node_modules/regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", "dev": true }, "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "dependencies": { - "jsesc": "~0.5.0" + "jsesc": "~3.0.2" }, "bin": { "regjsparser": "bin/parser" } }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, "node_modules/release-zalgo": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", @@ -23887,22 +23171,6 @@ "node": ">=8.6.0" } }, - "node_modules/require-in-the-middle/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -24039,16 +23307,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/rimraf/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -24070,18 +23328,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -24231,9 +23477,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -24266,6 +23512,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -24278,9 +23532,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -24378,6 +23632,61 @@ "node": ">= 0.8.0" } }, + "node_modules/serve-static/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/serve-static/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/serve-static/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/serve-static/node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/server-destroy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", @@ -24500,12 +23809,6 @@ "nanoid": "^2.1.0" } }, - "node_modules/shortid/node_modules/nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==", - "dev": true - }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -24689,40 +23992,19 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/sinon/node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/size-limit": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/size-limit/-/size-limit-11.1.5.tgz", - "integrity": "sha512-dtw/Tcm+9aonYySPG6wQCe1BwogK5HRGSrSqr0zXGfKtynJGvKAsyHCTGxdphFEHjHRoHFWua3D3zqYLUVVIig==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/size-limit/-/size-limit-11.1.6.tgz", + "integrity": "sha512-S5ux2IB8rU26xwVgMskmknGMFkieaIAqDLuwgKiypk6oa4lFsie8yFPrzRFV+yrLDY2GddjXuCaVk5PveVOHiQ==", "dev": true, "dependencies": { "bytes-iec": "^3.1.1", - "chokidar": "^3.6.0", - "jiti": "^1.21.6", + "chokidar": "^4.0.1", + "jiti": "^2.0.0", "lilconfig": "^3.1.2", "nanospinner": "^1.1.0", "picocolors": "^1.1.0", - "tinyglobby": "^0.2.6" + "tinyglobby": "^0.2.7" }, "bin": { "size-limit": "bin.js" @@ -24732,27 +24014,31 @@ } }, "node_modules/size-limit/node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", + "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", "dev": true, "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/size-limit/node_modules/readdirp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "dev": true, + "engines": { + "node": ">= 14.16.0" }, - "optionalDependencies": { - "fsevents": "~2.3.2" + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/slash": { @@ -24775,9 +24061,9 @@ } }, "node_modules/socket.io": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz", - "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz", + "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==", "dev": true, "dependencies": { "accepts": "~1.3.4", @@ -24941,9 +24227,9 @@ } }, "node_modules/spawn-wrap/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -25121,9 +24407,9 @@ } }, "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, "node_modules/srcset": { @@ -25302,9 +24588,9 @@ } }, "node_modules/streamx": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", - "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", + "version": "2.20.2", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.2.tgz", + "integrity": "sha512-aDGDLU+j9tJcUdPGOaHmVF1u/hhI+CsGkT02V3OKlHDV7IukOI+nTWAGkiZEKCO35rWN1wIr4tS7YFr1f4qSvA==", "dev": true, "dependencies": { "fast-fifo": "^1.3.2", @@ -25510,15 +24796,6 @@ "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==", "dev": true }, - "node_modules/subarg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", - "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", - "dev": true, - "dependencies": { - "minimist": "^1.1.0" - } - }, "node_modules/superagent": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.0.2.tgz", @@ -25540,18 +24817,15 @@ } }, "node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { "has-flag": "^4.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "node": ">=8" } }, "node_modules/supports-preserve-symlinks-flag": { @@ -25572,9 +24846,9 @@ "dev": true }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, "dependencies": { "@pkgr/core": "^0.1.0", @@ -25828,16 +25102,6 @@ "node": ">=0.8.0" } }, - "node_modules/temp-fs/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/temp-fs/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -25859,18 +25123,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/temp-fs/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/temp-fs/node_modules/rimraf": { "version": "2.5.4", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", @@ -25925,9 +25177,9 @@ } }, "node_modules/terser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", - "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", + "version": "5.36.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz", + "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -25993,16 +25245,6 @@ "node": ">=10" } }, - "node_modules/terser-webpack-plugin/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/terser-webpack-plugin/node_modules/cacache": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", @@ -26077,18 +25319,6 @@ "node": ">=10" } }, - "node_modules/terser-webpack-plugin/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/terser-webpack-plugin/node_modules/minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -26113,6 +25343,21 @@ "node": ">=10" } }, + "node_modules/terser-webpack-plugin/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -26224,16 +25469,6 @@ "node": ">=8" } }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/test-exclude/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -26255,26 +25490,11 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/text-decoder": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", - "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", - "dev": true, - "dependencies": { - "b4a": "^1.6.4" - } + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.1.tgz", + "integrity": "sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ==", + "dev": true }, "node_modules/text-extensions": { "version": "1.9.0", @@ -26351,12 +25571,12 @@ "dev": true }, "node_modules/tinyglobby": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.6.tgz", - "integrity": "sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==", + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.10.tgz", + "integrity": "sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==", "dev": true, "dependencies": { - "fdir": "^6.3.0", + "fdir": "^6.4.2", "picomatch": "^4.0.2" }, "engines": { @@ -26364,9 +25584,9 @@ } }, "node_modules/tinyglobby/node_modules/fdir": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz", - "integrity": "sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz", + "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==", "dev": true, "peerDependencies": { "picomatch": "^3 || ^4" @@ -26399,12 +25619,12 @@ } }, "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==", "dev": true, "engines": { - "node": ">=4" + "node": ">=0.10.0" } }, "node_modules/to-regex-range": { @@ -26668,9 +25888,9 @@ } }, "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true }, "node_modules/tsutils": { @@ -26946,6 +26166,15 @@ "typedoc": ">=0.22 <=0.23" } }, + "node_modules/typedoc/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/typedoc/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -27203,9 +26432,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "dev": true, "funding": [ { @@ -27222,8 +26451,8 @@ } ], "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" @@ -27479,18 +26708,18 @@ } }, "node_modules/webpack": { - "version": "5.94.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", - "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "version": "5.96.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz", + "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==", "dev": true, "dependencies": { - "@types/estree": "^1.0.5", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-attributes": "^1.9.5", - "browserslist": "^4.21.10", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", @@ -27579,9 +26808,9 @@ } }, "node_modules/webpack-cli/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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -27909,13 +27138,19 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack/node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "node_modules/webpack/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "dependencies": { - "randombytes": "^2.1.0" + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/webpack/node_modules/tapable": { @@ -28159,9 +27394,9 @@ "dev": true }, "node_modules/workerpool": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", - "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", "dev": true }, "node_modules/wrap-ansi": { @@ -28619,16 +27854,6 @@ "node": ">= 10" } }, - "node_modules/zip-stream/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/zip-stream/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -28650,18 +27875,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/zip-stream/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/zip-stream/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -28692,15 +27905,15 @@ }, "packages/opentelemetry-context-async-hooks": { "name": "@opentelemetry/context-async-hooks", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "typescript": "4.4.4" }, @@ -28713,10 +27926,10 @@ }, "packages/opentelemetry-context-zone": { "name": "@opentelemetry/context-zone", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0" }, "devDependencies": { @@ -28730,13 +27943,13 @@ }, "packages/opentelemetry-context-zone-peer-dep": { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -28751,12 +27964,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "zone.js": "0.13.3" }, @@ -28779,14 +27992,14 @@ }, "packages/opentelemetry-core": { "name": "@opentelemetry/core", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -28799,12 +28012,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -28815,23 +28028,23 @@ }, "packages/opentelemetry-exporter-jaeger": { "name": "@opentelemetry/exporter-jaeger", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "jaeger-client": "^3.15.0" }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", @@ -28846,19 +28059,19 @@ }, "packages/opentelemetry-exporter-zipkin": { "name": "@opentelemetry/exporter-zipkin", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -28872,13 +28085,13 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -28891,18 +28104,18 @@ }, "packages/opentelemetry-propagator-b3": { "name": "@opentelemetry/propagator-b3", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0" + "@opentelemetry/core": "1.28.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4" @@ -28916,14 +28129,14 @@ }, "packages/opentelemetry-propagator-jaeger": { "name": "@opentelemetry/propagator-jaeger", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0" + "@opentelemetry/core": "1.28.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -28936,12 +28149,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -28952,16 +28165,16 @@ }, "packages/opentelemetry-resources": { "name": "@opentelemetry/resources", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -28974,12 +28187,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -29042,16 +28255,16 @@ }, "packages/opentelemetry-sdk-trace-base": { "name": "@opentelemetry/sdk-trace-base", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -29065,12 +28278,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "engines": { "node": ">=14" @@ -29081,27 +28294,27 @@ }, "packages/opentelemetry-sdk-trace-node": { "name": "@opentelemetry/sdk-trace-node", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "semver": "^7.5.2" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -29115,22 +28328,22 @@ }, "packages/opentelemetry-sdk-trace-web": { "name": "@opentelemetry/sdk-trace-web", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@types/jquery": "3.5.31", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@types/jquery": "3.5.32", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -29146,12 +28359,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -29164,23 +28377,23 @@ }, "packages/opentelemetry-shim-opentracing": { "name": "@opentelemetry/shim-opentracing", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "opentracing": "^0.14.4" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "typescript": "4.4.4" }, @@ -29191,53 +28404,19 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, - "packages/propagator-aws-xray": { - "name": "@opentelemetry/propagator-aws-xray", - "version": "1.26.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "1.26.0" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "ts-loader": "9.5.1", - "typescript": "4.4.4", - "webpack": "5.94.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.10.0" - } - }, "packages/sdk-metrics": { "name": "@opentelemetry/sdk-metrics", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.3.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -29249,12 +28428,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -29267,7 +28446,7 @@ }, "packages/template": { "name": "@opentelemetry/template", - "version": "1.26.0", + "version": "1.28.0", "license": "Apache-2.0", "devDependencies": { "@types/node": "18.6.5", @@ -29281,39 +28460,39 @@ }, "selenium-tests": { "name": "@opentelemetry/selenium-tests", - "version": "1.27.0", + "version": "1.29.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.4", + "@babel/plugin-proposal-decorators": "7.25.9", + "@babel/plugin-transform-runtime": "7.25.9", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", "babel-loader": "8.4.1", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "130.0.0", + "chromedriver": "131.0.1", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", "webpack-merge": "5.10.0" @@ -29455,18 +28634,18 @@ }, "semantic-conventions": { "name": "@opentelemetry/semantic-conventions", - "version": "1.27.0", + "version": "1.28.0", "license": "Apache-2.0", "devDependencies": { "@size-limit/file": "^11.0.1", "@size-limit/time": "^11.0.1", "@size-limit/webpack": "^11.0.1", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", @@ -29497,37 +28676,38 @@ "dev": true }, "@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "requires": { - "@babel/highlight": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" } }, "@babel/compat-data": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", - "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", "dev": true }, "@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -29544,45 +28724,46 @@ } }, "@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "dev": true, "requires": { - "@babel/types": "^7.25.6", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" } }, "@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "requires": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", + "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", "dev": true, "requires": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -29596,17 +28777,17 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", "semver": "^6.3.1" }, "dependencies": { @@ -29619,13 +28800,13 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", + "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.25.9", + "regexpu-core": "^6.1.1", "semver": "^6.3.1" }, "dependencies": { @@ -29638,9 +28819,9 @@ } }, "@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz", + "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==", "dev": true, "requires": { "@babel/helper-compilation-targets": "^7.22.6", @@ -29651,259 +28832,188 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "requires": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "requires": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "requires": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" } }, "@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "dev": true }, "@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", + "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", + "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", "dev": true, "requires": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "requires": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true }, "@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true }, "@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "requires": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "dev": true, "requires": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" - } - }, - "@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" } }, "@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "dev": true, "requires": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.26.0" } }, "@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz", + "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz", + "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" } }, "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", + "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-proposal-class-properties": { @@ -29917,14 +29027,14 @@ } }, "@babel/plugin-proposal-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz", - "integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz", + "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-decorators": "^7.24.7" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-syntax-decorators": "^7.25.9" } }, "@babel/plugin-proposal-private-property-in-object": { @@ -29934,166 +29044,31 @@ "dev": true, "requires": {} }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, "@babel/plugin-syntax-decorators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz", - "integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.24.7" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz", + "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz", + "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-syntax-import-attributes": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", - "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-syntax-unicode-sets-regex": { @@ -30107,421 +29082,419 @@ } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-async-generator-functions": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz", - "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz", + "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-remap-async-to-generator": "^7.25.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/traverse": "^7.25.4" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", - "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", + "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", + "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz", + "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" } }, "@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", + "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", + "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", + "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "requires": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", + "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", + "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", + "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz", + "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", + "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", + "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", "dev": true, "requires": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9" } }, "@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" } }, "@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", + "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", + "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", + "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.25.9", "regenerator-transform": "^0.15.2" } }, + "@babel/plugin-transform-regexp-modifiers": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz", + "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + } + }, "@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-runtime": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz", - "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz", + "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.1", + "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", "semver": "^6.3.1" }, @@ -30535,178 +29508,164 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", + "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", + "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", + "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", + "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" } }, "@babel/preset-env": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz", - "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.25.4", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz", + "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.7", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-import-assertions": "^7.26.0", + "@babel/plugin-syntax-import-attributes": "^7.26.0", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.4", - "@babel/plugin-transform-async-to-generator": "^7.24.7", - "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.25.0", - "@babel/plugin-transform-class-properties": "^7.25.4", - "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.25.4", - "@babel/plugin-transform-computed-properties": "^7.24.7", - "@babel/plugin-transform-destructuring": "^7.24.8", - "@babel/plugin-transform-dotall-regex": "^7.24.7", - "@babel/plugin-transform-duplicate-keys": "^7.24.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", - "@babel/plugin-transform-dynamic-import": "^7.24.7", - "@babel/plugin-transform-exponentiation-operator": "^7.24.7", - "@babel/plugin-transform-export-namespace-from": "^7.24.7", - "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.25.1", - "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.25.2", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", - "@babel/plugin-transform-member-expression-literals": "^7.24.7", - "@babel/plugin-transform-modules-amd": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.25.0", - "@babel/plugin-transform-modules-umd": "^7.24.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", - "@babel/plugin-transform-new-target": "^7.24.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", - "@babel/plugin-transform-numeric-separator": "^7.24.7", - "@babel/plugin-transform-object-rest-spread": "^7.24.7", - "@babel/plugin-transform-object-super": "^7.24.7", - "@babel/plugin-transform-optional-catch-binding": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.8", - "@babel/plugin-transform-parameters": "^7.24.7", - "@babel/plugin-transform-private-methods": "^7.25.4", - "@babel/plugin-transform-private-property-in-object": "^7.24.7", - "@babel/plugin-transform-property-literals": "^7.24.7", - "@babel/plugin-transform-regenerator": "^7.24.7", - "@babel/plugin-transform-reserved-words": "^7.24.7", - "@babel/plugin-transform-shorthand-properties": "^7.24.7", - "@babel/plugin-transform-spread": "^7.24.7", - "@babel/plugin-transform-sticky-regex": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/plugin-transform-typeof-symbol": "^7.24.8", - "@babel/plugin-transform-unicode-escapes": "^7.24.7", - "@babel/plugin-transform-unicode-property-regex": "^7.24.7", - "@babel/plugin-transform-unicode-regex": "^7.24.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.25.4", + "@babel/plugin-transform-arrow-functions": "^7.25.9", + "@babel/plugin-transform-async-generator-functions": "^7.25.9", + "@babel/plugin-transform-async-to-generator": "^7.25.9", + "@babel/plugin-transform-block-scoped-functions": "^7.25.9", + "@babel/plugin-transform-block-scoping": "^7.25.9", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-class-static-block": "^7.26.0", + "@babel/plugin-transform-classes": "^7.25.9", + "@babel/plugin-transform-computed-properties": "^7.25.9", + "@babel/plugin-transform-destructuring": "^7.25.9", + "@babel/plugin-transform-dotall-regex": "^7.25.9", + "@babel/plugin-transform-duplicate-keys": "^7.25.9", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-dynamic-import": "^7.25.9", + "@babel/plugin-transform-exponentiation-operator": "^7.25.9", + "@babel/plugin-transform-export-namespace-from": "^7.25.9", + "@babel/plugin-transform-for-of": "^7.25.9", + "@babel/plugin-transform-function-name": "^7.25.9", + "@babel/plugin-transform-json-strings": "^7.25.9", + "@babel/plugin-transform-literals": "^7.25.9", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-transform-member-expression-literals": "^7.25.9", + "@babel/plugin-transform-modules-amd": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.25.9", + "@babel/plugin-transform-modules-systemjs": "^7.25.9", + "@babel/plugin-transform-modules-umd": "^7.25.9", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-new-target": "^7.25.9", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9", + "@babel/plugin-transform-numeric-separator": "^7.25.9", + "@babel/plugin-transform-object-rest-spread": "^7.25.9", + "@babel/plugin-transform-object-super": "^7.25.9", + "@babel/plugin-transform-optional-catch-binding": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@babel/plugin-transform-property-literals": "^7.25.9", + "@babel/plugin-transform-regenerator": "^7.25.9", + "@babel/plugin-transform-regexp-modifiers": "^7.26.0", + "@babel/plugin-transform-reserved-words": "^7.25.9", + "@babel/plugin-transform-shorthand-properties": "^7.25.9", + "@babel/plugin-transform-spread": "^7.25.9", + "@babel/plugin-transform-sticky-regex": "^7.25.9", + "@babel/plugin-transform-template-literals": "^7.25.9", + "@babel/plugin-transform-typeof-symbol": "^7.25.9", + "@babel/plugin-transform-unicode-escapes": "^7.25.9", + "@babel/plugin-transform-unicode-property-regex": "^7.25.9", + "@babel/plugin-transform-unicode-regex": "^7.25.9", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.9", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.37.1", + "core-js-compat": "^3.38.1", "semver": "^6.3.1" }, "dependencies": { @@ -30729,16 +29688,10 @@ "esutils": "^2.0.2" } }, - "@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true - }, "@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dev": true, "requires": { "regenerator-runtime": "^0.14.0" @@ -30753,40 +29706,39 @@ } }, "@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "requires": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "requires": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" } }, "@bufbuild/buf": { @@ -30879,18 +29831,18 @@ "dev": true }, "@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dev": true, "requires": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" } }, "@eslint-community/regexpp": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", - "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true }, "@eslint/eslintrc": { @@ -30910,15 +29862,11 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "globals": { "version": "13.24.0", @@ -30929,13 +29877,13 @@ "type-fest": "^0.20.2" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "argparse": "^2.0.1" } }, "type-fest": { @@ -30959,9 +29907,9 @@ "dev": true }, "@grpc/grpc-js": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.3.tgz", - "integrity": "sha512-i9UraDzFHMR+Iz/MhFLljT+fCpgxZ3O6CxwGJ8YuNYHJItIHUzKJpW2LvoFZNnGPwqc9iWy9RAucxV0JoR9aUQ==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.2.tgz", + "integrity": "sha512-bgxdZmgTrJZX50OjyVwz3+mNEnCTNkh3cIqGPWVNeW9jX6bn1ZkU80uPd+67/ZpIJIjRQ9qaHCjhavyoWYxumg==", "requires": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" @@ -31043,27 +29991,6 @@ "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", "minimatch": "^3.0.5" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } } }, "@humanwhocodes/module-importer": { @@ -31132,70 +30059,6 @@ "get-package-type": "^0.1.0", "js-yaml": "^3.13.1", "resolve-from": "^5.0.0" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - } } }, "@istanbuljs/schema": { @@ -31413,16 +30276,6 @@ "debug": "4" } }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -31439,6 +30292,16 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -31457,6 +30320,15 @@ "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", "dev": true }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -31508,6 +30380,15 @@ } } }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, "lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", @@ -31626,6 +30507,24 @@ } } }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -31669,15 +30568,6 @@ "strip-ansi": "^6.0.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "validate-npm-package-name": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", @@ -31818,6 +30708,15 @@ "integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==", "dev": true }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -31974,6 +30873,15 @@ "read-package-json-fast": "^3.0.0" }, "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" + } + }, "glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -32081,6 +30989,15 @@ "proc-log": "^3.0.0" }, "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" + } + }, "glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -32550,7 +31467,7 @@ "@opentelemetry/api": { "version": "file:api", "requires": { - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack": "5.28.5", @@ -32567,21 +31484,21 @@ "karma-webpack": "5.0.1", "lerna": "6.6.2", "memfs": "3.5.3", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", "unionfs": "4.5.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/api-events": { "version": "file:experimental/packages/api-events", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/api-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -32593,18 +31510,18 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/api-logs": { "version": "file:experimental/packages/api-logs", "requires": { "@opentelemetry/api": "^1.3.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", @@ -32616,22 +31533,22 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/context-async-hooks": { "version": "file:packages/opentelemetry-context-async-hooks", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "typescript": "4.4.4" } @@ -32639,7 +31556,7 @@ "@opentelemetry/context-zone": { "version": "file:packages/opentelemetry-context-zone", "requires": { - "@opentelemetry/context-zone-peer-dep": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", "cross-var": "1.1.0", "lerna": "6.6.2", "typescript": "4.4.4", @@ -32649,10 +31566,10 @@ "@opentelemetry/context-zone-peer-dep": { "version": "file:packages/opentelemetry-context-zone-peer-dep", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -32667,12 +31584,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "zone.js": "0.13.3" }, @@ -32692,8 +31609,8 @@ "version": "file:packages/opentelemetry-core", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -32706,29 +31623,29 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/exporter-jaeger": { "version": "file:packages/opentelemetry-exporter-jaeger", "requires": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "jaeger-client": "^3.15.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", @@ -32741,19 +31658,19 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -32763,16 +31680,16 @@ "@opentelemetry/exporter-logs-otlp-http": { "version": "file:experimental/packages/exporter-logs-otlp-http", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -32786,12 +31703,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -32799,17 +31716,17 @@ "@opentelemetry/exporter-logs-otlp-proto": { "version": "file:experimental/packages/exporter-logs-otlp-proto", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -32821,12 +31738,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -32837,19 +31754,19 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -32859,15 +31776,15 @@ "@opentelemetry/exporter-metrics-otlp-http": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-http", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -32881,12 +31798,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -32895,18 +31812,18 @@ "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -32917,16 +31834,16 @@ "version": "file:experimental/packages/opentelemetry-exporter-prometheus", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -32938,18 +31855,18 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -32959,15 +31876,15 @@ "@opentelemetry/exporter-trace-otlp-http": { "version": "file:experimental/packages/exporter-trace-otlp-http", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -32981,12 +31898,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -32994,15 +31911,15 @@ "@opentelemetry/exporter-trace-otlp-proto": { "version": "file:experimental/packages/exporter-trace-otlp-proto", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -33014,12 +31931,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33027,14 +31944,14 @@ "@opentelemetry/exporter-zipkin": { "version": "file:packages/opentelemetry-exporter-zipkin", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33048,13 +31965,13 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33062,12 +31979,12 @@ "@opentelemetry/instrumentation": { "version": "file:experimental/packages/opentelemetry-instrumentation", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/shimmer": "^1.2.0", @@ -33076,7 +31993,6 @@ "babel-loader": "8.4.1", "babel-plugin-istanbul": "7.0.0", "codecov": "3.8.3", - "cpx2": "2.0.0", "cross-var": "1.1.0", "import-in-the-middle": "^1.8.1", "karma": "6.4.4", @@ -33086,7 +32002,7 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", @@ -33094,7 +32010,7 @@ "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33102,17 +32018,17 @@ "@opentelemetry/instrumentation-fetch": { "version": "file:experimental/packages/opentelemetry-instrumentation-fetch", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33126,12 +32042,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33143,22 +32059,22 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "@protobuf-ts/grpc-transport": "2.9.4", "@protobuf-ts/runtime": "2.9.4", "@protobuf-ts/runtime-rpc": "2.9.4", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", @@ -33169,24 +32085,24 @@ "version": "file:experimental/packages/opentelemetry-instrumentation-http", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "@types/superagent": "8.1.9", - "axios": "1.7.4", + "axios": "1.7.8", "cross-var": "1.1.0", "forwarded-parse": "2.1.2", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "request": "2.88.2", @@ -33195,35 +32111,22 @@ "sinon": "15.1.2", "superagent": "10.0.2", "typescript": "4.4.4" - }, - "dependencies": { - "axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", - "dev": true, - "requires": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - } } }, "@opentelemetry/instrumentation-xml-http-request": { "version": "file:experimental/packages/opentelemetry-instrumentation-xml-http-request", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33237,12 +32140,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33251,23 +32154,23 @@ "version": "file:integration-tests/api", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0" } }, "@opentelemetry/opentelemetry-browser-detector": { "version": "file:experimental/packages/opentelemetry-browser-detector", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -33279,12 +32182,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33292,12 +32195,12 @@ "@opentelemetry/otlp-exporter-base": { "version": "file:experimental/packages/otlp-exporter-base", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -33309,12 +32212,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33324,17 +32227,17 @@ "requires": { "@grpc/grpc-js": "^1.7.1", "@opentelemetry/api": "1.9.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/otlp-exporter-base": "0.53.0", - "@opentelemetry/otlp-transformer": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/otlp-exporter-base": "0.55.0", + "@opentelemetry/otlp-transformer": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", @@ -33345,13 +32248,13 @@ "version": "file:experimental/packages/otlp-transformer", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "7.0.0", "cross-var": "1.1.0", @@ -33362,70 +32265,25 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "protobufjs": "^7.3.0", "protobufjs-cli": "1.1.3", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" - } - }, - "@opentelemetry/propagator-aws-xray": { - "version": "file:packages/propagator-aws-xray", - "requires": { - "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "ts-loader": "9.5.1", - "typescript": "4.4.4", - "webpack": "5.94.0" - } - }, - "@opentelemetry/propagator-aws-xray-lambda": { - "version": "file:experimental/packages/propagator-aws-xray-lambda", - "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", - "@opentelemetry/api": "1.9.0", - "@opentelemetry/propagator-aws-xray": "1.26.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/sinon": "17.0.3", - "babel-loader": "8.4.1", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "9.5.1", - "typescript": "4.4.4" + "webpack": "5.96.1" } }, "@opentelemetry/propagator-b3": { "version": "file:packages/opentelemetry-propagator-b3", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4" @@ -33435,8 +32293,8 @@ "version": "file:packages/opentelemetry-propagator-jaeger", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33449,22 +32307,22 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/resources": { "version": "file:packages/opentelemetry-resources", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", + "@opentelemetry/core": "1.28.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33477,12 +32335,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -33525,8 +32383,8 @@ "@opentelemetry/sampler-jaeger-remote": { "version": "file:experimental/packages/sampler-jaeger-remote", "requires": { - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", @@ -33534,23 +32392,13 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^5.1.3", "lerna": "6.6.2", - "mocha": "10.2.0", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", "typescript": "4.4.4" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "eslint-plugin-prettier": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", @@ -33561,60 +32409,6 @@ "synckit": "^0.9.1" } }, - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", - "dev": true, - "requires": { - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.4", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.2.0", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "5.0.1", - "ms": "2.1.3", - "nanoid": "3.3.3", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "workerpool": "6.2.1", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - } - }, "ts-loader": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.4.0.tgz", @@ -33633,12 +32427,12 @@ "@opentelemetry/sdk-events": { "version": "file:experimental/packages/sdk-events", "requires": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -33652,12 +32446,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -33676,14 +32470,14 @@ "@opentelemetry/sdk-logs": { "version": "file:experimental/packages/sdk-logs", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.4.0 <1.10.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -33695,12 +32489,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -33743,12 +32537,12 @@ "@opentelemetry/sdk-metrics": { "version": "file:packages/sdk-metrics", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.3.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -33760,12 +32554,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33774,31 +32568,31 @@ "version": "file:experimental/packages/opentelemetry-sdk-node", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-logs-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/exporter-logs-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-logs": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-logs-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/exporter-logs-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "7.6.3", "sinon": "15.1.2", @@ -33810,10 +32604,10 @@ "version": "file:packages/opentelemetry-sdk-trace-base", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33827,32 +32621,32 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" } }, "@opentelemetry/sdk-trace-node": { "version": "file:packages/opentelemetry-sdk-trace-node", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "semver": "^7.5.2", "sinon": "15.1.2", @@ -33862,17 +32656,17 @@ "@opentelemetry/sdk-trace-web": { "version": "file:packages/opentelemetry-sdk-trace-web", "requires": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/jquery": "3.5.31", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/jquery": "3.5.32", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -33888,12 +32682,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" } @@ -33901,33 +32695,33 @@ "@opentelemetry/selenium-tests": { "version": "file:selenium-tests", "requires": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.4", + "@babel/plugin-proposal-decorators": "7.25.9", + "@babel/plugin-transform-runtime": "7.25.9", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-zone-peer-dep": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", "babel-loader": "8.4.1", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "130.0.0", + "chromedriver": "131.0.1", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", "webpack-merge": "5.10.0", @@ -34028,12 +32822,12 @@ "@size-limit/file": "^11.0.1", "@size-limit/time": "^11.0.1", "@size-limit/webpack": "^11.0.1", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", @@ -34047,17 +32841,17 @@ "requires": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", @@ -34069,16 +32863,16 @@ "version": "file:packages/opentelemetry-shim-opentracing", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "opentracing": "^0.14.4", "typescript": "4.4.4" @@ -34096,14 +32890,14 @@ "@opentelemetry/web-common": { "version": "file:experimental/packages/web-common", "requires": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "^0.53.0", - "@opentelemetry/sdk-trace-base": "^1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", "@types/webpack-env": "1.16.3", @@ -34117,12 +32911,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -34241,12 +33035,12 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "@puppeteer/browsers": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", - "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.1.tgz", + "integrity": "sha512-0kdAbmic3J09I6dT8e9vE2JOCSt13wHCW5x/ly8TSt2bDtuIWe2TgLZZDHdcziw9AVCzflMAXCrVyRIhIs44Ng==", "dev": true, "requires": { - "debug": "^4.3.6", + "debug": "^4.3.7", "extract-zip": "^2.0.1", "progress": "^2.0.3", "proxy-agent": "^6.4.0", @@ -34267,15 +33061,6 @@ "wrap-ansi": "^7.0.0" } }, - "debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, - "requires": { - "ms": "^2.1.3" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -34527,35 +33312,35 @@ } }, "@size-limit/file": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/file/-/file-11.1.5.tgz", - "integrity": "sha512-oz/XBVUJh95GpzDb9/f4sEQD/ACJ9zEKSRgBtvMUTN0c+O/9uq+RzvFeXFN2Kjpx3Dmur1ta+oZsp3zQFxlb3Q==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/file/-/file-11.1.6.tgz", + "integrity": "sha512-ojzzJMrTfcSECRnaTjGy0wNIolTCRdyqZTSWG9sG5XEoXG6PNgHXDDS6gf6YNxnqb+rWfCfVe93u6aKi3wEocQ==", "dev": true, "requires": {} }, "@size-limit/time": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/time/-/time-11.1.5.tgz", - "integrity": "sha512-5nNkTuafGZplkrzLWUgobx2xZtyDnwau3kQLRMQbcme6M3LtDWpFZj4FMU0+a4zRQLWgBHdFkOMYpMgQ7IUiSA==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/time/-/time-11.1.6.tgz", + "integrity": "sha512-NIlJEPvUIxw87gHjriHpPhvd9fIC94S9wq7OW25K7Ctn14FZ2NlOTezPCfVViPmdlXjBYdi8vjsbc7kLCF1EpA==", "dev": true, "requires": { "estimo": "^3.0.3" } }, "@size-limit/webpack": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@size-limit/webpack/-/webpack-11.1.5.tgz", - "integrity": "sha512-h4uJINq5/Y8qJ2oiATg4SGDgszn07b4TFWWT/w58OGt2+avrLSWgUfVM+ghkhplzKWLJK/UtvcqTg6ym2XnU9w==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@size-limit/webpack/-/webpack-11.1.6.tgz", + "integrity": "sha512-PTZCgwJsgdzdEj2wPFuLm0cCge8N2WbswMcKWNwMJibxQxPAmiF+sZ2F6GYBS7G7K3Fb4ovCliuN+wnnRACPNg==", "dev": true, "requires": { "nanoid": "^5.0.7", - "webpack": "^5.94.0" + "webpack": "^5.95.0" }, "dependencies": { "nanoid": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz", - "integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.8.tgz", + "integrity": "sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==", "dev": true } } @@ -34633,6 +33418,15 @@ "minimatch": "^9.0.0" }, "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" + } + }, "minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", @@ -34682,9 +33476,9 @@ "dev": true }, "@types/chai": { - "version": "4.3.19", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.19.tgz", - "integrity": "sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw==", + "version": "4.3.20", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", + "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==", "dev": true }, "@types/connect": { @@ -34727,6 +33521,26 @@ "@types/node": "*" } }, + "@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -34743,12 +33557,26 @@ "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" + }, + "dependencies": { + "@types/express-serve-static-core": { + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + } } }, "@types/express-serve-static-core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", - "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz", + "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==", "dev": true, "requires": { "@types/node": "*", @@ -34779,9 +33607,9 @@ } }, "@types/jquery": { - "version": "3.5.31", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.31.tgz", - "integrity": "sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==", + "version": "3.5.32", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz", + "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==", "dev": true, "requires": { "@types/sizzle": "*" @@ -34849,9 +33677,9 @@ "dev": true }, "@types/mocha": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.8.tgz", - "integrity": "sha512-HfMcUmy9hTMJh66VNcmeC9iVErIZJli2bszuXc6julh5YGuRb/W5OnkHjwLNYdFlMis0sY3If5SEAp+PktdJjw==", + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", "dev": true }, "@types/node": { @@ -34881,9 +33709,9 @@ "dev": true }, "@types/qs": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", - "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==", + "version": "6.9.17", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz", + "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==", "dev": true }, "@types/range-parser": { @@ -34905,14 +33733,15 @@ }, "dependencies": { "form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.2.tgz", + "integrity": "sha512-GgwY0PS7DbXqajuGf4OYlsrIu3zgxD6Vvql43IBhm6MahqA5SK/7mwhtNj2AdH2z35YR34ujJ7BN+3fFC3jP5Q==", "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "mime-types": "^2.1.12", + "safe-buffer": "^5.2.1" } } } @@ -34942,9 +33771,9 @@ "dev": true }, "@types/selenium-webdriver": { - "version": "4.1.26", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.26.tgz", - "integrity": "sha512-PUgqsyNffal0eAU0bzGlh37MJo558aporAPZoKqBeB/pF7zhKl1S3zqza0GpwFqgoigNxWhEIJzru75eeYco/w==", + "version": "4.1.27", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.27.tgz", + "integrity": "sha512-ALqsj8D7Swb6MnBQuAQ58J3KC3yh6fLGtAmpBmnZX8j+0kmP7NaLt56CuzBw2W2bXPrvHFTgn8iekOQFUKXEQA==", "dev": true, "requires": { "@types/node": "*", @@ -35008,9 +33837,9 @@ "dev": true }, "@types/sizzle": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", - "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz", + "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", "dev": true }, "@types/sockjs": { @@ -35066,9 +33895,9 @@ "dev": true }, "@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", + "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "dev": true, "requires": { "@types/node": "*" @@ -35199,148 +34028,148 @@ "dev": true }, "@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -35391,33 +34220,6 @@ "requires": { "js-yaml": "^3.10.0", "tslib": "^2.4.0" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - } } }, "@zkochan/js-yaml": { @@ -35427,6 +34229,14 @@ "dev": true, "requires": { "argparse": "^2.0.1" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + } } }, "abab": { @@ -35451,9 +34261,9 @@ } }, "acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==" + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==" }, "acorn-globals": { "version": "6.0.0", @@ -35611,9 +34421,9 @@ "integrity": "sha512-bF6xLaZBLpOQzgYUtYEhJx090nPSZk1BQ/q2oyBK9aMMcJHzx9uXGCjI2Y+LebsN4Jwoykr0V9whbPiogdyHoQ==" }, "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true }, "ansi-escapes": { @@ -35732,16 +34542,6 @@ "readable-stream": "^2.0.0" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -35755,15 +34555,6 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } } } }, @@ -35803,10 +34594,13 @@ "dev": true }, "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } }, "argv": { "version": "0.0.2", @@ -35843,12 +34637,6 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", - "dev": true - }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -35959,16 +34747,15 @@ "dev": true }, "axe-core": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz", - "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==", + "version": "4.10.2", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz", + "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==", "dev": true }, "axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "dev": true, + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "requires": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -35976,9 +34763,9 @@ } }, "b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true }, "babel-code-frame": { @@ -36073,16 +34860,6 @@ "source-map": "^0.5.7" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -36104,15 +34881,6 @@ "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", "dev": true }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -36349,13 +35117,13 @@ } }, "babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz", + "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==", "dev": true, "requires": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.3", "semver": "^6.3.1" }, "dependencies": { @@ -36378,12 +35146,12 @@ } }, "babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz", + "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.3" } }, "babel-plugin-syntax-async-functions": { @@ -36777,6 +35545,12 @@ "regjsparser": "^0.1.4" } }, + "regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==", + "dev": true + }, "regjsparser": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", @@ -37047,14 +35821,6 @@ "esutils": "^2.0.2", "lodash": "^4.17.4", "to-fast-properties": "^1.0.3" - }, - "dependencies": { - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==", - "dev": true - } } }, "babylon": { @@ -37066,8 +35832,8 @@ "backcompat-node14": { "version": "file:experimental/backwards-compatibility/node14", "requires": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "@types/node": "14.18.25", "typescript": "4.4.4" }, @@ -37083,8 +35849,8 @@ "backcompat-node16": { "version": "file:experimental/backwards-compatibility/node16", "requires": { - "@opentelemetry/sdk-node": "0.53.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/sdk-node": "0.55.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "@types/node": "16.11.52", "typescript": "4.4.4" }, @@ -37104,9 +35870,9 @@ "dev": true }, "bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "dev": true, "optional": true }, @@ -37140,13 +35906,12 @@ } }, "bare-stream": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", - "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.4.2.tgz", + "integrity": "sha512-XZ4ln/KV4KT+PXdIWTKjsLY+quqCaEtqqtgGJVPw9AoM73By03ij64YjepK0aQvHSWDb6AfAZwqKaFu68qkrdA==", "dev": true, "optional": true, "requires": { - "b4a": "^1.6.6", "streamx": "^2.20.0" } }, @@ -37354,9 +36119,9 @@ } }, "bonjour-service": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", - "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz", + "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3", @@ -37422,12 +36187,13 @@ } }, "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "^1.0.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, "braces": { @@ -37452,15 +36218,15 @@ "dev": true }, "browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "update-browserslist-db": "^1.1.1" } }, "browserstack-local": { @@ -37560,6 +36326,15 @@ "unique-filename": "^3.0.0" }, "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" + } + }, "glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -37725,9 +36500,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001663", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz", - "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==", + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", "dev": true }, "caseless": { @@ -37762,17 +36537,6 @@ "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, "chardet": { @@ -37788,9 +36552,9 @@ "dev": true }, "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -37801,6 +36565,17 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } } }, "chownr": { @@ -37816,9 +36591,9 @@ "dev": true }, "chromedriver": { - "version": "130.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-130.0.0.tgz", - "integrity": "sha512-1g1eMoKF22Uh6l8DTFOPvWLovINPrkAMw7yDHlF6Rx+4W4JI9aGdCZ2Cx7c181hUgALU1oSKGH3uKNryYM5DaQ==", + "version": "131.0.1", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.1.tgz", + "integrity": "sha512-LHRh+oaNU1WowJjAkWsviN8pTzQYJDbv/FvJyrQ7XhjKdIzVh/s3GV1iU7IjMTsxIQnBsTjx+9jWjzCWIXC7ug==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", @@ -38001,12 +36776,6 @@ "mkdirp-infer-owner": "^2.0.0" } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, "codecov": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.8.3.tgz", @@ -38020,25 +36789,6 @@ "urlgrey": "1.0.0" }, "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "ignore-walk": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", @@ -38047,31 +36797,6 @@ "requires": { "minimatch": "^3.0.4" } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true } } }, @@ -38210,26 +36935,20 @@ } }, "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", + "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", "dev": true, "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", + "bytes": "3.1.2", + "compressible": "~2.0.18", "debug": "2.6.9", + "negotiator": "~0.6.4", "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", + "safe-buffer": "5.2.1", "vary": "~1.1.2" }, "dependencies": { - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -38245,10 +36964,10 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", "dev": true } } @@ -38315,6 +37034,12 @@ "ms": "2.0.0" } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -38557,12 +37282,12 @@ "dev": true }, "core-js-compat": { - "version": "3.38.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", - "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", + "version": "3.39.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz", + "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==", "dev": true, "requires": { - "browserslist": "^4.23.3" + "browserslist": "^4.24.2" } }, "core-util-is": { @@ -38594,87 +37319,6 @@ "yaml": "^1.10.0" } }, - "cpx2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cpx2/-/cpx2-2.0.0.tgz", - "integrity": "sha512-hSkh9xHmUnHMxVS99SpACbAw6jOCaji0KyepBQ4/ULZQ+RB+3uP2PB/zylOCjSxZv9/cvoeG1XuQbZPyNuYftA==", - "dev": true, - "requires": { - "co": "^4.6.0", - "debounce": "^1.2.0", - "debug": "^4.1.1", - "duplexer": "^0.1.1", - "fs-extra": "^8.1.0", - "glob": "^7.1.4", - "glob2base": "0.0.12", - "minimatch": "^3.0.4", - "resolve": "^1.12.0", - "safe-buffer": "^5.2.0", - "shell-quote": "^1.7.1", - "subarg": "^1.0.0" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - } - } - }, "crc-32": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", @@ -38720,9 +37364,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -38895,25 +37539,12 @@ "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", "dev": true }, - "debounce": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", - "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", - "dev": true - }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "requires": { - "ms": "2.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } + "ms": "^2.1.3" } }, "decamelize": { @@ -39164,9 +37795,9 @@ "dev": true }, "diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true }, "dir-glob": { @@ -39299,6 +37930,15 @@ "yargs": "^17.7.1" }, "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" + } + }, "cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -39379,9 +38019,9 @@ } }, "typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", "dev": true }, "wrap-ansi": { @@ -39463,9 +38103,9 @@ } }, "electron-to-chromium": { - "version": "1.5.27", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.27.tgz", - "integrity": "sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==", + "version": "1.5.64", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", + "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==", "dev": true }, "email-addresses": { @@ -39495,9 +38135,9 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "encoding": { "version": "0.1.13", @@ -39531,9 +38171,9 @@ } }, "engine.io": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.1.tgz", - "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz", + "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==", "dev": true, "requires": { "@types/cookie": "^0.4.1", @@ -39541,7 +38181,7 @@ "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "~0.4.1", + "cookie": "~0.7.2", "cors": "~2.8.5", "debug": "~4.3.1", "engine.io-parser": "~5.2.1", @@ -39549,9 +38189,9 @@ }, "dependencies": { "cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true }, "ws": { @@ -39764,20 +38404,16 @@ "text-table": "^0.2.0" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -39801,13 +38437,14 @@ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "requires": { - "is-glob": "^4.0.3" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" } }, "globals": { @@ -39819,13 +38456,40 @@ "type-fest": "^0.20.2" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "argparse": "^2.0.1" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" } }, "shebang-command": { @@ -39898,25 +38562,6 @@ "semver": "^6.1.0" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -39984,13 +38629,13 @@ "version": "file:examples/esm-http-ts", "requires": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" } }, "espree": { @@ -40136,11 +38781,11 @@ "version": "file:experimental/examples/events", "requires": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-events": "0.53.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/exporter-logs-otlp-http": "0.53.0", - "@opentelemetry/sdk-events": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0", + "@opentelemetry/api-events": "0.55.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/exporter-logs-otlp-http": "0.55.0", + "@opentelemetry/sdk-events": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0", "@types/node": "18.6.5", "ts-node": "^10.9.1" } @@ -40149,17 +38794,17 @@ "version": "file:examples/otlp-exporter-node", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" } }, "execa": { @@ -40180,9 +38825,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -40284,24 +38929,12 @@ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } } }, - "encodeurl": { + "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "qs": { "version": "6.11.0", @@ -40310,33 +38943,6 @@ "requires": { "side-channel": "^1.0.4" } - }, - "send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" - } - } } } }, @@ -40414,6 +39020,17 @@ "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.4" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } } }, "fast-json-stable-stringify": { @@ -40435,9 +39052,9 @@ "dev": true }, "fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", "dev": true }, "fast-url-parser": { @@ -40521,6 +39138,26 @@ "dev": true, "requires": { "minimatch": "^5.0.1" + }, + "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" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "filename-reserved-regex": { @@ -40571,6 +39208,11 @@ "ms": "2.0.0" } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -40598,19 +39240,13 @@ "@puppeteer/browsers": "^2.1.0" } }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==", - "dev": true - }, "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^6.0.0", + "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, @@ -40632,9 +39268,9 @@ } }, "flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true }, "follow-redirects": { @@ -40662,9 +39298,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -40705,9 +39341,9 @@ "dev": true }, "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -40715,13 +39351,13 @@ } }, "formidable": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz", - "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", + "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", "dev": true, "requires": { "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", + "hexoid": "^2.0.0", "once": "^1.4.0" } }, @@ -41074,9 +39710,9 @@ } }, "gh-pages": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz", - "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.2.0.tgz", + "integrity": "sha512-HMXJ8th9u5wRXaZCnLcs/d3oVvCHiZkaP5KQExQljYGwJjQbSPyTdHe/Gc1IvYUR/rWiZLxNobIqfoMHKTKjHQ==", "dev": true, "requires": { "async": "^3.2.4", @@ -41085,70 +39721,7 @@ "filenamify": "^4.3.0", "find-cache-dir": "^3.3.1", "fs-extra": "^11.1.1", - "globby": "^6.1.0" - }, - "dependencies": { - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true - } + "globby": "^11.1.0" } }, "git-raw-commits": { @@ -41242,6 +39815,15 @@ "path-scurry": "^2.0.0" }, "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" + } + }, "minimatch": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", @@ -41254,12 +39836,12 @@ } }, "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" } }, "glob-to-regexp": { @@ -41268,15 +39850,6 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==", - "dev": true, - "requires": { - "find-index": "^0.1.1" - } - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -41529,9 +40102,9 @@ } }, "hexoid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", - "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", + "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", "dev": true }, "home-or-tmp": { @@ -41545,9 +40118,9 @@ } }, "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.3.tgz", + "integrity": "sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==", "dev": true, "requires": { "lru-cache": "^7.5.1" @@ -41634,14 +40207,14 @@ "version": "file:examples/http", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "cross-env": "^6.0.0" } }, @@ -41685,9 +40258,9 @@ } }, "http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, "requires": { "@types/http-proxy": "^1.17.8", @@ -41730,14 +40303,14 @@ "version": "file:examples/https", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.26.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-http": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/exporter-jaeger": "1.28.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-http": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "cross-env": "^6.0.0" } }, @@ -41793,6 +40366,26 @@ "dev": true, "requires": { "minimatch": "^5.0.1" + }, + "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" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "immediate": { @@ -41820,9 +40413,9 @@ } }, "import-in-the-middle": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz", - "integrity": "sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz", + "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==", "requires": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", @@ -42023,6 +40616,14 @@ "requires": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" + }, + "dependencies": { + "sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true + } } }, "ip-regex": { @@ -42373,9 +40974,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -42437,15 +41038,6 @@ "requires": { "semver": "^7.5.3" } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } } } }, @@ -42479,13 +41071,12 @@ } }, "jackspeak": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", - "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", + "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", "dev": true, "requires": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" + "@isaacs/cliui": "^8.0.2" } }, "jaeger-client": { @@ -42510,27 +41101,6 @@ "chalk": "^4.0.2", "filelist": "^1.0.4", "minimatch": "^3.1.2" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } } }, "jest-worker": { @@ -42542,23 +41112,12 @@ "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^7.0.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, "jiti": { - "version": "1.21.6", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", - "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.0.tgz", + "integrity": "sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==", "dev": true }, "js-tokens": { @@ -42568,12 +41127,13 @@ "dev": true }, "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { - "argparse": "^2.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "js2xmlparser": { @@ -42592,9 +41152,9 @@ "dev": true }, "jsdoc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", - "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", + "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", "dev": true, "requires": { "@babel/parser": "^7.20.15", @@ -42691,9 +41251,9 @@ } }, "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true }, "json-buffer": { @@ -42762,9 +41322,9 @@ } }, "jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", "dev": true }, "jsonfile": { @@ -42867,16 +41427,6 @@ "yargs": "^16.1.1" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -42891,15 +41441,6 @@ "path-is-absolute": "^1.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -42931,16 +41472,6 @@ "minimatch": "^3.0.4" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "istanbul-lib-instrument": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", @@ -42954,15 +41485,6 @@ "semver": "^6.3.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -42995,27 +41517,6 @@ "requires": { "jsonbird": "^2.0.0", "minimatch": "^3.0.3" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } } }, "karma-spec-reporter": { @@ -43052,16 +41553,6 @@ "path-is-absolute": "^1.0.0" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -43080,6 +41571,17 @@ "dev": true, "requires": { "brace-expansion": "^2.0.1" + }, + "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" + } + } } }, "webpack-merge": { @@ -43220,15 +41722,11 @@ "yargs-parser": "20.2.4" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "chalk": { "version": "4.1.0", @@ -43290,12 +41788,30 @@ } } }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, "lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -43355,15 +41871,6 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } } } }, @@ -43536,9 +42043,9 @@ } }, "linkinator": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.0.6.tgz", - "integrity": "sha512-5Hc0qIB8pSXeNQej30ruUHqu37gbJf8o3tu4qNeJCZX9/jZ80BkOrRhst3fR9ipizLFy24HgKmqCFilGOrtZjQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.1.2.tgz", + "integrity": "sha512-PndSrQe21Hf4sn2vZldEzJmD0EUJbIsEy4jcZLcHd6IZfQ6rC6iv+Fwo666TWM9DcXjbCrHpxnVX6xaGrcJ/eA==", "dev": true, "requires": { "chalk": "^5.0.0", @@ -43553,6 +42060,15 @@ "srcset": "^5.0.0" }, "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" + } + }, "chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", @@ -43660,12 +42176,12 @@ } }, "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^5.0.0" + "p-locate": "^4.1.0" } }, "lodash": { @@ -43889,8 +42405,8 @@ "version": "file:experimental/examples/logs", "requires": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/api-logs": "0.53.0", - "@opentelemetry/sdk-logs": "0.53.0", + "@opentelemetry/api-logs": "0.55.0", + "@opentelemetry/sdk-logs": "0.55.0", "@types/node": "18.6.5", "ts-node": "^10.9.1" } @@ -44005,6 +42521,15 @@ "debug": "4" } }, + "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" + } + }, "cacache": { "version": "16.1.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", @@ -44069,6 +42594,15 @@ "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, "minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -44134,6 +42668,14 @@ "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + } } }, "markdown-it-anchor": { @@ -44144,33 +42686,39 @@ "requires": {} }, "markdownlint": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", - "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.36.1.tgz", + "integrity": "sha512-s73fU2CQN7WCgjhaQUQ8wYESQNzGRNOKDd+3xgVqu8kuTEhmwepd/mxOv1LR2oV046ONrTLBFsM7IoKWNvmy5g==", "dev": true, "requires": { "markdown-it": "14.1.0", - "markdownlint-micromark": "0.1.9" + "markdownlint-micromark": "0.1.12" } }, "markdownlint-cli2": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.13.0.tgz", - "integrity": "sha512-Pg4nF7HlopU97ZXtrcVISWp3bdsuc5M0zXyLp2/sJv2zEMlInrau0ZKK482fQURzVezJzWBpNmu4u6vGAhij+g==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.15.0.tgz", + "integrity": "sha512-4P/lnxQxU2R5lywRJs4b2ajm8z65CW8qqR1bTIcdQ5EG+nZpC6HJlJUnmIR5ee+uecUkoMroazxWcLB7etSmrg==", "dev": true, "requires": { - "globby": "14.0.1", + "globby": "14.0.2", "js-yaml": "4.1.0", - "jsonc-parser": "3.2.1", - "markdownlint": "0.34.0", - "markdownlint-cli2-formatter-default": "0.0.4", - "micromatch": "4.0.5" + "jsonc-parser": "3.3.1", + "markdownlint": "0.36.1", + "markdownlint-cli2-formatter-default": "0.0.5", + "micromatch": "4.0.8" }, "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "globby": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", - "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", + "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", "dev": true, "requires": { "@sindresorhus/merge-streams": "^2.1.0", @@ -44181,14 +42729,13 @@ "unicorn-magic": "^0.1.0" } }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" + "argparse": "^2.0.1" } }, "path-type": { @@ -44206,16 +42753,16 @@ } }, "markdownlint-cli2-formatter-default": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.4.tgz", - "integrity": "sha512-xm2rM0E+sWgjpPn1EesPXx5hIyrN2ddUnUwnbCsD/ONxYtw3PX6LydvdH6dciWAoFDpwzbHM1TO7uHfcMd6IYg==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.5.tgz", + "integrity": "sha512-4XKTwQ5m1+Txo2kuQ3Jgpo/KmnG+X90dWt4acufg6HVGadTUG5hzHF/wssp9b5MBYOMCnZ9RMPaU//uHsszF8Q==", "dev": true, "requires": {} }, "markdownlint-micromark": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", - "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.12.tgz", + "integrity": "sha512-RlB6EwMGgc0sxcIhOQ2+aq7Zw1V2fBnzbXKGgYK/mVWdT7cz34fteKSwfYeo4rL6+L/q2tyC9QtD/PgZbkdyJQ==", "dev": true }, "marked": { @@ -44273,16 +42820,6 @@ "yargs-parser": "^20.2.3" }, "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -44292,15 +42829,6 @@ "lru-cache": "^6.0.0" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -44322,24 +42850,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -44493,12 +43003,12 @@ "dev": true }, "minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -44745,9 +43255,9 @@ } }, "mocha": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", - "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, "requires": { "ansi-colors": "^4.1.3", @@ -44772,26 +43282,30 @@ "yargs-unparser": "^2.0.0" }, "dependencies": { - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "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": { - "ms": "^2.1.3" + "balanced-match": "^1.0.0" } }, - "diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } }, "glob": { "version": "8.1.0", @@ -44806,6 +43320,24 @@ "once": "^1.3.0" } }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, "minimatch": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", @@ -44815,20 +43347,32 @@ "brace-expansion": "^2.0.1" } }, - "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "yocto-queue": "^0.1.0" } }, - "workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } }, "yargs-parser": { "version": "20.2.9", @@ -44888,25 +43432,6 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } } } }, @@ -44917,18 +43442,18 @@ "dev": true }, "nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", + "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==", "dev": true }, "nanospinner": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.1.0.tgz", - "integrity": "sha512-yFvNYMig4AthKYfHFl1sLj7B2nkHL4lzdig4osvl9/LdGbXwrdFRoqBS98gsEsOakr0yH+r5NZ/1Y9gdVB8trA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.2.0.tgz", + "integrity": "sha512-dGxYcEj8YhuxjVO3PYmnj1nBhtwUkvuwYbLl/MduBPmQUPy3xBtG/ScJgqZgntQkX44UQaCSlFeW4rS5fUR/Sw==", "dev": true, "requires": { - "picocolors": "^1.0.0" + "picocolors": "^1.1.1" } }, "natural-compare": { @@ -45017,14 +43542,32 @@ "uuid": "8.3.2" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" } }, "ci-info": { @@ -45050,6 +43593,12 @@ } } }, + "diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true + }, "dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -45071,6 +43620,16 @@ "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -45096,22 +43655,40 @@ "path-is-absolute": "^1.0.0" } }, - "lru-cache": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "requires": { - "yallist": "^4.0.0" + "p-locate": "^5.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "yallist": "^4.0.0" } }, "minimist": { @@ -45194,6 +43771,24 @@ "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "dev": true }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -45203,6 +43798,24 @@ "lru-cache": "^6.0.0" } }, + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -45346,16 +43959,6 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -45370,15 +43973,6 @@ "path-is-absolute": "^1.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "nopt": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", @@ -45400,9 +43994,9 @@ } }, "node-gyp-build": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", - "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", "dev": true }, "node-int64": { @@ -45546,6 +44140,15 @@ "npm-normalize-package-bin": "^1.0.1" }, "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" + } + }, "glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -45559,6 +44162,15 @@ "once": "^1.3.0" } }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, "npm-bundled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", @@ -45756,9 +44368,9 @@ } }, "nwsapi": { - "version": "2.2.12", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", - "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", + "version": "2.2.13", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz", + "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==", "dev": true }, "nx": { @@ -45813,15 +44425,11 @@ "yargs-parser": "21.1.1" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "dotenv": { "version": "10.0.0", @@ -45862,6 +44470,24 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, "jsonc-parser": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", @@ -45994,16 +44620,6 @@ "yargs": "^15.0.2" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -46022,9 +44638,9 @@ "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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -46038,16 +44654,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -46084,42 +44690,6 @@ "semver": "^6.3.0" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, "p-map": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", @@ -46237,9 +44807,9 @@ "dev": true }, "object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==" }, "object-is": { "version": "1.1.6", @@ -46325,13 +44895,13 @@ "@opencensus/instrumentation-http": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.9.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.53.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-node": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@opentelemetry/shim-opencensus": "0.53.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.55.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-node": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@opentelemetry/shim-opencensus": "0.55.0" } }, "opentracing": { @@ -46404,21 +44974,21 @@ "dev": true }, "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "yocto-queue": "^0.1.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^3.0.2" + "p-limit": "^2.2.0" } }, "p-map": { @@ -46581,9 +45151,9 @@ } }, "package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true }, "pacote": { @@ -46625,6 +45195,15 @@ "which": "^3.0.0" } }, + "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" + } + }, "glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -46887,9 +45466,9 @@ }, "dependencies": { "lru-cache": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", - "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", + "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", "dev": true } } @@ -46933,9 +45512,9 @@ "dev": true }, "picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true }, "picomatch": { @@ -46950,21 +45529,6 @@ "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", "dev": true }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, "piscina": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", @@ -46984,45 +45548,6 @@ "dev": true, "requires": { "find-up": "^4.0.0" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - } } }, "platform": { @@ -47085,9 +45610,9 @@ "dev": true }, "prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true }, "prettier-linter-helpers": { @@ -47143,9 +45668,9 @@ "dev": true }, "process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", + "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", "dev": true, "requires": { "fromentries": "^1.2.0" @@ -47161,8 +45686,8 @@ "version": "file:experimental/examples/prometheus", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0" + "@opentelemetry/exporter-prometheus": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0" } }, "promise-all-reject-late": { @@ -47212,25 +45737,13 @@ "version": "file:integration-tests/propagation-validation-server", "requires": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "axios": "1.7.4", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "axios": "1.7.8", "body-parser": "1.20.3", "express": "4.20.0", "typescript": "4.4.4" - }, - "dependencies": { - "axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", - "requires": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - } } }, "proto-list": { @@ -47276,6 +45789,15 @@ "uglify-js": "^3.7.7" }, "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" + } + }, "escodegen": { "version": "1.14.3", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", @@ -47326,6 +45848,15 @@ "type-check": "~0.3.2" } }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -47470,10 +46001,21 @@ "dev": true }, "psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz", + "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==", + "dev": true, + "requires": { + "punycode": "^2.3.1" + }, + "dependencies": { + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true + } + } }, "pump": { "version": "3.0.2", @@ -47537,6 +46079,15 @@ "wrap-ansi": "^7.0.0" } }, + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "devtools-protocol": { "version": "0.0.1262051", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1262051.tgz", @@ -47558,6 +46109,12 @@ "yallist": "^4.0.0" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "semver": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", @@ -47750,6 +46307,15 @@ "npm-normalize-package-bin": "^1.0.1" }, "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" + } + }, "glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -47784,6 +46350,15 @@ "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, "normalize-package-data": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.1.tgz", @@ -47987,6 +46562,15 @@ "minimatch": "^5.1.0" }, "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" + } + }, "minimatch": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", @@ -48057,15 +46641,15 @@ } }, "regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, "requires": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" } }, "regexpp": { @@ -48075,40 +46659,32 @@ "dev": true }, "regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "requires": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" } }, "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", "dev": true }, "regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true - } + "jsesc": "~3.0.2" } }, "release-zalgo": { @@ -48255,16 +46831,6 @@ "debug": "^4.3.5", "module-details-from-path": "^1.0.3", "resolve": "^1.22.8" - }, - "dependencies": { - "debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "requires": { - "ms": "^2.1.3" - } - } } }, "require-main-filename": { @@ -48373,16 +46939,6 @@ "glob": "^7.1.3" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -48396,15 +46952,6 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } } } }, @@ -48501,9 +47048,9 @@ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -48535,6 +47082,11 @@ } } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -48543,9 +47095,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -48628,6 +47180,53 @@ "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "0.18.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + } + } } }, "server-destroy": { @@ -48731,14 +47330,6 @@ "dev": true, "requires": { "nanoid": "^2.1.0" - }, - "dependencies": { - "nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==", - "dev": true - } } }, "side-channel": { @@ -48876,55 +47467,37 @@ "diff": "^5.1.0", "nise": "^5.1.4", "supports-color": "^7.2.0" - }, - "dependencies": { - "diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, "size-limit": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/size-limit/-/size-limit-11.1.5.tgz", - "integrity": "sha512-dtw/Tcm+9aonYySPG6wQCe1BwogK5HRGSrSqr0zXGfKtynJGvKAsyHCTGxdphFEHjHRoHFWua3D3zqYLUVVIig==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/size-limit/-/size-limit-11.1.6.tgz", + "integrity": "sha512-S5ux2IB8rU26xwVgMskmknGMFkieaIAqDLuwgKiypk6oa4lFsie8yFPrzRFV+yrLDY2GddjXuCaVk5PveVOHiQ==", "dev": true, "requires": { "bytes-iec": "^3.1.1", - "chokidar": "^3.6.0", - "jiti": "^1.21.6", + "chokidar": "^4.0.1", + "jiti": "^2.0.0", "lilconfig": "^3.1.2", "nanospinner": "^1.1.0", "picocolors": "^1.1.0", - "tinyglobby": "^0.2.6" + "tinyglobby": "^0.2.7" }, "dependencies": { "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", + "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", "dev": true, "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" } + }, + "readdirp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", + "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "dev": true } } }, @@ -48941,9 +47514,9 @@ "dev": true }, "socket.io": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz", - "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz", + "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==", "dev": true, "requires": { "accepts": "~1.3.4", @@ -49072,9 +47645,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -49228,9 +47801,9 @@ } }, "sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, "srcset": { @@ -49376,9 +47949,9 @@ } }, "streamx": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", - "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", + "version": "2.20.2", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.2.tgz", + "integrity": "sha512-aDGDLU+j9tJcUdPGOaHmVF1u/hhI+CsGkT02V3OKlHDV7IukOI+nTWAGkiZEKCO35rWN1wIr4tS7YFr1f4qSvA==", "dev": true, "requires": { "bare-events": "^2.2.0", @@ -49534,15 +48107,6 @@ "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==", "dev": true }, - "subarg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", - "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", - "dev": true, - "requires": { - "minimist": "^1.1.0" - } - }, "superagent": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.0.2.tgz", @@ -49561,9 +48125,9 @@ } }, "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -49581,9 +48145,9 @@ "dev": true }, "synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, "requires": { "@pkgr/core": "^0.1.0", @@ -49786,16 +48350,6 @@ "rimraf": "~2.5.2" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -49810,15 +48364,6 @@ "path-is-absolute": "^1.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "rimraf": { "version": "2.5.4", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", @@ -49858,9 +48403,9 @@ } }, "terser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", - "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", + "version": "5.36.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz", + "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.3", @@ -49930,16 +48475,6 @@ "rimraf": "^3.0.2" } }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "cacache": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", @@ -49998,15 +48533,6 @@ "yallist": "^4.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -50022,6 +48548,15 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, "schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -50094,16 +48629,6 @@ "minimatch": "^3.0.4" }, "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -50117,26 +48642,14 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } } } }, "text-decoder": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", - "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", - "dev": true, - "requires": { - "b4a": "^1.6.4" - } + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.1.tgz", + "integrity": "sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ==", + "dev": true }, "text-extensions": { "version": "1.9.0", @@ -50202,19 +48715,19 @@ "dev": true }, "tinyglobby": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.6.tgz", - "integrity": "sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==", + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.10.tgz", + "integrity": "sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==", "dev": true, "requires": { - "fdir": "^6.3.0", + "fdir": "^6.4.2", "picomatch": "^4.0.2" }, "dependencies": { "fdir": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz", - "integrity": "sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz", + "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==", "dev": true, "requires": {} }, @@ -50233,9 +48746,9 @@ "dev": true }, "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==", "dev": true }, "to-regex-range": { @@ -50425,9 +48938,9 @@ } }, "tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true }, "tsutils": { @@ -50624,6 +49137,15 @@ "shiki": "^0.10.1" }, "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" + } + }, "glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -50808,13 +49330,13 @@ "dev": true }, "update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "dev": true, "requires": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" } }, "uri-js": { @@ -51029,20 +49551,20 @@ "@babel/core": "^7.23.6", "@babel/preset-env": "^7.22.20", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", @@ -51067,18 +49589,18 @@ "dev": true }, "webpack": { - "version": "5.94.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", - "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "version": "5.96.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz", + "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==", "dev": true, "requires": { - "@types/estree": "^1.0.5", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", "@webassemblyjs/ast": "^1.12.1", "@webassemblyjs/wasm-edit": "^1.12.1", "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-attributes": "^1.9.5", - "browserslist": "^4.21.10", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", @@ -51135,13 +49657,13 @@ "ajv-keywords": "^3.5.2" } }, - "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "has-flag": "^4.0.0" } }, "tapable": { @@ -51199,9 +49721,9 @@ "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==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -51559,9 +50081,9 @@ "dev": true }, "workerpool": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", - "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", "dev": true }, "wrap-ansi": { @@ -51907,16 +50429,6 @@ "readable-stream": "^3.6.0" } }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -51931,15 +50443,6 @@ "path-is-absolute": "^1.0.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index dc11f3e0d25..a6716f73ede 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "5.0.1", - "gh-pages": "6.0.0", + "gh-pages": "6.2.0", "glob": "^11.0.0", "karma": "6.4.4", "karma-chrome-launcher": "3.1.0", @@ -104,9 +104,9 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "linkinator": "6.0.6", - "markdownlint-cli2": "0.13.0", - "prettier": "3.0.3", + "linkinator": "6.1.2", + "markdownlint-cli2": "0.15.0", + "prettier": "3.3.3", "process": "0.11.10", "semver": "7.6.3", "typedoc": "0.22.18", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 47cd865ea32..8fb9d55ca54 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,11 +45,11 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "typescript": "4.4.4" }, diff --git a/packages/opentelemetry-context-zone-peer-dep/README.md b/packages/opentelemetry-context-zone-peer-dep/README.md index a505b9fbdda..da50eeb5fea 100644 --- a/packages/opentelemetry-context-zone-peer-dep/README.md +++ b/packages/opentelemetry-context-zone-peer-dep/README.md @@ -27,8 +27,9 @@ import { } from '@opentelemetry/sdk-trace-web'; import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep'; -const providerWithZone = new WebTracerProvider(); -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const providerWithZone = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); providerWithZone.register({ contextManager: new ZoneContextManager() }); diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index a577bece4d4..b2c0412c781 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -53,10 +53,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -71,12 +71,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "zone.js": "0.13.3" }, diff --git a/packages/opentelemetry-context-zone/README.md b/packages/opentelemetry-context-zone/README.md index 0162f9645d1..7b6d094e59b 100644 --- a/packages/opentelemetry-context-zone/README.md +++ b/packages/opentelemetry-context-zone/README.md @@ -24,8 +24,9 @@ import { } from '@opentelemetry/sdk-trace-web'; import { ZoneContextManager } from '@opentelemetry/context-zone'; -const providerWithZone = new WebTracerProvider(); -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const providerWithZone = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); providerWithZone.register({ contextManager: new ZoneContextManager() }); diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index f4182eddf09..9bd77a8850e 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,7 +56,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0" }, "sideEffects": true, diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 7b821333141..3bb4ec562e3 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -64,7 +64,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -77,18 +77,18 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-core/src/common/time.ts b/packages/opentelemetry-core/src/common/time.ts index 8d3051b00c1..89f5bfd3f60 100644 --- a/packages/opentelemetry-core/src/common/time.ts +++ b/packages/opentelemetry-core/src/common/time.ts @@ -111,7 +111,7 @@ export function hrTimeDuration( export function hrTimeToTimeStamp(time: api.HrTime): string { const precision = NANOSECOND_DIGITS; const tmp = `${'0'.repeat(precision)}${time[1]}Z`; - const nanoString = tmp.substr(tmp.length - precision - 1); + const nanoString = tmp.substring(tmp.length - precision - 1); const date = new Date(time[0] * 1000).toISOString(); return date.replace('000Z', nanoString); } diff --git a/packages/opentelemetry-core/src/platform/browser/globalThis.ts b/packages/opentelemetry-core/src/platform/browser/globalThis.ts index b9b12b7228c..81254595d06 100644 --- a/packages/opentelemetry-core/src/platform/browser/globalThis.ts +++ b/packages/opentelemetry-core/src/platform/browser/globalThis.ts @@ -30,9 +30,9 @@ export const _globalThis: typeof globalThis = typeof globalThis === 'object' ? globalThis : typeof self === 'object' - ? self - : typeof window === 'object' - ? window - : typeof global === 'object' - ? global - : ({} as typeof globalThis); + ? self + : typeof window === 'object' + ? window + : typeof global === 'object' + ? global + : ({} as typeof globalThis); diff --git a/packages/opentelemetry-exporter-jaeger/README.md b/packages/opentelemetry-exporter-jaeger/README.md index 7e662a345e8..c686af7b29e 100644 --- a/packages/opentelemetry-exporter-jaeger/README.md +++ b/packages/opentelemetry-exporter-jaeger/README.md @@ -84,7 +84,11 @@ const exporter = new JaegerExporter(options); Now, register the exporter. ```js -tracer.addSpanProcessor(new BatchSpanProcessor(exporter)); +const tracerProvider = new NodeTracerProvider({ + spanProcessors: [new BatchSpanProcessor(exporter)] +}) + +const tracer = traceProvider.getTracer('my-tracer') ``` You can use built-in `SimpleSpanProcessor` or `BatchSpanProcessor` or write your own. diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 5d0f3c44878..b34fc78da43 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,13 +45,13 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/packages/opentelemetry-exporter-zipkin/README.md b/packages/opentelemetry-exporter-zipkin/README.md index dc9d57ad75c..2d4244ac823 100644 --- a/packages/opentelemetry-exporter-zipkin/README.md +++ b/packages/opentelemetry-exporter-zipkin/README.md @@ -41,7 +41,11 @@ const exporter = new ZipkinExporter(options); Now, register the exporter and start tracing. ```js -tracer.addSpanProcessor(new BatchSpanProcessor(exporter)); +const tracerProvider = new NodeTracerProvider({ + spanProcessors: [new BatchSpanProcessor(exporter)] +}) + +const tracer = traceProvider.getTracer('my-tracer') ``` You can use built-in `SimpleSpanProcessor` or `BatchSpanProcessor` or write your own. diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 2ef3da6a87a..53ce039a0d1 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -59,10 +59,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -76,13 +76,13 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -90,10 +90,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index e0f5a038bf1..1b8da9a2b7a 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -51,18 +51,18 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.26.0" + "@opentelemetry/core": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "ts-loader": "9.5.1", "typescript": "4.4.4" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index d20ccdcbf4a..3b072f7a329 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -55,7 +55,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -68,18 +68,18 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0" + "@opentelemetry/core": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index b1d3a2a2304..3345b3204ac 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -65,7 +65,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -78,12 +78,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -91,8 +91,8 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 273d6126302..3ed55440966 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -65,7 +65,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -79,20 +79,20 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0" + "webpack": "5.96.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts index c06f5cdcb61..13cdb8e9b6c 100644 --- a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts @@ -80,17 +80,28 @@ export class BasicTracerProvider implements TracerProvider { reconfigureLimits(config) ); this.resource = mergedConfig.resource ?? Resource.empty(); - this.resource = Resource.default().merge(this.resource); + + if (mergedConfig.mergeResourceWithDefaults) { + this.resource = Resource.default().merge(this.resource); + } + this._config = Object.assign({}, mergedConfig, { resource: this.resource, }); - const defaultExporter = this._buildExporterFromEnv(); - if (defaultExporter !== undefined) { - const batchProcessor = new BatchSpanProcessor(defaultExporter); - this.activeSpanProcessor = batchProcessor; + if (config.spanProcessors?.length) { + this._registeredSpanProcessors = [...config.spanProcessors]; + this.activeSpanProcessor = new MultiSpanProcessor( + this._registeredSpanProcessors + ); } else { - this.activeSpanProcessor = new NoopSpanProcessor(); + const defaultExporter = this._buildExporterFromEnv(); + if (defaultExporter !== undefined) { + const batchProcessor = new BatchSpanProcessor(defaultExporter); + this.activeSpanProcessor = batchProcessor; + } else { + this.activeSpanProcessor = new NoopSpanProcessor(); + } } } @@ -116,6 +127,7 @@ export class BasicTracerProvider implements TracerProvider { } /** + * @deprecated please use {@link TracerConfig} spanProcessors property * Adds a new {@link SpanProcessor} to this tracer. * @param spanProcessor the new SpanProcessor to be added. */ diff --git a/packages/opentelemetry-sdk-trace-base/src/Span.ts b/packages/opentelemetry-sdk-trace-base/src/Span.ts index 72eb541341d..39a8b303080 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Span.ts @@ -280,7 +280,7 @@ export class Span implements APISpan, ReadableSpan { } private _getTime(inp?: TimeInput): HrTime { - if (typeof inp === 'number' && inp < otperformance.now()) { + if (typeof inp === 'number' && inp <= otperformance.now()) { // must be a performance timestamp // apply correction and convert to hrtime return hrTime(inp + this._performanceOffset); @@ -377,7 +377,7 @@ export class Span implements APISpan, ReadableSpan { if (value.length <= limit) { return value; } - return value.substr(0, limit); + return value.substring(0, limit); } /** diff --git a/packages/opentelemetry-sdk-trace-base/src/config.ts b/packages/opentelemetry-sdk-trace-base/src/config.ts index f97a383599f..f2b97ff8119 100644 --- a/packages/opentelemetry-sdk-trace-base/src/config.ts +++ b/packages/opentelemetry-sdk-trace-base/src/config.ts @@ -54,6 +54,7 @@ export function loadDefaultConfig() { _env.OTEL_SPAN_ATTRIBUTE_PER_EVENT_COUNT_LIMIT, attributePerLinkCountLimit: _env.OTEL_SPAN_ATTRIBUTE_PER_LINK_COUNT_LIMIT, }, + mergeResourceWithDefaults: true, }; } diff --git a/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts b/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts index 385c883e70c..c7d620391d3 100644 --- a/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts +++ b/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts @@ -17,6 +17,7 @@ import { BatchSpanProcessorBase } from '../../../export/BatchSpanProcessorBase'; import { SpanExporter } from '../../../export/SpanExporter'; import { BatchSpanProcessorBrowserConfig } from '../../../types'; +import { globalErrorHandler } from '@opentelemetry/core'; export class BatchSpanProcessor extends BatchSpanProcessorBase { private _visibilityChangeListener?: () => void; @@ -37,11 +38,15 @@ export class BatchSpanProcessor extends BatchSpanProcessorBase { if (document.visibilityState === 'hidden') { - void this.forceFlush(); + this.forceFlush().catch(error => { + globalErrorHandler(error); + }); } }; this._pageHideListener = () => { - void this.forceFlush(); + this.forceFlush().catch(error => { + globalErrorHandler(error); + }); }; document.addEventListener( 'visibilitychange', diff --git a/packages/opentelemetry-sdk-trace-base/src/types.ts b/packages/opentelemetry-sdk-trace-base/src/types.ts index 99eeedbe817..f351c0ce072 100644 --- a/packages/opentelemetry-sdk-trace-base/src/types.ts +++ b/packages/opentelemetry-sdk-trace-base/src/types.ts @@ -18,6 +18,7 @@ import { ContextManager, TextMapPropagator } from '@opentelemetry/api'; import { IResource } from '@opentelemetry/resources'; import { IdGenerator } from './IdGenerator'; import { Sampler } from './Sampler'; +import { SpanProcessor } from './SpanProcessor'; /** * TracerConfig provides an interface for configuring a Basic Tracer. @@ -34,6 +35,12 @@ export interface TracerConfig { /** Span Limits */ spanLimits?: SpanLimits; + /** + * Merge resource with {@link Resource.default()}? + * Default: {@code true} + **/ + mergeResourceWithDefaults?: boolean; + /** Resource associated with trace telemetry */ resource?: IResource; @@ -48,6 +55,11 @@ export interface TracerConfig { * The default value is 30000ms */ forceFlushTimeoutMillis?: number; + + /** + * List of SpanProcessor for the tracer + */ + spanProcessors?: SpanProcessor[]; } /** diff --git a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts index 901dd74ebfe..db5d6677450 100644 --- a/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts @@ -19,6 +19,10 @@ import * as sinon from 'sinon'; import { SpanExporter } from '../../../src'; import { BatchSpanProcessor } from '../../../src/platform/browser/export/BatchSpanProcessor'; import { TestTracingSpanExporter } from '../../common/export/TestTracingSpanExporter'; +import { + loggingErrorHandler, + setGlobalErrorHandler, +} from '@opentelemetry/core'; /** * VisibilityState has been removed from TypeScript 4.6.0+ @@ -37,19 +41,25 @@ describeDocument('BatchSpanProcessor - web main context', () => { let forceFlushSpy: sinon.SinonStub; let visibilityChangeEvent: Event; let pageHideEvent: Event; + let globalErrorHandlerStub: sinon.SinonStub; beforeEach(() => { sinon.replaceGetter(document, 'visibilityState', () => visibilityState); visibilityState = 'visible'; exporter = new TestTracingSpanExporter(); processor = new BatchSpanProcessor(exporter, {}); - forceFlushSpy = sinon.stub(processor, 'forceFlush'); + forceFlushSpy = sinon + .stub(processor, 'forceFlush') + .returns(Promise.resolve()); visibilityChangeEvent = new Event('visibilitychange'); pageHideEvent = new Event('pagehide'); + globalErrorHandlerStub = sinon.stub(); + setGlobalErrorHandler(globalErrorHandlerStub); }); afterEach(async () => { sinon.restore(); + setGlobalErrorHandler(loggingErrorHandler()); }); describe('when document becomes hidden', () => { @@ -60,6 +70,26 @@ describeDocument('BatchSpanProcessor - web main context', () => { assert.strictEqual(forceFlushSpy.callCount, 1); }); + it('should catch any error thrown by forceFlush', done => { + const forceFlushError = new Error('forceFlush failed'); + forceFlushSpy.rejects(forceFlushError); + hideDocument(); + sinon.assert.calledOnce(forceFlushSpy); + + // queue a microtask since hideDocument() returns before forceFlush() rejects + queueMicrotask(() => { + try { + sinon.assert.calledOnceWithExactly( + globalErrorHandlerStub, + forceFlushError + ); + done(); + } catch (e) { + done(e); + } + }); + }); + describe('AND shutdown has been called', () => { it('should NOT force flush spans', async () => { assert.strictEqual(forceFlushSpy.callCount, 0); @@ -74,7 +104,7 @@ describeDocument('BatchSpanProcessor - web main context', () => { processor = new BatchSpanProcessor(exporter, { disableAutoFlushOnDocumentHide: false, }); - forceFlushSpy = sinon.stub(processor, 'forceFlush'); + forceFlushSpy = sinon.stub(processor, 'forceFlush').resolves(); assert.strictEqual(forceFlushSpy.callCount, 0); hideDocument(); assert.strictEqual(forceFlushSpy.callCount, 1); @@ -84,7 +114,7 @@ describeDocument('BatchSpanProcessor - web main context', () => { processor = new BatchSpanProcessor(exporter, { disableAutoFlushOnDocumentHide: true, }); - forceFlushSpy = sinon.stub(processor, 'forceFlush'); + forceFlushSpy = sinon.stub(processor, 'forceFlush').resolves(); assert.strictEqual(forceFlushSpy.callCount, 0); hideDocument(); assert.strictEqual(forceFlushSpy.callCount, 0); diff --git a/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts index eceb9bc52c7..282331810dc 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts @@ -41,6 +41,8 @@ import { BatchSpanProcessor, AlwaysOnSampler, AlwaysOffSampler, + ConsoleSpanExporter, + SimpleSpanProcessor, } from '../../src'; class DummyPropagator implements TextMapPropagator { @@ -115,6 +117,24 @@ describe('BasicTracerProvider', () => { }); }); + describe('when user sets span processors', () => { + it('should use the span processors defined in the config', () => { + const traceExporter = new ConsoleSpanExporter(); + const spanProcessor = new SimpleSpanProcessor(traceExporter); + + const tracer = new BasicTracerProvider({ + spanProcessors: [spanProcessor], + }); + assert.ok( + tracer['_registeredSpanProcessors'][0] instanceof SimpleSpanProcessor + ); + assert.ok( + tracer['_registeredSpanProcessors'][0]['_exporter'] instanceof + ConsoleSpanExporter + ); + }); + }); + describe('when "sampler" option defined', () => { it('should have an instance with sampler', () => { const tracer = new BasicTracerProvider({ @@ -829,9 +849,30 @@ describe('BasicTracerProvider', () => { }); describe('.resource', () => { - it('should return a Resource', () => { + it('should use the default resource when no resource is provided', function () { const tracerProvider = new BasicTracerProvider(); - assert.ok(tracerProvider.resource instanceof Resource); + assert.deepStrictEqual(tracerProvider.resource, Resource.default()); + }); + + it('should not merge with defaults when flag is set to false', function () { + const expectedResource = new Resource({ foo: 'bar' }); + const tracerProvider = new BasicTracerProvider({ + mergeResourceWithDefaults: false, + resource: expectedResource, + }); + assert.deepStrictEqual(tracerProvider.resource, expectedResource); + }); + + it('should merge with defaults when flag is set to true', function () { + const providedResource = new Resource({ foo: 'bar' }); + const tracerProvider = new BasicTracerProvider({ + mergeResourceWithDefaults: true, + resource: providedResource, + }); + assert.deepStrictEqual( + tracerProvider.resource, + Resource.default().merge(providedResource) + ); }); }); diff --git a/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts index 5bf4ddb8ff8..91c4bffaf63 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts @@ -93,6 +93,21 @@ describe('InMemorySpanExporter', () => { }); }); + it('should reset spans when reset is called', () => { + const root = provider.getTracer('default').startSpan('root'); + + provider + .getTracer('default') + .startSpan('child', {}, trace.setSpan(context.active(), root)) + .end(); + root.end(); + assert.strictEqual(memoryExporter.getFinishedSpans().length, 2); + + memoryExporter.reset(); + + assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); + }); + it('should return the success result', () => { const exporter = new InMemorySpanExporter(); exporter.export([], (result: ExportResult) => { diff --git a/packages/opentelemetry-sdk-trace-base/test/performance/benchmark/BatchSpanProcessor.js b/packages/opentelemetry-sdk-trace-base/test/performance/benchmark/BatchSpanProcessor.js index ccdb82d481c..fc69043ee87 100644 --- a/packages/opentelemetry-sdk-trace-base/test/performance/benchmark/BatchSpanProcessor.js +++ b/packages/opentelemetry-sdk-trace-base/test/performance/benchmark/BatchSpanProcessor.js @@ -47,8 +47,9 @@ function createSpan() { span.end(); } -const tracerProvider = new BasicTracerProvider(); -tracerProvider.addSpanProcessor(new BatchSpanProcessor(new NoopExporter())); +const tracerProvider = new BasicTracerProvider({ + spanProcessors: [new BatchSpanProcessor(new NoopExporter())] +}); const tracer = tracerProvider.getTracer('test') const suite = new Benchmark.Suite('BatchSpanProcessor'); diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 4b5c7e97867..07f91ac3c82 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,15 +46,15 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/resources": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", - "@types/mocha": "10.0.8", + "@opentelemetry/resources": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "typescript": "4.4.4" @@ -63,11 +63,11 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/context-async-hooks": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", diff --git a/packages/opentelemetry-sdk-trace-web/README.md b/packages/opentelemetry-sdk-trace-web/README.md index 44ed1ffbe0a..92d4e93e020 100644 --- a/packages/opentelemetry-sdk-trace-web/README.md +++ b/packages/opentelemetry-sdk-trace-web/README.md @@ -40,8 +40,9 @@ import { DocumentLoad } from '@opentelemetry/plugin-document-load'; import { ZoneContextManager } from '@opentelemetry/context-zone'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; -const provider = new WebTracerProvider(); -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); +const provider = new WebTracerProvider({ + spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())] +}); provider.register({ // Changing default contextManager to use ZoneContextManager - supports asynchronous operations - optional diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 16b0002bb22..d0e0ec55734 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,14 +54,14 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/context-zone": "1.26.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/resources": "1.26.0", - "@types/jquery": "3.5.31", - "@types/mocha": "10.0.8", + "@opentelemetry/context-zone": "1.28.0", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/resources": "1.28.0", + "@types/jquery": "3.5.32", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "@types/webpack-env": "1.16.3", @@ -77,12 +77,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -90,9 +90,9 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-web/src/utils.ts b/packages/opentelemetry-sdk-trace-web/src/utils.ts index 5bcc57b72e9..5fcd9abf4ee 100644 --- a/packages/opentelemetry-sdk-trace-web/src/utils.ts +++ b/packages/opentelemetry-sdk-trace-web/src/utils.ts @@ -333,8 +333,8 @@ export function parseUrl(url: string): URLLike { typeof document !== 'undefined' ? document.baseURI : typeof location !== 'undefined' // Some JS runtimes (e.g. Deno) don't define this - ? location.href - : undefined + ? location.href + : undefined ); } const element = getUrlNormalizingAnchor(); diff --git a/packages/opentelemetry-shim-opentracing/README.md b/packages/opentelemetry-shim-opentracing/README.md index 8de3a79da9a..c5cc2c32742 100644 --- a/packages/opentelemetry-shim-opentracing/README.md +++ b/packages/opentelemetry-shim-opentracing/README.md @@ -48,6 +48,12 @@ See [examples/opentracing-shim](https://github.com/open-telemetry/opentelemetry- Apache 2.0 - See [LICENSE][license-url] for more information. +## Limitation + +The OpenTracing shim does not currently include a scope manager. +This feature was never implemented in OpenTracing JS therefore the +shim does not provide that feature. + ## Useful links - For more information on OpenTelemetry, visit: diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 4c2d9ccb1cd..e1b0383e21c 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,14 +43,14 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/propagator-b3": "1.26.0", - "@opentelemetry/propagator-jaeger": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@types/mocha": "10.0.8", + "@opentelemetry/propagator-b3": "1.28.0", + "@opentelemetry/propagator-jaeger": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "typescript": "4.4.4" }, @@ -58,8 +58,8 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/semantic-conventions": "1.27.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/semantic-conventions": "1.28.0", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/packages/propagator-aws-xray/.eslintignore b/packages/propagator-aws-xray/.eslintignore deleted file mode 100644 index 378eac25d31..00000000000 --- a/packages/propagator-aws-xray/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/packages/propagator-aws-xray/.eslintrc.js b/packages/propagator-aws-xray/.eslintrc.js deleted file mode 100644 index 36847df9fb1..00000000000 --- a/packages/propagator-aws-xray/.eslintrc.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "commonjs": true, - "node": true, - "browser": true - }, - ...require('../../eslint.base.js') -} diff --git a/packages/propagator-aws-xray/LICENSE b/packages/propagator-aws-xray/LICENSE deleted file mode 100644 index 261eeb9e9f8..00000000000 --- a/packages/propagator-aws-xray/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/propagator-aws-xray/README.md b/packages/propagator-aws-xray/README.md deleted file mode 100644 index cf9c0528ff5..00000000000 --- a/packages/propagator-aws-xray/README.md +++ /dev/null @@ -1,74 +0,0 @@ -# OpenTelemetry Propagator AWS X-Ray - -[![NPM Published Version][npm-img]][npm-url] -[![Apache License][license-image]][license-image] - -The OpenTelemetry Propagator for AWS X-Ray provides HTTP header propagation for systems that are using AWS `X-Amzn-Trace-Id` format. -This propagator translates the OpenTelemetry SpanContext into the equivalent AWS header format, for use with the OpenTelemetry JS SDK. -`TraceState` is currently not propagated. - -This package was originally located in [opentelemetry-js-contrib](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-aws-xray). It has been moved in order to make it a direct dependency of the Node SDK. As a result, versions from 1.4.0 to 1.22.0 have been skipped. - -## Installation - -```sh -npm install --save @opentelemetry/propagator-aws-xray -``` - -## Usage - -In the [global tracer configuration file](https://opentelemetry.io/docs/instrumentation/js/getting-started/nodejs/#setup), configure the following: - -```js -const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node'); -const { AWSXRayPropagator } = require('@opentelemetry/propagator-aws-xray'); -// ... - -const provider = new NodeTracerProvider(); - -// Set the global trace context propagator to use X-Ray formatted trace header -provider.register({ - propagator: new AWSXRayPropagator() -}); -``` - -## Propagator Details - -Example header:`X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1` - -The header consists of three parts: the root trace ID, the parent ID and the sampling decision. - -### Root - The AWS X-Ray format trace ID - -- Format: (spec-version)-(timestamp)-(UUID) - - spec_version - The version of the AWS X-Ray header format. Currently, only "1" is valid. - - timestamp - 32-bit number in base16 format, corresponds to the first 8 characters of the OpenTelemetry trace ID. Note, while X-Ray calls this timestamp, for the purpose of propagation it is opaque and any value will work. - - UUID - 96-bit random number in base16 format, corresponds to the last 10 characters of the OpenTelemetry trace ID. - -Root is analogous to the [OpenTelemetry Trace ID](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#spancontext), with some small format changes. -For additional reading, see the [AWS X-Ray Trace ID](https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids) public documentation. - -### Parent - The ID of the AWS X-Ray Segment - -- 64-bit random number in base16 format. Populated from the [OpenTelemetry Span ID](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#spancontext). - -### Sampled - The sampling decision - -- Defined in the AWS X-Ray specification as a tri-state field, with "0", "1" and "?" as valid values. Only "0" and "1" are used in this propagator. If "?", a new trace will be started. -- Populated from the [OpenTelemetry trace flags](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#spancontext). - -## Useful links - -- For more information on OpenTelemetry, visit: -- For more about OpenTelemetry JavaScript: -- For help or feedback on this project, join us in [GitHub Discussions][discussions-url] - -## License - -Apache 2.0 - See [LICENSE][license-url] for more information. - -[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions -[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE -[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[npm-url]: https://www.npmjs.com/package/@opentelemetry/propagator-aws-xray -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fpropagator-aws-xray.svg diff --git a/packages/propagator-aws-xray/karma.conf.js b/packages/propagator-aws-xray/karma.conf.js deleted file mode 100644 index edcd9f055fd..00000000000 --- a/packages/propagator-aws-xray/karma.conf.js +++ /dev/null @@ -1,24 +0,0 @@ -/*! - * Copyright 2020, OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -const karmaWebpackConfig = require('../../karma.webpack'); -const karmaBaseConfig = require('../../karma.base'); - -module.exports = (config) => { - config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig - })) -}; diff --git a/packages/propagator-aws-xray/package.json b/packages/propagator-aws-xray/package.json deleted file mode 100644 index 6d457caa994..00000000000 --- a/packages/propagator-aws-xray/package.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "name": "@opentelemetry/propagator-aws-xray", - "version": "1.26.0", - "description": "OpenTelemetry AWS Xray propagator provides context propagation for systems that are using AWS X-Ray format.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc mocha 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'", - "test:browser": "karma start --single-run", - "tdd": "npm run tdd:node", - "tdd:node": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js", - "align-api-deps": "node ../../scripts/align-api-deps.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "profiling", - "awsxray" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.10.0" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@types/mocha": "10.0.8", - "@types/node": "18.6.5", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "7.0.0", - "cross-var": "1.1.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nyc": "15.1.0", - "ts-loader": "9.5.1", - "typescript": "4.4.4", - "webpack": "5.94.0" - }, - "dependencies": { - "@opentelemetry/core": "1.26.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/propagator-aws-xray#readme" -} diff --git a/packages/propagator-aws-xray/src/AWSXRayPropagator.ts b/packages/propagator-aws-xray/src/AWSXRayPropagator.ts deleted file mode 100644 index e06568d9ee0..00000000000 --- a/packages/propagator-aws-xray/src/AWSXRayPropagator.ts +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - trace, - Context, - TextMapPropagator, - SpanContext, - TraceFlags, - TextMapSetter, - TextMapGetter, - isSpanContextValid, - isValidSpanId, - isValidTraceId, - INVALID_TRACEID, - INVALID_SPANID, - INVALID_SPAN_CONTEXT, -} from '@opentelemetry/api'; - -export const AWSXRAY_TRACE_ID_HEADER = 'x-amzn-trace-id'; - -const TRACE_HEADER_DELIMITER = ';'; -const KV_DELIMITER = '='; - -const TRACE_ID_KEY = 'Root'; -const TRACE_ID_LENGTH = 35; -const TRACE_ID_VERSION = '1'; -const TRACE_ID_DELIMITER = '-'; -const TRACE_ID_DELIMITER_INDEX_1 = 1; -const TRACE_ID_DELIMITER_INDEX_2 = 10; -const TRACE_ID_FIRST_PART_LENGTH = 8; - -const PARENT_ID_KEY = 'Parent'; - -const SAMPLED_FLAG_KEY = 'Sampled'; -const IS_SAMPLED = '1'; -const NOT_SAMPLED = '0'; - -/** - * Implementation of the AWS X-Ray Trace Header propagation protocol. See AWS - * Tracing header spec - * - * An example AWS Xray Tracing Header is shown below: - * X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1 - */ -export class AWSXRayPropagator implements TextMapPropagator { - inject(context: Context, carrier: unknown, setter: TextMapSetter) { - const spanContext = trace.getSpan(context)?.spanContext(); - if (!spanContext || !isSpanContextValid(spanContext)) return; - - const otTraceId = spanContext.traceId; - const timestamp = otTraceId.substring(0, TRACE_ID_FIRST_PART_LENGTH); - const randomNumber = otTraceId.substring(TRACE_ID_FIRST_PART_LENGTH); - - const parentId = spanContext.spanId; - const samplingFlag = - (TraceFlags.SAMPLED & spanContext.traceFlags) === TraceFlags.SAMPLED - ? IS_SAMPLED - : NOT_SAMPLED; - // TODO: Add OT trace state to the X-Ray trace header - - const traceHeader = `Root=1-${timestamp}-${randomNumber};Parent=${parentId};Sampled=${samplingFlag}`; - setter.set(carrier, AWSXRAY_TRACE_ID_HEADER, traceHeader); - } - - extract(context: Context, carrier: unknown, getter: TextMapGetter): Context { - const spanContext = this.getSpanContextFromHeader(carrier, getter); - if (!isSpanContextValid(spanContext)) return context; - - return trace.setSpan(context, trace.wrapSpanContext(spanContext)); - } - - fields(): string[] { - return [AWSXRAY_TRACE_ID_HEADER]; - } - - private getSpanContextFromHeader( - carrier: unknown, - getter: TextMapGetter - ): SpanContext { - const headerKeys = getter.keys(carrier); - const relevantHeaderKey = headerKeys.find(e => { - return e.toLowerCase() === AWSXRAY_TRACE_ID_HEADER; - }); - if (!relevantHeaderKey) { - return INVALID_SPAN_CONTEXT; - } - const traceHeader = getter.get(carrier, relevantHeaderKey); - - if (!traceHeader || typeof traceHeader !== 'string') { - return INVALID_SPAN_CONTEXT; - } - - let pos = 0; - let trimmedPart: string; - let parsedTraceId = INVALID_TRACEID; - let parsedSpanId = INVALID_SPANID; - let parsedTraceFlags = null; - while (pos < traceHeader.length) { - const delimiterIndex = traceHeader.indexOf(TRACE_HEADER_DELIMITER, pos); - if (delimiterIndex >= 0) { - trimmedPart = traceHeader.substring(pos, delimiterIndex).trim(); - pos = delimiterIndex + 1; - } else { - //last part - trimmedPart = traceHeader.substring(pos).trim(); - pos = traceHeader.length; - } - const equalsIndex = trimmedPart.indexOf(KV_DELIMITER); - - const value = trimmedPart.substring(equalsIndex + 1); - - if (trimmedPart.startsWith(TRACE_ID_KEY)) { - parsedTraceId = AWSXRayPropagator._parseTraceId(value); - } else if (trimmedPart.startsWith(PARENT_ID_KEY)) { - parsedSpanId = AWSXRayPropagator._parseSpanId(value); - } else if (trimmedPart.startsWith(SAMPLED_FLAG_KEY)) { - parsedTraceFlags = AWSXRayPropagator._parseTraceFlag(value); - } - } - if (parsedTraceFlags === null) { - return INVALID_SPAN_CONTEXT; - } - const resultSpanContext: SpanContext = { - traceId: parsedTraceId, - spanId: parsedSpanId, - traceFlags: parsedTraceFlags, - isRemote: true, - }; - if (!isSpanContextValid(resultSpanContext)) { - return INVALID_SPAN_CONTEXT; - } - return resultSpanContext; - } - - private static _parseTraceId(xrayTraceId: string): string { - // Check length of trace id - if (xrayTraceId.length !== TRACE_ID_LENGTH) { - return INVALID_TRACEID; - } - - // Check version trace id version - if (!xrayTraceId.startsWith(TRACE_ID_VERSION)) { - return INVALID_TRACEID; - } - - // Check delimiters - if ( - xrayTraceId.charAt(TRACE_ID_DELIMITER_INDEX_1) !== TRACE_ID_DELIMITER || - xrayTraceId.charAt(TRACE_ID_DELIMITER_INDEX_2) !== TRACE_ID_DELIMITER - ) { - return INVALID_TRACEID; - } - - const epochPart = xrayTraceId.substring( - TRACE_ID_DELIMITER_INDEX_1 + 1, - TRACE_ID_DELIMITER_INDEX_2 - ); - const uniquePart = xrayTraceId.substring( - TRACE_ID_DELIMITER_INDEX_2 + 1, - TRACE_ID_LENGTH - ); - const resTraceId = epochPart + uniquePart; - - // Check the content of trace id - if (!isValidTraceId(resTraceId)) { - return INVALID_TRACEID; - } - - return resTraceId; - } - - private static _parseSpanId(xrayParentId: string): string { - return isValidSpanId(xrayParentId) ? xrayParentId : INVALID_SPANID; - } - - private static _parseTraceFlag(xraySampledFlag: string): TraceFlags | null { - if (xraySampledFlag === NOT_SAMPLED) { - return TraceFlags.NONE; - } - if (xraySampledFlag === IS_SAMPLED) { - return TraceFlags.SAMPLED; - } - return null; - } -} diff --git a/packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts b/packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts deleted file mode 100644 index 5cf47916d58..00000000000 --- a/packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import * as assert from 'assert'; - -import { - defaultTextMapGetter, - defaultTextMapSetter, - INVALID_SPAN_CONTEXT, - ROOT_CONTEXT, - SpanContext, - TraceFlags, - trace, -} from '@opentelemetry/api'; -import { TraceState } from '@opentelemetry/core'; - -import { AWSXRAY_TRACE_ID_HEADER, AWSXRayPropagator } from '../src'; - -describe('AWSXRayPropagator', () => { - const xrayPropagator = new AWSXRayPropagator(); - const TRACE_ID = '8a3c60f7d188f8fa79d48a391a778fa6'; - const SPAN_ID = '53995c3f42cd8ad8'; - const SAMPLED_TRACE_FLAG = TraceFlags.SAMPLED; - const NOT_SAMPLED_TRACE_FLAG = TraceFlags.NONE; - - let carrier: { [key: string]: unknown }; - - beforeEach(() => { - carrier = {}; - }); - - describe('.inject()', () => { - it('should inject sampled context', () => { - const spanContext: SpanContext = { - traceId: TRACE_ID, - spanId: SPAN_ID, - traceFlags: SAMPLED_TRACE_FLAG, - }; - xrayPropagator.inject( - trace.setSpan(ROOT_CONTEXT, trace.wrapSpanContext(spanContext)), - carrier, - defaultTextMapSetter - ); - - assert.deepStrictEqual( - carrier[AWSXRAY_TRACE_ID_HEADER], - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1' - ); - }); - - it('should inject not sampled context', () => { - const spanContext: SpanContext = { - traceId: TRACE_ID, - spanId: SPAN_ID, - traceFlags: NOT_SAMPLED_TRACE_FLAG, - }; - xrayPropagator.inject( - trace.setSpan(ROOT_CONTEXT, trace.wrapSpanContext(spanContext)), - carrier, - defaultTextMapSetter - ); - - assert.deepStrictEqual( - carrier[AWSXRAY_TRACE_ID_HEADER], - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0' - ); - }); - - it('should inject with TraceState', () => { - const traceState = new TraceState(); - traceState.set('foo', 'bar'); - const spanContext: SpanContext = { - traceId: TRACE_ID, - spanId: SPAN_ID, - traceFlags: SAMPLED_TRACE_FLAG, - traceState: traceState, - }; - xrayPropagator.inject( - trace.setSpan(ROOT_CONTEXT, trace.wrapSpanContext(spanContext)), - carrier, - defaultTextMapSetter - ); - - // TODO: assert trace state when the propagator supports it - assert.deepStrictEqual( - carrier[AWSXRAY_TRACE_ID_HEADER], - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1' - ); - }); - - it('inject without spanContext - should inject nothing', () => { - xrayPropagator.inject(ROOT_CONTEXT, carrier, defaultTextMapSetter); - - assert.deepStrictEqual(carrier, {}); - }); - - it('inject default invalid spanContext - should inject nothing', () => { - xrayPropagator.inject( - trace.setSpan( - ROOT_CONTEXT, - trace.wrapSpanContext(INVALID_SPAN_CONTEXT) - ), - carrier, - defaultTextMapSetter - ); - - assert.deepStrictEqual(carrier, {}); - }); - }); - - describe('.extract()', () => { - it('extract nothing from context', () => { - // context remains untouched - assert.strictEqual( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter), - ROOT_CONTEXT - ); - }); - - it('should extract sampled context', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: TRACE_ID, - spanId: SPAN_ID, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should extract sampled context with arbitrary order', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Parent=53995c3f42cd8ad8;Sampled=1;Root=1-8a3c60f7-d188f8fa79d48a391a778fa6'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: TRACE_ID, - spanId: SPAN_ID, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('should extract context with additional fields', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Foo=Bar'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - // TODO: assert additional fields when the propagator supports it - assert.deepStrictEqual(extractedSpanContext, { - traceId: TRACE_ID, - spanId: SPAN_ID, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - it('extract empty header value - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = ''; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid traceId - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-abcdefgh-ijklmnopabcdefghijklmnop;Parent=53995c3f42cd8ad8;Sampled=0'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid traceId size - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa600;Parent=53995c3f42cd8ad8;Sampled=0'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid traceId delimiter - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1*8a3c60f7+d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Foo=Bar'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid spanId - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=abcdefghijklmnop;Sampled=0'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid spanId size - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad800;Sampled=0'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid traceFlags - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled='; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid traceFlags length - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=10220'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract nonnumeric invalid traceFlags - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=a'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extract invalid aws xray version - should return undefined', () => { - carrier[AWSXRAY_TRACE_ID_HEADER] = - 'Root=2-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, undefined); - }); - - it('extracts context in a case-insensitive fashion', () => { - carrier[AWSXRAY_TRACE_ID_HEADER.toUpperCase()] = - 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Foo=Bar'; - const extractedSpanContext = trace - .getSpan( - xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter) - ) - ?.spanContext(); - - assert.deepStrictEqual(extractedSpanContext, { - traceId: TRACE_ID, - spanId: SPAN_ID, - isRemote: true, - traceFlags: TraceFlags.SAMPLED, - }); - }); - - describe('.fields()', () => { - it('should return a field with AWS X-Ray Trace ID header', () => { - const expectedField = xrayPropagator.fields(); - - assert.deepStrictEqual([AWSXRAY_TRACE_ID_HEADER], expectedField); - }); - }); - }); -}); diff --git a/packages/propagator-aws-xray/test/index-webpack.ts b/packages/propagator-aws-xray/test/index-webpack.ts deleted file mode 100644 index 061a48ccfa7..00000000000 --- a/packages/propagator-aws-xray/test/index-webpack.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -const testsContext = require.context('.', true, /test$/); -testsContext.keys().forEach(testsContext); - -const srcContext = require.context('.', true, /src$/); -srcContext.keys().forEach(srcContext); diff --git a/packages/propagator-aws-xray/tsconfig.esm.json b/packages/propagator-aws-xray/tsconfig.esm.json deleted file mode 100644 index 76f5aed507c..00000000000 --- a/packages/propagator-aws-xray/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } - ] -} diff --git a/packages/propagator-aws-xray/tsconfig.esnext.json b/packages/propagator-aws-xray/tsconfig.esnext.json deleted file mode 100644 index 4b926c1c870..00000000000 --- a/packages/propagator-aws-xray/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } - ] -} diff --git a/packages/propagator-aws-xray/tsconfig.json b/packages/propagator-aws-xray/tsconfig.json deleted file mode 100644 index b9bcaf0434c..00000000000 --- a/packages/propagator-aws-xray/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } - ] -} diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index c29543a223d..130bd14ca4c 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics", - "version": "1.26.0", + "version": "1.28.0", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,10 +54,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.25.2", - "@babel/preset-env": "7.25.4", + "@babel/core": "7.26.0", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": ">=1.3.0 <1.10.0", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "babel-plugin-istanbul": "7.0.0", @@ -69,12 +69,12 @@ "karma-spec-reporter": "0.0.36", "karma-webpack": "5.0.1", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "9.5.1", "typescript": "4.4.4", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, @@ -82,8 +82,8 @@ "@opentelemetry/api": ">=1.3.0 <1.10.0" }, "dependencies": { - "@opentelemetry/core": "1.26.0", - "@opentelemetry/resources": "1.26.0" + "@opentelemetry/core": "1.28.0", + "@opentelemetry/resources": "1.28.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", "sideEffects": false diff --git a/packages/sdk-metrics/src/MeterProvider.ts b/packages/sdk-metrics/src/MeterProvider.ts index 68d46057794..962d59b4290 100644 --- a/packages/sdk-metrics/src/MeterProvider.ts +++ b/packages/sdk-metrics/src/MeterProvider.ts @@ -36,6 +36,27 @@ export interface MeterProviderOptions { resource?: IResource; views?: View[]; readers?: MetricReader[]; + /** + * Merge resource with {@link Resource.default()}? + * Default: {@code true} + */ + mergeResourceWithDefaults?: boolean; +} + +/** + * @param mergeWithDefaults + * @param providedResource + */ +function prepareResource( + mergeWithDefaults: boolean, + providedResource: Resource | undefined +) { + const resource = providedResource ?? Resource.empty(); + + if (mergeWithDefaults) { + return Resource.default().merge(resource); + } + return resource; } /** @@ -46,10 +67,12 @@ export class MeterProvider implements IMeterProvider { private _shutdown = false; constructor(options?: MeterProviderOptions) { - const resource = Resource.default().merge( - options?.resource ?? Resource.empty() + this._sharedState = new MeterProviderSharedState( + prepareResource( + options?.mergeResourceWithDefaults ?? true, + options?.resource + ) ); - this._sharedState = new MeterProviderSharedState(resource); if (options?.views != null && options.views.length > 0) { for (const view of options.views) { this._sharedState.viewRegistry.addView(view); diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/index.ts b/packages/sdk-metrics/src/export/CardinalitySelector.ts similarity index 74% rename from experimental/packages/otlp-exporter-base/src/platform/node/index.ts rename to packages/sdk-metrics/src/export/CardinalitySelector.ts index fcfca512a86..a274898b9a2 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/index.ts +++ b/packages/sdk-metrics/src/export/CardinalitySelector.ts @@ -14,5 +14,8 @@ * limitations under the License. */ -export { OTLPExporterNodeBase } from './OTLPExporterNodeBase'; -export { OTLPExporterNodeConfigBase, CompressionAlgorithm } from './types'; +import { InstrumentType } from '../InstrumentDescriptor'; +/** + * Cardinality Limit selector based on metric instrument types. + */ +export type CardinalitySelector = (instrumentType: InstrumentType) => number; diff --git a/packages/sdk-metrics/src/export/MetricReader.ts b/packages/sdk-metrics/src/export/MetricReader.ts index 8aad601d70f..e87d55884db 100644 --- a/packages/sdk-metrics/src/export/MetricReader.ts +++ b/packages/sdk-metrics/src/export/MetricReader.ts @@ -32,6 +32,7 @@ import { DEFAULT_AGGREGATION_SELECTOR, DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR, } from './AggregationSelector'; +import { CardinalitySelector } from './CardinalitySelector'; export interface MetricReaderOptions { /** @@ -45,6 +46,11 @@ export interface MetricReaderOptions { * not configured, cumulative is used for all instruments. */ aggregationTemporalitySelector?: AggregationTemporalitySelector; + /** + * Cardinality selector based on metric instrument types. If not configured, + * a default value is used. + */ + cardinalitySelector?: CardinalitySelector; /** * **Note, this option is experimental**. Additional MetricProducers to use as a source of * aggregated metric data in addition to the SDK's metric data. The resource returned by @@ -68,6 +74,7 @@ export abstract class MetricReader { private _sdkMetricProducer?: MetricProducer; private readonly _aggregationTemporalitySelector: AggregationTemporalitySelector; private readonly _aggregationSelector: AggregationSelector; + private readonly _cardinalitySelector?: CardinalitySelector; constructor(options?: MetricReaderOptions) { this._aggregationSelector = @@ -76,6 +83,7 @@ export abstract class MetricReader { options?.aggregationTemporalitySelector ?? DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR; this._metricProducers = options?.metricProducers ?? []; + this._cardinalitySelector = options?.cardinalitySelector; } /** @@ -116,6 +124,16 @@ export abstract class MetricReader { return this._aggregationTemporalitySelector(instrumentType); } + /** + * Select the cardinality limit for the given {@link InstrumentType} for this + * reader. + */ + selectCardinalityLimit(instrumentType: InstrumentType): number { + return this._cardinalitySelector + ? this._cardinalitySelector(instrumentType) + : 2000; // default value if no selector is provided + } + /** * Handle once the SDK has initialized this {@link MetricReader} * Overriding this method is optional. diff --git a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts index b6730033e03..646c832aa41 100644 --- a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts +++ b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts @@ -24,7 +24,6 @@ import { import { MetricReader } from './MetricReader'; import { PushMetricExporter } from './MetricExporter'; import { callWithTimeout, TimeoutError } from '../utils'; -import { diag } from '@opentelemetry/api'; import { MetricProducer } from './MetricProducer'; export type PeriodicExportingMetricReaderOptions = { @@ -127,25 +126,20 @@ export class PeriodicExportingMetricReader extends MetricReader { ); } - const doExport = async () => { - const result = await internal._export(this._exporter, resourceMetrics); - if (result.code !== ExportResultCode.SUCCESS) { - throw new Error( - `PeriodicExportingMetricReader: metrics export failed (error ${result.error})` - ); + if (resourceMetrics.resource.asyncAttributesPending) { + try { + await resourceMetrics.resource.waitForAsyncAttributes?.(); + } catch (e) { + api.diag.debug('Error while resolving async portion of resource: ', e); + globalErrorHandler(e); } - }; + } - // Avoid scheduling a promise to make the behavior more predictable and easier to test - if (resourceMetrics.resource.asyncAttributesPending) { - resourceMetrics.resource - .waitForAsyncAttributes?.() - .then(doExport, err => - diag.debug('Error while resolving async portion of resource: ', err) - ) - .catch(globalErrorHandler); - } else { - await doExport(); + const result = await internal._export(this._exporter, resourceMetrics); + if (result.code !== ExportResultCode.SUCCESS) { + throw new Error( + `PeriodicExportingMetricReader: metrics export failed (error ${result.error})` + ); } } diff --git a/packages/sdk-metrics/src/state/AsyncMetricStorage.ts b/packages/sdk-metrics/src/state/AsyncMetricStorage.ts index 6bebafdc1f1..be2cf7f25ac 100644 --- a/packages/sdk-metrics/src/state/AsyncMetricStorage.ts +++ b/packages/sdk-metrics/src/state/AsyncMetricStorage.ts @@ -43,10 +43,14 @@ export class AsyncMetricStorage> _instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator, private _attributesProcessor: AttributesProcessor, - collectorHandles: MetricCollectorHandle[] + collectorHandles: MetricCollectorHandle[], + private _aggregationCardinalityLimit?: number ) { super(_instrumentDescriptor); - this._deltaMetricStorage = new DeltaMetricProcessor(aggregator); + this._deltaMetricStorage = new DeltaMetricProcessor( + aggregator, + this._aggregationCardinalityLimit + ); this._temporalMetricStorage = new TemporalMetricProcessor( aggregator, collectorHandles diff --git a/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts b/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts index 2764727de24..288885f8f93 100644 --- a/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts +++ b/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts @@ -15,7 +15,7 @@ */ import { Context, HrTime, Attributes } from '@opentelemetry/api'; -import { Maybe } from '../utils'; +import { Maybe, hashAttributes } from '../utils'; import { Accumulation, Aggregator } from '../aggregator/types'; import { AttributeHashMap } from './HashMap'; @@ -31,8 +31,17 @@ export class DeltaMetricProcessor> { // TODO: find a reasonable mean to clean the memo; // https://github.com/open-telemetry/opentelemetry-specification/pull/2208 private _cumulativeMemoStorage = new AttributeHashMap(); + private _cardinalityLimit: number; + private _overflowAttributes = { 'otel.metric.overflow': true }; + private _overflowHashCode: string; - constructor(private _aggregator: Aggregator) {} + constructor( + private _aggregator: Aggregator, + aggregationCardinalityLimit?: number + ) { + this._cardinalityLimit = (aggregationCardinalityLimit ?? 2000) - 1; + this._overflowHashCode = hashAttributes(this._overflowAttributes); + } record( value: number, @@ -40,10 +49,22 @@ export class DeltaMetricProcessor> { _context: Context, collectionTime: HrTime ) { - const accumulation = this._activeCollectionStorage.getOrDefault( - attributes, - () => this._aggregator.createAccumulation(collectionTime) - ); + let accumulation = this._activeCollectionStorage.get(attributes); + + if (!accumulation) { + if (this._activeCollectionStorage.size >= this._cardinalityLimit) { + const overflowAccumulation = this._activeCollectionStorage.getOrDefault( + this._overflowAttributes, + () => this._aggregator.createAccumulation(collectionTime) + ); + overflowAccumulation?.record(value); + return; + } + + accumulation = this._aggregator.createAccumulation(collectionTime); + this._activeCollectionStorage.set(attributes, accumulation); + } + accumulation?.record(value); } @@ -66,6 +87,19 @@ export class DeltaMetricProcessor> { hashCode )!; delta = this._aggregator.diff(previous, accumulation); + } else { + // If the cardinality limit is reached, we need to change the attributes + if (this._cumulativeMemoStorage.size >= this._cardinalityLimit) { + attributes = this._overflowAttributes; + hashCode = this._overflowHashCode; + if (this._cumulativeMemoStorage.has(attributes, hashCode)) { + const previous = this._cumulativeMemoStorage.get( + attributes, + hashCode + )!; + delta = this._aggregator.diff(previous, accumulation); + } + } } // Merge with uncollected active delta. if (this._activeCollectionStorage.has(attributes, hashCode)) { @@ -92,6 +126,7 @@ export class DeltaMetricProcessor> { collect() { const unreportedDelta = this._activeCollectionStorage; this._activeCollectionStorage = new AttributeHashMap(); + return unreportedDelta; } } diff --git a/packages/sdk-metrics/src/state/MeterSharedState.ts b/packages/sdk-metrics/src/state/MeterSharedState.ts index 2c0c1a5105b..028a43634e5 100644 --- a/packages/sdk-metrics/src/state/MeterSharedState.ts +++ b/packages/sdk-metrics/src/state/MeterSharedState.ts @@ -142,7 +142,8 @@ export class MeterSharedState { viewDescriptor, aggregator, view.attributesProcessor, - this._meterProviderSharedState.metricCollectors + this._meterProviderSharedState.metricCollectors, + view.aggregationCardinalityLimit ) as R; this.metricStorageRegistry.register(viewStorage); return viewStorage; @@ -162,12 +163,17 @@ export class MeterSharedState { if (compatibleStorage != null) { return compatibleStorage; } + const aggregator = aggregation.createAggregator(descriptor); + const cardinalityLimit = collector.selectCardinalityLimit( + descriptor.type + ); const storage = new MetricStorageType( descriptor, aggregator, AttributesProcessor.Noop(), - [collector] + [collector], + cardinalityLimit ) as R; this.metricStorageRegistry.registerForCollector(collector, storage); return storage; @@ -190,6 +196,7 @@ interface MetricStorageConstructor { instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator>, attributesProcessor: AttributesProcessor, - collectors: MetricCollectorHandle[] + collectors: MetricCollectorHandle[], + aggregationCardinalityLimit?: number ): MetricStorage; } diff --git a/packages/sdk-metrics/src/state/MetricCollector.ts b/packages/sdk-metrics/src/state/MetricCollector.ts index f1f1dacdb13..3b52a3e4d56 100644 --- a/packages/sdk-metrics/src/state/MetricCollector.ts +++ b/packages/sdk-metrics/src/state/MetricCollector.ts @@ -90,6 +90,14 @@ export class MetricCollector implements MetricProducer { selectAggregation(instrumentType: InstrumentType) { return this._metricReader.selectAggregation(instrumentType); } + + /** + * Select the cardinality limit for the given {@link InstrumentType} for this + * collector. + */ + selectCardinalityLimit(instrumentType: InstrumentType): number { + return this._metricReader.selectCardinalityLimit?.(instrumentType) ?? 2000; + } } /** @@ -98,4 +106,5 @@ export class MetricCollector implements MetricProducer { */ export interface MetricCollectorHandle { selectAggregationTemporality: AggregationTemporalitySelector; + selectCardinalityLimit(instrumentType: InstrumentType): number; } diff --git a/packages/sdk-metrics/src/state/SyncMetricStorage.ts b/packages/sdk-metrics/src/state/SyncMetricStorage.ts index 2e97d20d8d1..9d01e263861 100644 --- a/packages/sdk-metrics/src/state/SyncMetricStorage.ts +++ b/packages/sdk-metrics/src/state/SyncMetricStorage.ts @@ -42,10 +42,14 @@ export class SyncMetricStorage> instrumentDescriptor: InstrumentDescriptor, aggregator: Aggregator, private _attributesProcessor: AttributesProcessor, - collectorHandles: MetricCollectorHandle[] + collectorHandles: MetricCollectorHandle[], + private _aggregationCardinalityLimit?: number ) { super(instrumentDescriptor); - this._deltaMetricStorage = new DeltaMetricProcessor(aggregator); + this._deltaMetricStorage = new DeltaMetricProcessor( + aggregator, + this._aggregationCardinalityLimit + ); this._temporalMetricStorage = new TemporalMetricProcessor( aggregator, collectorHandles diff --git a/packages/sdk-metrics/src/view/View.ts b/packages/sdk-metrics/src/view/View.ts index 1e8d4fb0e05..9a8e7cc60f1 100644 --- a/packages/sdk-metrics/src/view/View.ts +++ b/packages/sdk-metrics/src/view/View.ts @@ -61,6 +61,15 @@ export type ViewOptions = { * aggregation: new LastValueAggregation() */ aggregation?: Aggregation; + /** + * Alters the metric stream: + * Sets a limit on the number of unique attribute combinations (cardinality) that can be aggregated. + * If not provided, the default limit will be used. + * + * @example sets the cardinality limit to 1000 + * aggregationCardinalityLimit: 1000 + */ + aggregationCardinalityLimit?: number; /** * Instrument selection criteria: * The original type of the Instrument(s). @@ -138,6 +147,7 @@ export class View { readonly attributesProcessor: AttributesProcessor; readonly instrumentSelector: InstrumentSelector; readonly meterSelector: MeterSelector; + readonly aggregationCardinalityLimit?: number; /** * Create a new {@link View} instance. @@ -161,6 +171,10 @@ export class View { * Alters the metric stream: * If provided, the attributes that are not in the list will be ignored. * If not provided, all attribute keys will be used by default. + * @param viewOptions.aggregationCardinalityLimit + * Alters the metric stream: + * Sets a limit on the number of unique attribute combinations (cardinality) that can be aggregated. + * If not provided, the default limit of 2000 will be used. * @param viewOptions.aggregation * Alters the metric stream: * Alters the {@link Aggregation} of the metric stream. @@ -232,5 +246,6 @@ export class View { version: viewOptions.meterVersion, schemaUrl: viewOptions.meterSchemaUrl, }); + this.aggregationCardinalityLimit = viewOptions.aggregationCardinalityLimit; } } diff --git a/packages/sdk-metrics/test/MeterProvider.test.ts b/packages/sdk-metrics/test/MeterProvider.test.ts index f06305ad2af..cc534adcb1d 100644 --- a/packages/sdk-metrics/test/MeterProvider.test.ts +++ b/packages/sdk-metrics/test/MeterProvider.test.ts @@ -21,6 +21,7 @@ import { DataPointType, ExplicitBucketHistogramAggregation, HistogramMetricData, + DataPoint, } from '../src'; import { assertScopeMetrics, @@ -32,6 +33,7 @@ import { TestMetricReader } from './export/TestMetricReader'; import * as sinon from 'sinon'; import { View } from '../src/view/View'; import { Meter } from '../src/Meter'; +import { Resource } from '@opentelemetry/resources'; describe('MeterProvider', () => { afterEach(() => { @@ -48,6 +50,66 @@ describe('MeterProvider', () => { const meterProvider = new MeterProvider({ resource: defaultResource }); assert(meterProvider instanceof MeterProvider); }); + + it('should use default resource when no resource is passed', async function () { + const reader = new TestMetricReader(); + + const meterProvider = new MeterProvider({ + readers: [reader], + }); + + // Create meter and instrument, otherwise nothing will export + const myMeter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = myMeter.createCounter('non-renamed-instrument'); + counter.add(1, { attrib1: 'attrib_value1', attrib2: 'attrib_value2' }); + + // Perform collection. + const { resourceMetrics } = await reader.collect(); + assert.deepStrictEqual(resourceMetrics.resource, Resource.default()); + }); + + it('should not merge with defaults when flag is set to false', async function () { + const reader = new TestMetricReader(); + const expectedResource = new Resource({ foo: 'bar' }); + + const meterProvider = new MeterProvider({ + readers: [reader], + resource: expectedResource, + mergeResourceWithDefaults: false, + }); + + // Create meter and instrument, otherwise nothing will export + const myMeter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = myMeter.createCounter('non-renamed-instrument'); + counter.add(1, { attrib1: 'attrib_value1', attrib2: 'attrib_value2' }); + + // Perform collection. + const { resourceMetrics } = await reader.collect(); + assert.deepStrictEqual(resourceMetrics.resource, expectedResource); + }); + + it('should merge with defaults when flag is set to true', async function () { + const reader = new TestMetricReader(); + const providedResource = new Resource({ foo: 'bar' }); + + const meterProvider = new MeterProvider({ + readers: [reader], + resource: providedResource, + mergeResourceWithDefaults: true, + }); + + // Create meter and instrument, otherwise nothing will export + const myMeter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = myMeter.createCounter('non-renamed-instrument'); + counter.add(1, { attrib1: 'attrib_value1', attrib2: 'attrib_value2' }); + + // Perform collection. + const { resourceMetrics } = await reader.collect(); + assert.deepStrictEqual( + resourceMetrics.resource, + Resource.default().merge(providedResource) + ); + }); }); describe('getMeter', () => { @@ -541,6 +603,184 @@ describe('MeterProvider', () => { }); }); + describe('aggregationCardinalityLimit with view should apply the cardinality limit', () => { + it('should respect the aggregationCardinalityLimit', async () => { + const reader = new TestMetricReader(); + const meterProvider = new MeterProvider({ + resource: defaultResource, + readers: [reader], + views: [ + new View({ + instrumentName: 'test-counter', + aggregationCardinalityLimit: 2, // Set cardinality limit to 2 + }), + ], + }); + + const meter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = meter.createCounter('test-counter'); + + // Add values with different attributes + counter.add(1, { attr1: 'value1' }); + counter.add(1, { attr2: 'value2' }); + counter.add(1, { attr3: 'value3' }); + counter.add(1, { attr1: 'value1' }); + + // Perform collection + const { resourceMetrics, errors } = await reader.collect(); + + assert.strictEqual(errors.length, 0); + assert.strictEqual(resourceMetrics.scopeMetrics.length, 1); + assert.strictEqual(resourceMetrics.scopeMetrics[0].metrics.length, 1); + + const metricData = resourceMetrics.scopeMetrics[0].metrics[0]; + assert.strictEqual(metricData.dataPoints.length, 2); + + // Check if the overflow data point is present + const overflowDataPoint = ( + metricData.dataPoints as DataPoint[] + ).find((dataPoint: DataPoint) => + Object.prototype.hasOwnProperty.call( + dataPoint.attributes, + 'otel.metric.overflow' + ) + ); + assert.ok(overflowDataPoint); + assert.strictEqual(overflowDataPoint.value, 2); + }); + + it('should respect the aggregationCardinalityLimit for observable counter', async () => { + const reader = new TestMetricReader(); + const meterProvider = new MeterProvider({ + resource: defaultResource, + readers: [reader], + views: [ + new View({ + instrumentName: 'test-observable-counter', + aggregationCardinalityLimit: 2, // Set cardinality limit to 2 + }), + ], + }); + + const meter = meterProvider.getMeter('meter1', 'v1.0.0'); + const observableCounter = meter.createObservableCounter( + 'test-observable-counter' + ); + observableCounter.addCallback(observableResult => { + observableResult.observe(1, { attr1: 'value1' }); + observableResult.observe(2, { attr2: 'value2' }); + observableResult.observe(3, { attr3: 'value3' }); + observableResult.observe(4, { attr1: 'value1' }); + }); + + // Perform collection + const { resourceMetrics, errors } = await reader.collect(); + + assert.strictEqual(errors.length, 0); + assert.strictEqual(resourceMetrics.scopeMetrics.length, 1); + assert.strictEqual(resourceMetrics.scopeMetrics[0].metrics.length, 1); + + const metricData = resourceMetrics.scopeMetrics[0].metrics[0]; + assert.strictEqual(metricData.dataPoints.length, 2); + + // Check if the overflow data point is present + const overflowDataPoint = ( + metricData.dataPoints as DataPoint[] + ).find((dataPoint: DataPoint) => + Object.prototype.hasOwnProperty.call( + dataPoint.attributes, + 'otel.metric.overflow' + ) + ); + assert.ok(overflowDataPoint); + assert.strictEqual(overflowDataPoint.value, 3); + }); + }); + + describe('aggregationCardinalityLimit via MetricReader should apply the cardinality limit', () => { + it('should respect the aggregationCardinalityLimit set via MetricReader', async () => { + const reader = new TestMetricReader({ + cardinalitySelector: (instrumentType: InstrumentType) => 2, // Set cardinality limit to 2 via cardinalitySelector + }); + const meterProvider = new MeterProvider({ + resource: defaultResource, + readers: [reader], + }); + + const meter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = meter.createCounter('test-counter'); + + // Add values with different attributes + counter.add(1, { attr1: 'value1' }); + counter.add(1, { attr2: 'value2' }); + counter.add(1, { attr3: 'value3' }); + counter.add(1, { attr1: 'value1' }); + + // Perform collection + const { resourceMetrics, errors } = await reader.collect(); + + assert.strictEqual(errors.length, 0); + assert.strictEqual(resourceMetrics.scopeMetrics.length, 1); + assert.strictEqual(resourceMetrics.scopeMetrics[0].metrics.length, 1); + + const metricData = resourceMetrics.scopeMetrics[0].metrics[0]; + assert.strictEqual(metricData.dataPoints.length, 2); + + // Check if the overflow data point is present + const overflowDataPoint = ( + metricData.dataPoints as DataPoint[] + ).find((dataPoint: DataPoint) => + Object.prototype.hasOwnProperty.call( + dataPoint.attributes, + 'otel.metric.overflow' + ) + ); + assert.ok(overflowDataPoint); + assert.strictEqual(overflowDataPoint.value, 2); + }); + }); + + describe('default aggregationCardinalityLimit should apply the cardinality limit', () => { + it('should respect the default aggregationCardinalityLimit', async () => { + const reader = new TestMetricReader(); + const meterProvider = new MeterProvider({ + resource: defaultResource, + readers: [reader], + }); + + const meter = meterProvider.getMeter('meter1', 'v1.0.0'); + const counter = meter.createCounter('test-counter'); + + // Add values with different attributes + for (let i = 0; i < 2001; i++) { + const attributes = { [`attr${i}`]: `value${i}` }; + counter.add(1, attributes); + } + + // Perform collection + const { resourceMetrics, errors } = await reader.collect(); + + assert.strictEqual(errors.length, 0); + assert.strictEqual(resourceMetrics.scopeMetrics.length, 1); + assert.strictEqual(resourceMetrics.scopeMetrics[0].metrics.length, 1); + + const metricData = resourceMetrics.scopeMetrics[0].metrics[0]; + assert.strictEqual(metricData.dataPoints.length, 2000); + + // Check if the overflow data point is present + const overflowDataPoint = ( + metricData.dataPoints as DataPoint[] + ).find((dataPoint: DataPoint) => + Object.prototype.hasOwnProperty.call( + dataPoint.attributes, + 'otel.metric.overflow' + ) + ); + assert.ok(overflowDataPoint); + assert.strictEqual(overflowDataPoint.value, 2); + }); + }); + describe('shutdown', () => { it('should shutdown all registered metric readers', async () => { const reader1 = new TestMetricReader(); diff --git a/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts b/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts index d5ab5531267..9210f4622f3 100644 --- a/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts +++ b/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts @@ -16,12 +16,22 @@ import { PeriodicExportingMetricReader } from '../../src/export/PeriodicExportingMetricReader'; import { AggregationTemporality } from '../../src/export/AggregationTemporality'; -import { Aggregation, InstrumentType, PushMetricExporter } from '../../src'; +import { + Aggregation, + CollectionResult, + InstrumentType, + MetricProducer, + PushMetricExporter, +} from '../../src'; import { ResourceMetrics } from '../../src/export/MetricData'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { TimeoutError } from '../../src/utils'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { + ExportResult, + ExportResultCode, + setGlobalErrorHandler, +} from '@opentelemetry/core'; import { assertRejects } from '../test-utils'; import { emptyResourceMetrics, TestMetricProducer } from './TestMetricProducer'; import { @@ -296,6 +306,98 @@ describe('PeriodicExportingMetricReader', () => { await reader.shutdown(); }); + it('should complete actions before promise resolves when async resource attributes are pending', async () => { + // arrange + const waitForAsyncAttributesStub = sinon.stub().returns( + new Promise(resolve => + setTimeout(() => { + resolve(); + }, 10) + ) + ); + const resourceMetrics: ResourceMetrics = { + resource: { + attributes: {}, + merge: sinon.stub(), + asyncAttributesPending: true, // ensure we try to await async attributes + waitForAsyncAttributes: waitForAsyncAttributesStub, // resolve when awaited + }, + scopeMetrics: [], + }; + + const mockCollectionResult: CollectionResult = { + errors: [], + resourceMetrics, + }; + const producerStubs: MetricProducer = { + collect: sinon.stub().resolves(mockCollectionResult), + }; + + const exporter = new TestMetricExporter(); + + const reader = new PeriodicExportingMetricReader({ + exporter: exporter, + exportIntervalMillis: MAX_32_BIT_INT, + exportTimeoutMillis: 80, + }); + + reader.setMetricProducer(producerStubs); + + // act + await reader.forceFlush(); + + // assert + sinon.assert.calledOnce(waitForAsyncAttributesStub); + assert.strictEqual( + exporter.getExports().length, + 1, + 'Expected exactly 1 export to happen when awaiting forceFlush' + ); + }); + + it('should call global error handler when resolving async attributes fails', async () => { + // arrange + const expectedError = new Error('resolving async attributes failed'); + const waitForAsyncAttributesStub = sinon.stub().rejects(expectedError); + + const resourceMetrics: ResourceMetrics = { + resource: { + attributes: {}, + merge: sinon.stub(), + asyncAttributesPending: true, // ensure we try to await async attributes + waitForAsyncAttributes: waitForAsyncAttributesStub, // reject when awaited + }, + scopeMetrics: [], + }; + + const mockCollectionResult: CollectionResult = { + errors: [], + resourceMetrics, + }; + const producerStubs: MetricProducer = { + collect: sinon.stub().resolves(mockCollectionResult), + }; + + const exporter = new TestMetricExporter(); + + const reader = new PeriodicExportingMetricReader({ + exporter: exporter, + exportIntervalMillis: MAX_32_BIT_INT, + exportTimeoutMillis: 80, + }); + + reader.setMetricProducer(producerStubs); + const errorHandlerStub = sinon.stub(); + setGlobalErrorHandler(errorHandlerStub); + + // act + await reader.forceFlush(); + + // assert + sinon.assert.calledOnce(waitForAsyncAttributesStub); + sinon.assert.calledOnceWithExactly(errorHandlerStub, expectedError); + }); + it('should throw TimeoutError when forceFlush takes too long', async () => { const exporter = new TestMetricExporter(); exporter.forceFlushTime = 60; diff --git a/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts b/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts index b4a5df19238..e940c71c18c 100644 --- a/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts +++ b/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts @@ -34,10 +34,12 @@ import { HrTime } from '@opentelemetry/api'; const deltaCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, + selectCardinalityLimit: () => 2000, }; const cumulativeCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.CUMULATIVE, + selectCardinalityLimit: () => 2000, }; describe('AsyncMetricStorage', () => { diff --git a/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts b/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts index ec0a3d6fff3..a14f89df53a 100644 --- a/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts +++ b/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts @@ -120,6 +120,35 @@ describe('DeltaMetricProcessor', () => { const accumulation = accumulations.get({}); assert.strictEqual(accumulation?.toPointValue(), 20); }); + + it('should respect the cardinality limit', () => { + const cardinalityLimit = 2; + const metricProcessor = new DeltaMetricProcessor( + new SumAggregator(true), + cardinalityLimit + ); + + { + const measurements = new AttributeHashMap(); + measurements.set({ attribute: '1' }, 10); + measurements.set({ attribute: '2' }, 20); + measurements.set({ attribute: '3' }, 30); + metricProcessor.batchCumulate(measurements, [0, 0]); + } + + const accumulations = metricProcessor.collect(); + assert.strictEqual(accumulations.size, 2); + { + const accumulation = accumulations.get({ attribute: '1' }); + assert.strictEqual(accumulation?.toPointValue(), 10); + } + { + const overflowAccumulation = accumulations.get({ + 'otel.metric.overflow': true, + }); + assert.strictEqual(overflowAccumulation?.toPointValue(), 30); + } + }); }); describe('collect', () => { diff --git a/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts b/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts index 8a1513e351c..35e3faa1fa9 100644 --- a/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts +++ b/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts @@ -58,11 +58,17 @@ describe('MetricStorageRegistry', () => { selectAggregationTemporality: () => { throw new Error('should not be invoked'); }, + selectCardinalityLimit: () => { + throw new Error('should not be invoked'); + }, }; const collectorHandle2: MetricCollectorHandle = { selectAggregationTemporality: () => { throw new Error('should not be invoked'); }, + selectCardinalityLimit: () => { + throw new Error('should not be invoked'); + }, }; describe('register', () => { diff --git a/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts b/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts index e2e0378a454..e12a291a9d5 100644 --- a/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts +++ b/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts @@ -33,10 +33,12 @@ import { const deltaCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, + selectCardinalityLimit: () => 2000, }; const cumulativeCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.CUMULATIVE, + selectCardinalityLimit: () => 2000, }; describe('SyncMetricStorage', () => { diff --git a/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts b/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts index 77edc36b17f..932d45c5f15 100644 --- a/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts +++ b/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts @@ -31,14 +31,17 @@ import { const deltaCollector1: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, + selectCardinalityLimit: () => 2000, }; const deltaCollector2: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, + selectCardinalityLimit: () => 2000, }; const cumulativeCollector1: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.CUMULATIVE, + selectCardinalityLimit: () => 2000, }; describe('TemporalMetricProcessor', () => { diff --git a/packages/template/package.json b/packages/template/package.json index 644b1e68b1f..75ccf68dd43 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.26.0", + "version": "1.28.0", "private": true, "publishConfig": { "access": "restricted" diff --git a/renovate.json b/renovate.json index ea306ee0b67..7a9dc2eaafa 100644 --- a/renovate.json +++ b/renovate.json @@ -1,12 +1,12 @@ { - "extends": ["config:base"], + "extends": ["config:recommended"], "packageRules": [ { "groupName": "all patch versions", "groupSlug": "all-patch", "matchUpdateTypes": ["patch"], - "excludePackageNames": ["prettier"], - "schedule": ["before 3am every weekday"] + "schedule": ["before 3am every weekday"], + "matchPackageNames": ["!prettier"] }, { "matchUpdateTypes": ["minor"], @@ -26,7 +26,11 @@ "schedule": ["before 3am on Monday"] }, "rebaseWhen": "conflicted", - "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0", "@types/node"], + "ignoreDeps": [ + "@opentelemetry/api", + "@opentelemetry/resources_1.9.0", + "@types/node" + ], "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc"], "labels": ["dependencies"] } diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index 90bcb339355..92e77a144b0 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -5,9 +5,11 @@ set -e SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="${SCRIPT_DIR}/../../" -# freeze the spec version to make SpanAttributess generation reproducible -SPEC_VERSION=v1.27.0 -GENERATOR_VERSION=0.8.0 +# Get latest version by running `git tag -l --sort=version:refname | tail -1` +# ... in git@github.com:open-telemetry/semantic-conventions.git +SPEC_VERSION=v1.28.0 +# ... in git@github.com:open-telemetry/weaver.git +GENERATOR_VERSION=v0.10.0 # When running on windows and your are getting references to ";C" (like Telemetry;C) # then this is an issue with the bash shell, so first run the following in your shell: diff --git a/scripts/semconv/templates/registry/stable/docstring.ts.j2 b/scripts/semconv/templates/registry/stable/docstring.ts.j2 index b0a2b710373..8f99e54b9b3 100644 --- a/scripts/semconv/templates/registry/stable/docstring.ts.j2 +++ b/scripts/semconv/templates/registry/stable/docstring.ts.j2 @@ -1,21 +1,34 @@ -{% macro strong_reqs(string) -%}{{ string | replace(" MUST ", " **MUST** ") | replace(" MUST NOT ", " **MUST NOT** ") | replace(" SHOULD ", " **SHOULD** ") | replace(" SHOULD NOT ", " **SHOULD NOT** ") | replace(" MAY ", " **MAY** ") | replace(" NOT ", " **NOT** ") }}{% endmacro -%} +{% macro strong_rfc2119(string) -%}{{ string | regex_replace("\\b(MUST NOT|MUST|REQUIRED|SHALL NOT|SHALL|SHOULD NOT|SHOULD|RECOMMENDED|MAY|OPTIONAL)\\b", "**$1**") }}{% endmacro -%} -{% macro docstring(obj, type="value") -%}/** -{{ strong_reqs(obj.brief | comment_with_prefix(" * ")) }} -{% if obj.examples is sequence %}{% for example in obj.examples %} - * - * @example {{ example }} -{% endfor %}{%elif obj.examples%} - * - * @example {{ obj.examples | print_member_value }} -{% endif %}{% if obj.note %} - * -{{ ("@note " ~ strong_reqs(obj.note)) | comment_with_prefix(" * ") }} -{% endif %}{% if (obj.stability) != "stable" %} - * - * @experimental This {{type}} is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. -{% endif %}{% if obj.deprecated %} - * - * @deprecated {{ strong_reqs(obj.deprecated) | comment_with_prefix(" * ") }} -{% endif %} - */{% endmacro -%} +{% macro docstring(obj, type="value") -%} +{%- set examples_jsdoc %} + {% if obj.examples is sequence %} + {% for example in obj.examples %} +@example {{ example }} + {% endfor %} + {% elif obj.examples %} +@example {{ obj.examples | print_member_value }} + {% endif %} +{% endset -%} + +{%- if obj.note %} + {% set note_jsdoc = "@note " ~ strong_rfc2119(obj.note) %} +{% endif -%} + +{%- if obj.stability != "stable" %} + {% set stability_jsdoc = "@experimental This " ~ type ~ " is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`." %} +{% endif -%} + +{%- if obj is deprecated %} + {%- set deprecated_jsdoc = "\n@deprecated " ~ strong_rfc2119(obj.deprecated) -%} +{%- endif -%} + +{{ [ + strong_rfc2119(obj.brief) | trim, + "\n", + examples_jsdoc, + note_jsdoc, + stability_jsdoc, + deprecated_jsdoc, +] | comment }} +{%- endmacro -%} diff --git a/scripts/semconv/templates/registry/stable/weaver.yaml b/scripts/semconv/templates/registry/stable/weaver.yaml index 928fdd9b915..4dbf1eda89b 100644 --- a/scripts/semconv/templates/registry/stable/weaver.yaml +++ b/scripts/semconv/templates/registry/stable/weaver.yaml @@ -1,6 +1,21 @@ + params: excluded_attributes: ["messaging.client_id"] +# https://github.com/open-telemetry/weaver/blob/main/crates/weaver_forge/README.md#comment-filter +comment_formats: + jsdoc: + format: markdown + header: '/**' + # Note: This results in trailing whitespace on empty lines. IMHO the + # 'comment' filter should handle those. + prefix: ' * ' + footer: ' */' + trim: true + indent_first_level_list_items: true + escape_backslashes: true +default_comment_format: jsdoc + templates: - pattern: attributes.ts.j2 # Remove file name prefix when per-pattern params are available https://github.com/open-telemetry/weaver/issues/288 diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 1e1b9b55a29..4bbf2499fe3 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.27.0", + "version": "1.29.0", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -32,23 +32,23 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.4", + "@babel/plugin-proposal-decorators": "7.25.9", + "@babel/plugin-transform-runtime": "7.25.9", + "@babel/preset-env": "7.26.0", "@opentelemetry/api": "1.9.0", "babel-loader": "8.4.1", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "130.0.0", + "chromedriver": "131.0.1", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", - "webpack": "5.94.0", + "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", "webpack-merge": "5.10.0" @@ -57,16 +57,16 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.26.0", - "@opentelemetry/core": "1.26.0", - "@opentelemetry/exporter-trace-otlp-http": "0.53.0", - "@opentelemetry/exporter-zipkin": "1.26.0", - "@opentelemetry/instrumentation": "0.53.0", - "@opentelemetry/instrumentation-fetch": "0.53.0", - "@opentelemetry/instrumentation-xml-http-request": "0.53.0", - "@opentelemetry/sdk-metrics": "1.26.0", - "@opentelemetry/sdk-trace-base": "1.26.0", - "@opentelemetry/sdk-trace-web": "1.26.0", + "@opentelemetry/context-zone-peer-dep": "1.28.0", + "@opentelemetry/core": "1.28.0", + "@opentelemetry/exporter-trace-otlp-http": "0.55.0", + "@opentelemetry/exporter-zipkin": "1.28.0", + "@opentelemetry/instrumentation": "0.55.0", + "@opentelemetry/instrumentation-fetch": "0.55.0", + "@opentelemetry/instrumentation-xml-http-request": "0.55.0", + "@opentelemetry/sdk-metrics": "1.28.0", + "@opentelemetry/sdk-trace-base": "1.28.0", + "@opentelemetry/sdk-trace-web": "1.28.0", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0" } } diff --git a/selenium-tests/pages/tracing.js b/selenium-tests/pages/tracing.js index 6dd6e5f26f2..f88ce17618a 100644 --- a/selenium-tests/pages/tracing.js +++ b/selenium-tests/pages/tracing.js @@ -11,10 +11,13 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation'; * @return {WebTracerProvider} */ export function loadOtel(instrumentations) { - const provider = new WebTracerProvider(); const memoryExporter = new InMemorySpanExporter(); - provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter)); - provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); + const provider = new WebTracerProvider({ + spanProcessors: [ + new SimpleSpanProcessor(memoryExporter), + new SimpleSpanProcessor(new ConsoleSpanExporter()), + ] + }); provider.register({ contextManager: new ZoneContextManager(), }); diff --git a/semantic-conventions/CHANGELOG.md b/semantic-conventions/CHANGELOG.md index cdbc2ceb7a1..4bf95ff0471 100644 --- a/semantic-conventions/CHANGELOG.md +++ b/semantic-conventions/CHANGELOG.md @@ -15,6 +15,21 @@ All notable changes to the semantic-conventions package will be documented in th ### :house: (Internal) +## 1.28.0 + +### :rocket: (Enhancement) + +* feat: update semantic conventions to 1.28.0 [#5181](https://github.com/open-telemetry/opentelemetry-js/pull/5181) @trentm + +### :books: (Refine Doc) + +* chore: Improve documentation on entry-points (top-level and "incubating") and on deprecations. [#5025](https://github.com/open-telemetry/opentelemetry-js/issues/5025) @trentm + +### :house: (Internal) + +* chore: Update the comments of some deprecated constants to point to the currently relevant replacement constant, if any. [#5160](https://github.com/open-telemetry/opentelemetry-js/pull/5160) @trentm +* chore: Minor improvements to formatting of comments. [#5100](https://github.com/open-telemetry/opentelemetry-js/pull/5100) @trentm + ## 1.27.0 * Version bump only diff --git a/semantic-conventions/README.md b/semantic-conventions/README.md index ecb78bb7141..cf14621c06d 100644 --- a/semantic-conventions/README.md +++ b/semantic-conventions/README.md @@ -13,18 +13,31 @@ npm install --save @opentelemetry/semantic-conventions ## Import Structure -This package has 2 separate exports. -The main export (`@opentelemetry/semantic-conventions`) includes only stable semantic conventions. -It is subject to the restrictions of semantic versioning 2.0. -The `/incubating` export (`@opentelemetry/semantic-conventions/incubating`) contains all stable and unstable semantic conventions. -It is _NOT_ subject to the restrictions of semantic versioning and _MAY_ contain breaking changes in minor releases. +This package has 2 separate entry-points: + +- The main entry-point, `@opentelemetry/semantic-conventions`, includes only stable semantic conventions. + This entry-point follows semantic versioning 2.0: it will not include breaking changes except with a change in the major version number. +- The "incubating" entry-point, `@opentelemetry/semantic-conventions/incubating`, contains unstable semantic conventions (sometimes called "experimental") and, for convenience, a re-export of the stable semantic conventions. + This entry-point is _NOT_ subject to the restrictions of semantic versioning and _MAY_ contain breaking changes in minor releases. + +Exported constants follow this naming scheme: + +- `ATTR_${attributeName}` for attributes +- `METRIC_${metricName}` for metric names +- `${attributeName}_VALUE_{$enumValue}` for enumerations + +The `ATTR`, `METRIC`, and `VALUE` static strings were used to facilitate readability and filtering in auto-complete lists in IDEs. ## Usage ### Stable SemConv +```bash +npm install --save @opentelemetry/semantic-conventions +``` + ```ts -import { +import { ATTR_NETWORK_PEER_ADDRESS, ATTR_NETWORK_PEER_PORT, ATTR_NETWORK_PROTOCOL_NAME, @@ -44,8 +57,19 @@ const span = tracer.startSpan(spanName, spanOptions) ### Unstable SemConv + + +```bash +npm install --save-exact @opentelemetry/semantic-conventions +``` + +**Note**: Because the "incubating" entry-point may include breaking changes in minor versions, it is recommended that users of unstable semconv values either: + +1. depend on a pinned (exact) version of the package (`npm install --save-exact ...`), or +2. [copy relevant definitions to their code base](https://opentelemetry.io/docs/specs/semconv/non-normative/code-generation/#stability-and-versioning). + ```ts -import { +import { ATTR_PROCESS_COMMAND, ATTR_PROCESS_COMMAND_ARGS, ATTR_PROCESS_COMMAND_LINE, @@ -59,6 +83,107 @@ const span = tracer.startSpan(spanName, spanOptions) }); ``` +## Deprecations + +There are two main types of deprecations in this package: + +1. "semconv deprecations": The process of defining the OpenTelemetry [Semantic Conventions][semconv-docs] sometimes involves deprecating a particular field name as conventions are [stabilized][semconv-stability]. For example, the [stabilization of HTTP conventions][semconv-http-stabilization] included deprecating the `http.url` span attribute in favor of `url.full`. When using this JS package, that appears as a deprecation of the `ATTR_HTTP_URL` export in favour of `ATTR_URL_FULL`. +2. "JS package deprecations": Independently, this JavaScript package has twice changed how it exports the Semantic Conventions constants, e.g. `ATTR_HTTP_URL` instead of `SEMATTRS_HTTP_URL`. The two older forms are still included in 1.x versions of this package for backwards compatibility. The rest of this section shows how to migrate to the latest form. + +### Migrating from `SEMATTRS_*`, `SEMRESATTRS_*`, ... + +Deprecated as of `@opentelemetry/semantic-conventions@1.26.0`. + +Before v1.26.0, constants for each semconv attribute were exported, prefixed with `SEMRESATTRS_` (if defined as a Resource Attribute) or `SEMATTRS_`. As well, constants were exported for each value in an enumeration, of the form `${attributeName}VALUES_${enumValue}`. For example: + +**Deprecated usage:** + +```js +import { + SEMRESATTRS_SERVICE_NAME, + SEMATTRS_HTTP_ROUTE, + SEMATTRS_DB_SYSTEM, + DBSYSTEMVALUES_POSTGRESQL +} from '@opentelemetry/semantic-conventions'; + +// 'service.name' resource attribute +console.log(SEMRESATTRS_SERVICE_NAME); // migrate to 'ATTR_SERVICE_NAME' + +// 'http.route' attribute +console.log(SEMATTRS_HTTP_ROUTE); // migrate to 'ATTR_HTTP_ROUTE' + +// 'db.system' attribute +console.log(SEMATTRS_DB_SYSTEM); // migrate to 'ATTR_DB_SYSTEM' (in incubating [*]) + +// 'postgresql' enum value for 'db.system' attribute +console.log(DBSYSTEMVALUES_POSTGRESQL); // migrate to 'DB_SYSTEM_VALUE_POSTGRESQL' (in incubating [*]) +``` + +See [Migrated usage](#migrated-usage) below. + +### Migrating from `SemanticAttributes.*`, `SemanticResourceAttributes.*`, ... + +Deprecated as of `@opentelemetry/semantic-conventions@1.0.0`. + +Before v1.0.0, constants were exported in namespace objects `SemanticResourceAttributes` and `SemanticAttributes`, and a namespace object for enumerated values for some fields (e.g. `DbSystemValues` for values of the 'db.system' enum). For example: + +**Deprecated usage:** + +```js +import { + SemanticAttributes, + SemanticResourceAttributes, + DbSystemValues, +} from '@opentelemetry/semantic-conventions'; + +// 'service.name' resource attribute +console.log(SemanticResourceAttributes.SERVICE_NAME); // migrate to 'ATTR_SERVICE_NAME' + +// 'http.route' attribute +console.log(SemanticAttributes.HTTP_ROUTE); // migrate to 'ATTR_HTTP_ROUTE' + +// 'db.system' attribute +console.log(SemanticAttributes.DB_SYSTEM); // migrate to 'ATTR_DB_SYSTEM' (in incubating [*]) + +// 'postgresql' enum value for 'db.system' attribute +console.log(DbSystemValues.POSTGRESQL); // migrate to 'DB_SYSTEM_VALUE_POSTGRESQL' (in incubating [*]) +``` + +See [Migrated usage](#migrated-usage) below. + +### Migrated usage + +```js +import { + ATTR_SERVICE_NAME, + ATTR_HTTP_ROUTE, + METRIC_HTTP_CLIENT_REQUEST_DURATION +} from '@opentelemetry/semantic-conventions'; +import { + ATTR_DB_SYSTEM, + DB_SYSTEM_VALUE_POSTGRESQL +} from '@opentelemetry/semantic-conventions/incubating'; + +console.log(ATTR_SERVICE_NAME); // 'service.name' +console.log(ATTR_HTTP_ROUTE); // 'http.route' + +// Bonus: the older exports did not include metric names from semconv. +// 'http.client.request.duration' metric name +console.log(METRIC_HTTP_CLIENT_REQUEST_DURATION); + +console.log(ATTR_DB_SYSTEM); // 'db.system' +// 'postgresql' enum value for 'db.system' attribute +console.log(DB_SYSTEM_VALUE_POSTGRESQL); +``` + +### What is "incubating"? + +The first three fields in the preceding code sample ('service.name', 'http.route', 'http.client.request.duration') are _stable_ in semantic conventions, the latter two are not. Version 1.26.0 of this package separated stable and unstable into separate module entry points: stable conventions are imported `from '@opentelemetry/semantic-conventions'` and unstable `from '@opentelemetry/semantic-conventions/incubating'`. The name "incubating" is [suggested by the Semantic Conventions](https://opentelemetry.io/docs/specs/semconv/non-normative/code-generation/#semantic-conventions-artifact-structure). + +It is recommended that if you are using exports from _incubating_, that you **pin the version** in your package.json dependencies (e.g. via `npm install --save-exact @opentelemetry/semantic-conventions`) _or_ that you copy the relevant definitions into your code base. This is because the removal of exports from the _incubating_ entry point is _not considered a breaking change_ and hence can happen in a minor version. + +Note: The _incubating_ entry point also exports all stable fields, so the above example could be changed to import all five constants `from '@opentelemetry/semantic-conventions/incubating'`. + ## Useful links - For more information on OpenTelemetry, visit: @@ -74,5 +199,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat [npm-url]: https://www.npmjs.com/package/@opentelemetry/semantic-conventions [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fsemantic-conventions.svg - +[semconv-docs]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/README.md +[semconv-stability]: https://opentelemetry.io/docs/specs/otel/versioning-and-stability/#semantic-conventions-stability +[semconv-http-stabilization]: https://opentelemetry.io/blog/2023/http-conventions-declared-stable/ [trace-semantic_conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/specification/trace/semantic_conventions diff --git a/semantic-conventions/package.json b/semantic-conventions/package.json index 8e64d9c9cfa..7e2468bf475 100644 --- a/semantic-conventions/package.json +++ b/semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "1.27.0", + "version": "1.28.0", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -76,12 +76,12 @@ "@size-limit/file": "^11.0.1", "@size-limit/time": "^11.0.1", "@size-limit/webpack": "^11.0.1", - "@types/mocha": "10.0.8", + "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", "cross-var": "1.1.0", "lerna": "6.6.2", - "mocha": "10.7.3", + "mocha": "10.8.2", "nock": "13.3.8", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/semantic-conventions/src/experimental_attributes.ts b/semantic-conventions/src/experimental_attributes.ts index 17b7865e823..421fbee46b5 100644 --- a/semantic-conventions/src/experimental_attributes.ts +++ b/semantic-conventions/src/experimental_attributes.ts @@ -20,32 +20,32 @@ /** * The ID of a running ECS task. The ID **MUST** be extracted from `task.arn`. - * + * * @example 10838bed-421f-43ef-870a-f43feacbbb5b - * * @example 23ebb8ac-c18f-46c6-8bbe-d55d0e37cfbd - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_TASK_ID = 'aws.ecs.task.id' as const; /** * Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). - * + * * @example 33 - * * @example 32 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ANDROID_OS_API_LEVEL = 'android.os.api_level' as const; /** * Deprecated use the `device.app.lifecycle` event definition including `android.state` as a payload field instead. - * + * * @note The Android lifecycle states are defined in [Activity lifecycle callbacks](https://developer.android.com/guide/components/activities/activity-lifecycle#lc), and from which the `OS identifiers` are derived. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + * + * @deprecated Replaced by `device.app.lifecycle`. */ export const ATTR_ANDROID_STATE = 'android.state' as const; @@ -66,62 +66,56 @@ export const ANDROID_STATE_VALUE_FOREGROUND = "foreground" as const; /** * The provenance filename of the built attestation which directly relates to the build artifact filename. This filename **SHOULD** accompany the artifact at publish time. See the [SLSA Relationship](https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations) specification for more information. - * + * * @example golang-binary-amd64-v0.1.0.attestation - * * @example docker-image-amd64-v0.1.0.intoto.json1 - * * @example release-1.tar.gz.attestation - * * @example file-name-package.tar.gz.intoto.json1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_ATTESTATION_FILENAME = 'artifact.attestation.filename' as const; /** * The full [hash value (see glossary)](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf), of the built attestation. Some envelopes in the software attestation space also refer to this as the [digest](https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec). - * + * * @example 1b31dfcd5b7f9267bf2ff47651df1cfb9147b9e4df1f335accf65b4cda498408 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_ATTESTATION_HASH = 'artifact.attestation.hash' as const; /** * The id of the build [software attestation](https://slsa.dev/attestation-model). - * + * * @example 123 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_ATTESTATION_ID = 'artifact.attestation.id' as const; /** * The human readable file name of the artifact, typically generated during build and release processes. Often includes the package name and version in the file name. - * + * * @example golang-binary-amd64-v0.1.0 - * * @example docker-image-amd64-v0.1.0 - * * @example release-1.tar.gz - * * @example file-name-package.tar.gz - * + * * @note This file name can also act as the [Package Name](https://slsa.dev/spec/v1.0/terminology#package-model) * in cases where the package ecosystem maps accordingly. * Additionally, the artifact [can be published](https://slsa.dev/spec/v1.0/terminology#software-supply-chain) * for others, but that is not a guarantee. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_FILENAME = 'artifact.filename' as const; /** * The full [hash value (see glossary)](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf), often found in checksum.txt on a release of the artifact and used to verify package integrity. - * + * * @example 9ff4c52759e2c4ac70b7d517bc7fcdc1cda631ca0045271ddd1b192544f8a3e9 - * + * * @note The specific algorithm used to create the cryptographic hash value is * not defined. In situations where an artifact has multiple * cryptographic hashes, it is up to the implementer to choose which @@ -130,266 +124,253 @@ export const ATTR_ARTIFACT_FILENAME = 'artifact.filename' as const; * corresponding attestation. The implementer can then provide the other * hash values through an additional set of attribute extensions as they * deem necessary. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_HASH = 'artifact.hash' as const; /** * The [Package URL](https://github.com/package-url/purl-spec) of the [package artifact](https://slsa.dev/spec/v1.0/terminology#package-model) provides a standard way to identify and locate the packaged artifact. - * + * * @example pkg:github/package-url/purl-spec@1209109710924 - * * @example pkg:npm/foo@12.12.3 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_PURL = 'artifact.purl' as const; /** * The version of the artifact. - * + * * @example v0.1.0 - * * @example 1.2.1 - * * @example 122691-build - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_ARTIFACT_VERSION = 'artifact.version' as const; /** * The JSON-serialized value of each item in the `AttributeDefinitions` request field. - * - * @example { "AttributeName": "string", "AttributeType": "string" } - * + * + * @example ["{ "AttributeName": "string", "AttributeType": "string" }"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS = 'aws.dynamodb.attribute_definitions' as const; /** * The value of the `AttributesToGet` request parameter. - * - * @example lives - * - * @example id - * + * + * @example ["lives", "id"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_ATTRIBUTES_TO_GET = 'aws.dynamodb.attributes_to_get' as const; /** * The value of the `ConsistentRead` request parameter. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_CONSISTENT_READ = 'aws.dynamodb.consistent_read' as const; /** * The JSON-serialized value of each item in the `ConsumedCapacity` response field. - * - * @example { "CapacityUnits": number, "GlobalSecondaryIndexes": { "string" : { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number } }, "LocalSecondaryIndexes": { "string" : { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number } }, "ReadCapacityUnits": number, "Table": { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number }, "TableName": "string", "WriteCapacityUnits": number } - * + * + * @example ["{ "CapacityUnits": number, "GlobalSecondaryIndexes": { "string" : { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number } }, "LocalSecondaryIndexes": { "string" : { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number } }, "ReadCapacityUnits": number, "Table": { "CapacityUnits": number, "ReadCapacityUnits": number, "WriteCapacityUnits": number }, "TableName": "string", "WriteCapacityUnits": number }"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY = 'aws.dynamodb.consumed_capacity' as const; /** * The value of the `Count` response parameter. - * + * * @example 10 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_COUNT = 'aws.dynamodb.count' as const; /** * The value of the `ExclusiveStartTableName` request parameter. - * + * * @example Users - * * @example CatsTable - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE = 'aws.dynamodb.exclusive_start_table' as const; /** * The JSON-serialized value of each item in the `GlobalSecondaryIndexUpdates` request field. - * - * @example { "Create": { "IndexName": "string", "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" }, "ProvisionedThroughput": { "ReadCapacityUnits": number, "WriteCapacityUnits": number } } - * + * + * @example ["{ "Create": { "IndexName": "string", "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" }, "ProvisionedThroughput": { "ReadCapacityUnits": number, "WriteCapacityUnits": number } }"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES = 'aws.dynamodb.global_secondary_index_updates' as const; /** * The JSON-serialized value of each item of the `GlobalSecondaryIndexes` request field - * - * @example { "IndexName": "string", "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" }, "ProvisionedThroughput": { "ReadCapacityUnits": number, "WriteCapacityUnits": number } } - * + * + * @example ["{ "IndexName": "string", "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" }, "ProvisionedThroughput": { "ReadCapacityUnits": number, "WriteCapacityUnits": number } }"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES = 'aws.dynamodb.global_secondary_indexes' as const; /** * The value of the `IndexName` request parameter. - * + * * @example name_to_group - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_INDEX_NAME = 'aws.dynamodb.index_name' as const; /** * The JSON-serialized value of the `ItemCollectionMetrics` response field. - * + * * @example { "string" : [ { "ItemCollectionKey": { "string" : { "B": blob, "BOOL": boolean, "BS": [ blob ], "L": [ "AttributeValue" ], "M": { "string" : "AttributeValue" }, "N": "string", "NS": [ "string" ], "NULL": boolean, "S": "string", "SS": [ "string" ] } }, "SizeEstimateRangeGB": [ number ] } ] } - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_ITEM_COLLECTION_METRICS = 'aws.dynamodb.item_collection_metrics' as const; /** * The value of the `Limit` request parameter. - * + * * @example 10 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_LIMIT = 'aws.dynamodb.limit' as const; /** * The JSON-serialized value of each item of the `LocalSecondaryIndexes` request field. - * - * @example { "IndexArn": "string", "IndexName": "string", "IndexSizeBytes": number, "ItemCount": number, "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" } } - * + * + * @example ["{ "IndexArn": "string", "IndexName": "string", "IndexSizeBytes": number, "ItemCount": number, "KeySchema": [ { "AttributeName": "string", "KeyType": "string" } ], "Projection": { "NonKeyAttributes": [ "string" ], "ProjectionType": "string" } }"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES = 'aws.dynamodb.local_secondary_indexes' as const; /** * The value of the `ProjectionExpression` request parameter. - * + * * @example Title - * * @example Title, Price, Color - * * @example Title, Description, RelatedItems, ProductReviews - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_PROJECTION = 'aws.dynamodb.projection' as const; /** * The value of the `ProvisionedThroughput.ReadCapacityUnits` request parameter. - * + * * @example 1.0 - * * @example 2.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY = 'aws.dynamodb.provisioned_read_capacity' as const; /** * The value of the `ProvisionedThroughput.WriteCapacityUnits` request parameter. - * + * * @example 1.0 - * * @example 2.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY = 'aws.dynamodb.provisioned_write_capacity' as const; /** * The value of the `ScanIndexForward` request parameter. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_SCAN_FORWARD = 'aws.dynamodb.scan_forward' as const; /** * The value of the `ScannedCount` response parameter. - * + * * @example 50 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_SCANNED_COUNT = 'aws.dynamodb.scanned_count' as const; /** * The value of the `Segment` request parameter. - * + * * @example 10 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_SEGMENT = 'aws.dynamodb.segment' as const; /** * The value of the `Select` request parameter. - * + * * @example ALL_ATTRIBUTES - * * @example COUNT - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_SELECT = 'aws.dynamodb.select' as const; /** * The number of items in the `TableNames` response parameter. - * + * * @example 20 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_TABLE_COUNT = 'aws.dynamodb.table_count' as const; /** * The keys in the `RequestItems` object field. - * - * @example Users - * - * @example Cats - * + * + * @example ["Users", "Cats"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_TABLE_NAMES = 'aws.dynamodb.table_names' as const; /** * The value of the `TotalSegments` request parameter. - * + * * @example 100 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS = 'aws.dynamodb.total_segments' as const; /** * The ARN of an [ECS cluster](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html). - * + * * @example arn:aws:ecs:us-west-2:123456789123:cluster/my-cluster - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_CLUSTER_ARN = 'aws.ecs.cluster.arn' as const; /** * The Amazon Resource Name (ARN) of an [ECS container instance](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html). - * + * * @example arn:aws:ecs:us-west-1:123456789123:container/32624152-9086-4f0e-acae-1a75b14fe4d9 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_CONTAINER_ARN = 'aws.ecs.container.arn' as const; /** * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_LAUNCHTYPE = 'aws.ecs.launchtype' as const; @@ -406,342 +387,330 @@ export const AWS_ECS_LAUNCHTYPE_VALUE_FARGATE = "fargate" as const; /** * The ARN of a running [ECS task](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids). - * + * * @example arn:aws:ecs:us-west-1:123456789123:task/10838bed-421f-43ef-870a-f43feacbbb5b - * * @example arn:aws:ecs:us-west-1:123456789123:task/my-cluster/task-id/23ebb8ac-c18f-46c6-8bbe-d55d0e37cfbd - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_TASK_ARN = 'aws.ecs.task.arn' as const; /** * The family name of the [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html) used to create the ECS task. - * + * * @example opentelemetry-family - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_TASK_FAMILY = 'aws.ecs.task.family' as const; /** * The revision for the task definition used to create the ECS task. - * + * * @example 8 - * * @example 26 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_ECS_TASK_REVISION = 'aws.ecs.task.revision' as const; /** * The ARN of an EKS cluster. - * + * * @example arn:aws:ecs:us-west-2:123456789123:cluster/my-cluster - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_EKS_CLUSTER_ARN = 'aws.eks.cluster.arn' as const; /** * The full invoked ARN as provided on the `Context` passed to the function (`Lambda-Runtime-Invoked-Function-Arn` header on the `/runtime/invocation/next` applicable). - * + * * @example arn:aws:lambda:us-east-1:123456:function:myfunction:myalias - * + * * @note This may be different from `cloud.resource_id` if an alias is involved. - * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_LAMBDA_INVOKED_ARN = 'aws.lambda.invoked_arn' as const; /** * The Amazon Resource Name(s) (ARN) of the AWS log group(s). - * - * @example arn:aws:logs:us-west-1:123456789012:log-group:/aws/my/group:* - * + * + * @example ["arn:aws:logs:us-west-1:123456789012:log-group:/aws/my/group:*"] + * * @note See the [log group ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_LOG_GROUP_ARNS = 'aws.log.group.arns' as const; /** * The name(s) of the AWS log group(s) an application is writing to. - * - * @example /aws/lambda/my-function - * - * @example opentelemetry-service - * + * + * @example ["/aws/lambda/my-function", "opentelemetry-service"] + * * @note Multiple log groups must be supported for cases like multi-container applications, where a single application has sidecar containers, and each write to their own log group. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_LOG_GROUP_NAMES = 'aws.log.group.names' as const; /** * The ARN(s) of the AWS log stream(s). - * - * @example arn:aws:logs:us-west-1:123456789012:log-group:/aws/my/group:log-stream:logs/main/10838bed-421f-43ef-870a-f43feacbbb5b - * + * + * @example ["arn:aws:logs:us-west-1:123456789012:log-group:/aws/my/group:log-stream:logs/main/10838bed-421f-43ef-870a-f43feacbbb5b"] + * * @note See the [log stream ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). One log group can contain several log streams, so these ARNs necessarily identify both a log group and a log stream. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_LOG_STREAM_ARNS = 'aws.log.stream.arns' as const; /** * The name(s) of the AWS log stream(s) an application is writing to. - * - * @example logs/main/10838bed-421f-43ef-870a-f43feacbbb5b - * + * + * @example ["logs/main/10838bed-421f-43ef-870a-f43feacbbb5b"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_LOG_STREAM_NAMES = 'aws.log.stream.names' as const; /** * The AWS request ID as returned in the response headers `x-amz-request-id` or `x-amz-requestid`. - * + * * @example 79b9da39-b7ae-508a-a6bc-864b2829c622 - * * @example C9ER4AJX75574TDJ - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_REQUEST_ID = 'aws.request_id' as const; /** * The S3 bucket name the request refers to. Corresponds to the `--bucket` parameter of the [S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html) operations. - * + * * @example some-bucket-name - * + * * @note The `bucket` attribute is applicable to all S3 operations that reference a bucket, i.e. that require the bucket name as a mandatory parameter. * This applies to almost all S3 operations except `list-buckets`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_BUCKET = 'aws.s3.bucket' as const; /** * The source object (in the form `bucket`/`key`) for the copy operation. - * + * * @example someFile.yml - * + * * @note The `copy_source` attribute applies to S3 copy operations and corresponds to the `--copy-source` parameter * of the [copy-object operation within the S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html). * This applies in particular to the following operations: * - * - [copy-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html) - * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) - * + * - [copy-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html) + * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_COPY_SOURCE = 'aws.s3.copy_source' as const; /** * The delete request container that specifies the objects to be deleted. - * + * * @example Objects=[{Key=string,VersionId=string},{Key=string,VersionId=string}],Quiet=boolean - * + * * @note The `delete` attribute is only applicable to the [delete-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html) operation. * The `delete` attribute corresponds to the `--delete` parameter of the * [delete-objects operation within the S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_DELETE = 'aws.s3.delete' as const; /** * The S3 object key the request refers to. Corresponds to the `--key` parameter of the [S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html) operations. - * + * * @example someFile.yml - * + * * @note The `key` attribute is applicable to all object-related S3 operations, i.e. that require the object key as a mandatory parameter. * This applies in particular to the following operations: * - * - [copy-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html) - * - [delete-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html) - * - [get-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html) - * - [head-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html) - * - [put-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html) - * - [restore-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html) - * - [select-object-content](https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html) - * - [abort-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html) - * - [complete-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html) - * - [create-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html) - * - [list-parts](https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html) - * - [upload-part](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html) - * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) - * + * - [copy-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html) + * - [delete-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html) + * - [get-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html) + * - [head-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html) + * - [put-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html) + * - [restore-object](https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html) + * - [select-object-content](https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html) + * - [abort-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html) + * - [complete-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html) + * - [create-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html) + * - [list-parts](https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html) + * - [upload-part](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html) + * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_KEY = 'aws.s3.key' as const; /** * The part number of the part being uploaded in a multipart-upload operation. This is a positive integer between 1 and 10,000. - * + * * @example 3456 - * + * * @note The `part_number` attribute is only applicable to the [upload-part](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html) * and [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) operations. * The `part_number` attribute corresponds to the `--part-number` parameter of the * [upload-part operation within the S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_PART_NUMBER = 'aws.s3.part_number' as const; /** * Upload ID that identifies the multipart upload. - * + * * @example dfRtDYWFbkRONycy.Yxwh66Yjlx.cph0gtNBtJ - * + * * @note The `upload_id` attribute applies to S3 multipart-upload operations and corresponds to the `--upload-id` parameter * of the [S3 API](https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html) multipart operations. * This applies in particular to the following operations: * - * - [abort-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html) - * - [complete-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html) - * - [list-parts](https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html) - * - [upload-part](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html) - * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) - * + * - [abort-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html) + * - [complete-multipart-upload](https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html) + * - [list-parts](https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html) + * - [upload-part](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html) + * - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html) + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AWS_S3_UPLOAD_ID = 'aws.s3.upload_id' as const; +/** + * [Azure Resource Provider Namespace](https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers) as recognized by the client. + * + * @example Microsoft.Storage + * @example Microsoft.KeyVault + * @example Microsoft.ServiceBus + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_AZ_NAMESPACE = 'az.namespace' as const; + /** * The unique identifier of the service request. It's generated by the Azure service and returned with the response. - * + * * @example 00000000-0000-0000-0000-000000000000 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_AZ_SERVICE_REQUEST_ID = 'az.service_request_id' as const; /** * Array of brand name and version separated by a space - * - * @example Not A;Brand 99 - * - * @example Chromium 99 - * - * @example Chrome 99 - * + * + * @example [" Not A;Brand 99", "Chromium 99", "Chrome 99"] + * * @note This value is intended to be taken from the [UA client hints API](https://wicg.github.io/ua-client-hints/#interface) (`navigator.userAgentData.brands`). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_BROWSER_BRANDS = 'browser.brands' as const; /** * Preferred language of the user using the browser - * + * * @example en - * * @example en-US - * * @example fr - * * @example fr-FR - * + * * @note This value is intended to be taken from the Navigator API `navigator.language`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_BROWSER_LANGUAGE = 'browser.language' as const; /** * A boolean that is true if the browser is running on a mobile device - * + * * @note This value is intended to be taken from the [UA client hints API](https://wicg.github.io/ua-client-hints/#interface) (`navigator.userAgentData.mobile`). If unavailable, this attribute **SHOULD** be left unset. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_BROWSER_MOBILE = 'browser.mobile' as const; /** * The platform on which the browser is running - * + * * @example Windows - * * @example macOS - * * @example Android - * - * @note This value is intended to be taken from the [UA client hints API](https://wicg.github.io/ua-client-hints/#interface) (`navigator.userAgentData.platform`). If unavailable, the legacy `navigator.platform` API **SHOULD** **NOT** be used instead and this attribute **SHOULD** be left unset in order for the values to be consistent. + * + * @note This value is intended to be taken from the [UA client hints API](https://wicg.github.io/ua-client-hints/#interface) (`navigator.userAgentData.platform`). If unavailable, the legacy `navigator.platform` API **SHOULD NOT** be used instead and this attribute **SHOULD** be left unset in order for the values to be consistent. * The list of possible values is defined in the [W3C User-Agent Client Hints specification](https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform). Note that some (but not all) of these values can overlap with values in the [`os.type` and `os.name` attributes](./os.md). However, for consistency, the values in the `browser.platform` attribute should capture the exact value that the user agent provides. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_BROWSER_PLATFORM = 'browser.platform' as const; /** * The human readable name of the pipeline within a CI/CD system. - * + * * @example Build and Test - * * @example Lint - * * @example Deploy Go Project - * * @example deploy_to_environment - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_NAME = 'cicd.pipeline.name' as const; /** * The unique identifier of a pipeline run within a CI/CD system. - * + * * @example 120912 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_RUN_ID = 'cicd.pipeline.run.id' as const; /** * The human readable name of a task within a pipeline. Task here most closely aligns with a [computing process](https://en.wikipedia.org/wiki/Pipeline_(computing)) in a pipeline. Other terms for tasks include commands, steps, and procedures. - * + * * @example Run GoLang Linter - * * @example Go Build - * * @example go-test - * * @example deploy_binary - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_TASK_NAME = 'cicd.pipeline.task.name' as const; /** * The unique identifier of a task run within a pipeline. - * + * * @example 12097 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_TASK_RUN_ID = 'cicd.pipeline.task.run.id' as const; /** * The [URL](https://en.wikipedia.org/wiki/URL) of the pipeline run providing the complete address in order to locate and identify the pipeline run. - * + * * @example https://github.com/open-telemetry/semantic-conventions/actions/runs/9753949763/job/26920038674?pr=1075 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_TASK_RUN_URL_FULL = 'cicd.pipeline.task.run.url.full' as const; /** * The type of the task within a pipeline. - * + * * @example build - * * @example test - * * @example deploy - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CICD_PIPELINE_TASK_TYPE = 'cicd.pipeline.task.type' as const; @@ -763,31 +732,30 @@ export const CICD_PIPELINE_TASK_TYPE_VALUE_TEST = "test" as const; /** * The cloud account ID the resource is assigned to. - * + * * @example 111111111111 - * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_ACCOUNT_ID = 'cloud.account.id' as const; /** * Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running. - * + * * @example us-east-1c - * + * * @note Availability zones are called "zones" on Alibaba Cloud and Google Cloud. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_AVAILABILITY_ZONE = 'cloud.availability_zone' as const; /** * The cloud platform in use. - * + * * @note The prefix of the service **SHOULD** match the one specified in `cloud.provider`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_PLATFORM = 'cloud.platform' as const; @@ -934,7 +902,7 @@ export const CLOUD_PLATFORM_VALUE_TENCENT_CLOUD_SCF = "tencent_cloud_scf" as con /** * Name of the cloud provider. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_PROVIDER = 'cloud.provider' as const; @@ -976,194 +944,345 @@ export const CLOUD_PROVIDER_VALUE_TENCENT_CLOUD = "tencent_cloud" as const; /** * The geographical region the resource is running. - * + * * @example us-central1 - * * @example us-east-1 - * + * * @note Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/global-infrastructure/geographies/), [Google Cloud regions](https://cloud.google.com/about/locations), or [Tencent Cloud regions](https://www.tencentcloud.com/document/product/213/6091). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_REGION = 'cloud.region' as const; /** * Cloud provider-specific native identifier of the monitored cloud resource (e.g. an [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) on AWS, a [fully qualified resource ID](https://learn.microsoft.com/rest/api/resources/resources/get-by-id) on Azure, a [full resource name](https://cloud.google.com/apis/design/resource_names#full_resource_name) on GCP) - * + * * @example arn:aws:lambda:REGION:ACCOUNT_ID:function:my-function - * * @example //run.googleapis.com/projects/PROJECT_ID/locations/LOCATION_ID/services/SERVICE_ID - * - * @example /subscriptions//resourceGroups//providers/Microsoft.Web/sites//functions/ - * + * @example /subscriptions//resourceGroups//providers/Microsoft.Web/sites//functions/ + * * @note On some cloud providers, it may not be possible to determine the full ID at startup, * so it may be necessary to set `cloud.resource_id` as a span attribute instead. * * The exact value to use for `cloud.resource_id` depends on the cloud provider. * The following well-known definitions **MUST** be used if you set this attribute and they apply: * - * * **AWS Lambda:** The function [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). - * Take care not to use the "invoked ARN" directly but replace any - * [alias suffix](https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html) - * with the resolved function version, as the same runtime instance may be invocable with - * multiple different aliases. - * * **GCP:** The [URI of the resource](https://cloud.google.com/iam/docs/full-resource-names) - * * **Azure:** The [Fully Qualified Resource ID](https://docs.microsoft.com/rest/api/resources/resources/get-by-id) of the invoked function, - * *not* the function app, having the form - * `/subscriptions//resourceGroups//providers/Microsoft.Web/sites//functions/`. - * This means that a span attribute **MUST** be used, as an Azure function app can host multiple functions that would usually share - * a TracerProvider. - * + * - **AWS Lambda:** The function [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). + * Take care not to use the "invoked ARN" directly but replace any + * [alias suffix](https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html) + * with the resolved function version, as the same runtime instance may be invocable with + * multiple different aliases. + * - **GCP:** The [URI of the resource](https://cloud.google.com/iam/docs/full-resource-names) + * - **Azure:** The [Fully Qualified Resource ID](https://docs.microsoft.com/rest/api/resources/resources/get-by-id) of the invoked function, + * *not* the function app, having the form + * `/subscriptions//resourceGroups//providers/Microsoft.Web/sites//functions/`. + * This means that a span attribute **MUST** be used, as an Azure function app can host multiple functions that would usually share + * a TracerProvider. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUD_RESOURCE_ID = 'cloud.resource_id' as const; /** * The [event_id](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id) uniquely identifies the event. - * + * * @example 123e4567-e89b-12d3-a456-426614174000 - * * @example 0001 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUDEVENTS_EVENT_ID = 'cloudevents.event_id' as const; /** * The [source](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1) identifies the context in which an event happened. - * + * * @example https://github.com/cloudevents - * * @example /cloudevents/spec/pull/123 - * * @example my-service - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUDEVENTS_EVENT_SOURCE = 'cloudevents.event_source' as const; /** * The [version of the CloudEvents specification](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion) which the event uses. - * + * * @example "1.0" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUDEVENTS_EVENT_SPEC_VERSION = 'cloudevents.event_spec_version' as const; /** * The [subject](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject) of the event in the context of the event producer (identified by source). - * + * * @example "mynewfile.jpg" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUDEVENTS_EVENT_SUBJECT = 'cloudevents.event_subject' as const; /** * The [event_type](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type) contains a value describing the type of event related to the originating occurrence. - * + * * @example com.github.pull_request.opened - * * @example com.example.object.deleted.v2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CLOUDEVENTS_EVENT_TYPE = 'cloudevents.event_type' as const; +/** + * The guid of the application. + * + * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.application_id`. This is the same value as + * reported by `cf app --guid`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_APP_ID = 'cloudfoundry.app.id' as const; + +/** + * The index of the application instance. 0 when just one instance is active. + * + * @example 0 + * @example 1 + * + * @note CloudFoundry defines the `instance_id` in the [Loggegator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope). + * It is used for logs and metrics emitted by CloudFoundry. It is + * supposed to contain the application instance index for applications + * deployed on the runtime. + * + * Application instrumentation should use the value from environment + * variable `CF_INSTANCE_INDEX`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_APP_INSTANCE_ID = 'cloudfoundry.app.instance.id' as const; + +/** + * The name of the application. + * + * @example my-app-name + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.application_name`. This is the same value + * as reported by `cf apps`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_APP_NAME = 'cloudfoundry.app.name' as const; + +/** + * The guid of the CloudFoundry org the application is running in. + * + * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.org_id`. This is the same value as + * reported by `cf org --guid`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_ORG_ID = 'cloudfoundry.org.id' as const; + +/** + * The name of the CloudFoundry organization the app is running in. + * + * @example my-org-name + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.org_name`. This is the same value as + * reported by `cf orgs`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_ORG_NAME = 'cloudfoundry.org.name' as const; + +/** + * The UID identifying the process. + * + * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.process_id`. It is supposed to be equal to + * `VCAP_APPLICATION.app_id` for applications deployed to the runtime. + * For system components, this could be the actual PID. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_PROCESS_ID = 'cloudfoundry.process.id' as const; + +/** + * The type of process. + * + * @example web + * + * @note CloudFoundry applications can consist of multiple jobs. Usually the + * main process will be of type `web`. There can be additional background + * tasks or side-cars with different process types. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_PROCESS_TYPE = 'cloudfoundry.process.type' as const; + +/** + * The guid of the CloudFoundry space the application is running in. + * + * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.space_id`. This is the same value as + * reported by `cf space --guid`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_SPACE_ID = 'cloudfoundry.space.id' as const; + +/** + * The name of the CloudFoundry space the application is running in. + * + * @example my-space-name + * + * @note Application instrumentation should use the value from environment + * variable `VCAP_APPLICATION.space_name`. This is the same value as + * reported by `cf spaces`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_SPACE_NAME = 'cloudfoundry.space.name' as const; + +/** + * A guid or another name describing the event source. + * + * @example cf/gorouter + * + * @note CloudFoundry defines the `source_id` in the [Loggregator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope). + * It is used for logs and metrics emitted by CloudFoundry. It is + * supposed to contain the component name, e.g. "gorouter", for + * CloudFoundry components. + * + * When system components are instrumented, values from the + * [Bosh spec](https://bosh.io/docs/jobs/#properties-spec) + * should be used. The `system.id` should be set to + * `spec.deployment/spec.name`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_SYSTEM_ID = 'cloudfoundry.system.id' as const; + +/** + * A guid describing the concrete instance of the event source. + * + * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d + * + * @note CloudFoundry defines the `instance_id` in the [Loggregator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope). + * It is used for logs and metrics emitted by CloudFoundry. It is + * supposed to contain the vm id for CloudFoundry components. + * + * When system components are instrumented, values from the + * [Bosh spec](https://bosh.io/docs/jobs/#properties-spec) + * should be used. The `system.instance.id` should be set to `spec.id`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CLOUDFOUNDRY_SYSTEM_INSTANCE_ID = 'cloudfoundry.system.instance.id' as const; + /** * The column number in `code.filepath` best representing the operation. It **SHOULD** point within the code unit named in `code.function`. - * + * * @example 16 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_COLUMN = 'code.column' as const; /** * The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path). - * + * * @example "/usr/local/MyApplication/content_root/app/index.php" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_FILEPATH = 'code.filepath' as const; /** * The method or function name, or equivalent (usually rightmost part of the code unit's name). - * + * * @example "serveRequest" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_FUNCTION = 'code.function' as const; /** * The line number in `code.filepath` best representing the operation. It **SHOULD** point within the code unit named in `code.function`. - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_LINENO = 'code.lineno' as const; /** * The "namespace" within which `code.function` is defined. Usually the qualified class or module name, such that `code.namespace` + some separator + `code.function` form a unique identifier for the code unit. - * + * * @example "com.example.MyHttpService" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_NAMESPACE = 'code.namespace' as const; /** * A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. - * - * @example "at com.example.GenerateTrace.methodB(GenerateTrace.java:13)\\n at com.example.GenerateTrace.methodA(GenerateTrace.java:9)\\n at com.example.GenerateTrace.main(GenerateTrace.java:5)" - * + * + * @example "at com.example.GenerateTrace.methodB(GenerateTrace.java:13)\\n at com.example.GenerateTrace.methodA(GenerateTrace.java:9)\\n at com.example.GenerateTrace.main(GenerateTrace.java:5)\\n" + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CODE_STACKTRACE = 'code.stacktrace' as const; /** * The command used to run the container (i.e. the command name). - * + * * @example otelcontribcol - * + * * @note If using embedded credentials or sensitive data, it is recommended to remove them to prevent potential leakage. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_COMMAND = 'container.command' as const; /** - * All the command arguments (including the command/executable itself) run by the container. [2] - * - * @example otelcontribcol, --config, config.yaml - * + * All the command arguments (including the command/executable itself) run by the container. + * + * @example ["otelcontribcol", "--config", "config.yaml"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_COMMAND_ARGS = 'container.command_args' as const; /** - * The full command run by the container as a single string representing the full command. [2] - * + * The full command run by the container as a single string representing the full command. + * * @example otelcontribcol --config config.yaml - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_COMMAND_LINE = 'container.command_line' as const; /** * Deprecated, use `cpu.mode` instead. - * + * * @example user - * * @example kernel - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `cpu.mode` + * + * @deprecated Replaced by `cpu.mode` */ export const ATTR_CONTAINER_CPU_STATE = 'container.cpu.state' as const; @@ -1183,109 +1302,124 @@ export const CONTAINER_CPU_STATE_VALUE_SYSTEM = "system" as const; export const CONTAINER_CPU_STATE_VALUE_USER = "user" as const; /** - * Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. - * - * @example a3bf90e006b2 - * + * The name of the CSI ([Container Storage Interface](https://github.com/container-storage-interface/spec)) plugin used by the volume. + * + * @example pd.csi.storage.gke.io + * + * @note This can sometimes be referred to as a "driver" in CSI implementations. This should represent the `name` field of the GetPluginInfo RPC. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ -export const ATTR_CONTAINER_ID = 'container.id' as const; +export const ATTR_CONTAINER_CSI_PLUGIN_NAME = 'container.csi.plugin.name' as const; + +/** + * The unique volume ID returned by the CSI ([Container Storage Interface](https://github.com/container-storage-interface/spec)) plugin. + * + * @example projects/my-gcp-project/zones/my-gcp-zone/disks/my-gcp-disk + * + * @note This can sometimes be referred to as a "volume handle" in CSI implementations. This should represent the `Volume.volume_id` field in CSI spec. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CONTAINER_CSI_VOLUME_ID = 'container.csi.volume.id' as const; + +/** + * Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/containers/run/#container-identification). The UUID might be abbreviated. + * + * @example a3bf90e006b2 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_CONTAINER_ID = 'container.id' as const; /** * Runtime specific image identifier. Usually a hash algorithm followed by a UUID. - * + * * @example sha256:19c92d0a00d1b66d897bceaa7319bee0dd38a10a851c60bcec9474aa3f01e50f - * + * * @note Docker defines a sha256 of the image id; `container.image.id` corresponds to the `Image` field from the Docker container inspect [API](https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect) endpoint. * K8s defines a link to the container registry repository with digest `"imageID": "registry.azurecr.io /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"`. * The ID is assigned by the container runtime and can vary in different environments. Consider using `oci.manifest.digest` if it is important to identify the same image in different environments/runtimes. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_IMAGE_ID = 'container.image.id' as const; /** * Name of the image the container was built on. - * + * * @example gcr.io/opentelemetry/operator - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_IMAGE_NAME = 'container.image.name' as const; /** * Repo digests of the container image as provided by the container runtime. - * - * @example example@sha256:afcc7f1ac1b49db317a7196c902e61c6c3c4607d63599ee1a82d702d249a0ccb - * - * @example internal.registry.example.com:5000/example@sha256:b69959407d21e8a062e0416bf13405bb2b71ed7a84dde4158ebafacfa06f5578 - * + * + * @example ["example@sha256:afcc7f1ac1b49db317a7196c902e61c6c3c4607d63599ee1a82d702d249a0ccb", "internal.registry.example.com:5000/example@sha256:b69959407d21e8a062e0416bf13405bb2b71ed7a84dde4158ebafacfa06f5578"] + * * @note [Docker](https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect) and [CRI](https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238) report those under the `RepoDigests` field. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_IMAGE_REPO_DIGESTS = 'container.image.repo_digests' as const; /** * Container image tags. An example can be found in [Docker Image Inspect](https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect). Should be only the `` section of the full name for example from `registry.example.com/my-org/my-image:`. - * - * @example v1.27.1 - * - * @example 3.5.7-0 - * + * + * @example ["v1.27.1", "3.5.7-0"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_IMAGE_TAGS = 'container.image.tags' as const; /** * Container labels, `` being the label name, the value being the label value. - * + * * @example container.label.app=nginx - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_LABEL = (key: string) => `container.label.${key}`; /** * Deprecated, use `container.label` instead. - * + * * @example container.label.app=nginx - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `container.label`. + * + * @deprecated Replaced by `container.label`. */ export const ATTR_CONTAINER_LABELS = (key: string) => `container.labels.${key}`; /** * Container name used by container runtime. - * + * * @example opentelemetry-autoconf - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_NAME = 'container.name' as const; /** * The container runtime managing this container. - * + * * @example docker - * * @example containerd - * * @example rkt - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CONTAINER_RUNTIME = 'container.runtime' as const; /** * The mode of the CPU - * + * * @example user - * * @example system - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_CPU_MODE = 'cpu.mode' as const; @@ -1332,7 +1466,7 @@ export const CPU_MODE_VALUE_USER = "user" as const; /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_CONSISTENCY_LEVEL = 'db.cassandra.consistency_level' as const; @@ -1394,74 +1528,73 @@ export const DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_TWO = "two" as const; /** * The data center of the coordinating node for a query. - * + * * @example "us-west-2" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_COORDINATOR_DC = 'db.cassandra.coordinator.dc' as const; /** * The ID of the coordinating node for a query. - * + * * @example "be13faa2-8574-4d71-926d-27f16cf8a7af" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_COORDINATOR_ID = 'db.cassandra.coordinator.id' as const; /** * Whether or not the query is idempotent. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_IDEMPOTENCE = 'db.cassandra.idempotence' as const; /** * The fetch size used for paging, i.e. how many rows will be returned at once. - * + * * @example 5000 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_PAGE_SIZE = 'db.cassandra.page_size' as const; /** * The number of times a query was speculatively executed. Not set or `0` if the query was not executed speculatively. - * + * * @example 0 - * * @example 2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = 'db.cassandra.speculative_execution_count' as const; /** * Deprecated, use `db.collection.name` instead. - * + * * @example "mytable" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.collection.name`. + * + * @deprecated Replaced by `db.collection.name`. */ export const ATTR_DB_CASSANDRA_TABLE = 'db.cassandra.table' as const; /** * The name of the connection pool; unique within the instrumented application. In case the connection pool implementation doesn't provide a name, instrumentation **SHOULD** use a combination of parameters that would make the name unique, for example, combining attributes `server.address`, `server.port`, and `db.namespace`, formatted as `server.address:server.port/db.namespace`. Instrumentations that generate connection pool name following different patterns **SHOULD** document it. - * + * * @example myDataSource - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CLIENT_CONNECTION_POOL_NAME = 'db.client.connection.pool.name' as const; /** * The state of a connection in the pool - * + * * @example idle - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_CLIENT_CONNECTION_STATE = 'db.client.connection.state' as const; @@ -1478,23 +1611,23 @@ export const DB_CLIENT_CONNECTION_STATE_VALUE_USED = "used" as const; /** * Deprecated, use `db.client.connection.pool.name` instead. - * + * * @example myDataSource - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.pool.name`. + * + * @deprecated Replaced by `db.client.connection.pool.name`. */ export const ATTR_DB_CLIENT_CONNECTIONS_POOL_NAME = 'db.client.connections.pool.name' as const; /** * Deprecated, use `db.client.connection.state` instead. - * + * * @example idle - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.state`. + * + * @deprecated Replaced by `db.client.connection.state`. */ export const ATTR_DB_CLIENT_CONNECTIONS_STATE = 'db.client.connections.state' as const; @@ -1510,42 +1643,42 @@ export const DB_CLIENT_CONNECTIONS_STATE_VALUE_USED = "used" as const; /** * The name of a collection (table, container) within the database. - * + * * @example public.users - * * @example customers - * - * @note It is RECOMMENDED to capture the value as provided by the application without attempting to do any case normalization. + * + * @note It is **RECOMMENDED** to capture the value as provided by the application without attempting to do any case normalization. * If the collection name is parsed from the query text, it **SHOULD** be the first collection name found in the query and it **SHOULD** match the value provided in the query text including any schema and database name prefix. - * For batch operations, if the individual operations are known to have the same collection name then that collection name **SHOULD** be used, otherwise `db.collection.name` **SHOULD** **NOT** be captured. - * + * For batch operations, if the individual operations are known to have the same collection name then that collection name **SHOULD** be used, otherwise `db.collection.name` **SHOULD NOT** be captured. + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COLLECTION_NAME = 'db.collection.name' as const; /** * Deprecated, use `server.address`, `server.port` attributes instead. - * + * * @example "Server=(localdb)\\v11.0;Integrated Security=true;" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * "Replaced by `server.address` and `server.port`." + * + * @deprecated Replaced by `server.address` and `server.port`. */ export const ATTR_DB_CONNECTION_STRING = 'db.connection_string' as const; /** * Unique Cosmos client instance id. - * + * * @example "3ba4827d-4422-483f-b59f-85b74211c11d" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_CLIENT_ID = 'db.cosmosdb.client_id' as const; /** * Cosmos client connection mode. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_CONNECTION_MODE = 'db.cosmosdb.connection_mode' as const; @@ -1562,364 +1695,370 @@ export const DB_COSMOSDB_CONNECTION_MODE_VALUE_GATEWAY = "gateway" as const; /** * Deprecated, use `db.collection.name` instead. - * + * * @example "mytable" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.collection.name`. + * + * @deprecated Replaced by `db.collection.name`. */ export const ATTR_DB_COSMOSDB_CONTAINER = 'db.cosmosdb.container' as const; /** - * CosmosDB Operation Type. - * + * Cosmos DB Operation Type. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_OPERATION_TYPE = 'db.cosmosdb.operation_type' as const; /** - * Enum value "Batch" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "batch" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_BATCH = "Batch" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_BATCH = "batch" as const; /** - * Enum value "Create" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "create" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_CREATE = "Create" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_CREATE = "create" as const; /** - * Enum value "Delete" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "delete" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_DELETE = "Delete" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_DELETE = "delete" as const; /** - * Enum value "Execute" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "execute" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_EXECUTE = "Execute" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_EXECUTE = "execute" as const; /** - * Enum value "ExecuteJavaScript" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "execute_javascript" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_EXECUTE_JAVASCRIPT = "ExecuteJavaScript" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_EXECUTE_JAVASCRIPT = "execute_javascript" as const; /** - * Enum value "Head" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "head" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_HEAD = "Head" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_HEAD = "head" as const; /** - * Enum value "HeadFeed" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "head_feed" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_HEAD_FEED = "HeadFeed" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_HEAD_FEED = "head_feed" as const; /** - * Enum value "Invalid" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "invalid" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_INVALID = "Invalid" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_INVALID = "invalid" as const; /** - * Enum value "Patch" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "patch" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_PATCH = "Patch" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_PATCH = "patch" as const; /** - * Enum value "Query" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "query" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_QUERY = "Query" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_QUERY = "query" as const; /** - * Enum value "QueryPlan" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "query_plan" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_QUERY_PLAN = "QueryPlan" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_QUERY_PLAN = "query_plan" as const; /** - * Enum value "Read" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "read" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_READ = "Read" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_READ = "read" as const; /** - * Enum value "ReadFeed" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "read_feed" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_READ_FEED = "ReadFeed" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_READ_FEED = "read_feed" as const; /** - * Enum value "Replace" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "replace" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_REPLACE = "Replace" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_REPLACE = "replace" as const; /** - * Enum value "Upsert" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. + * Enum value "upsert" for attribute {@link ATTR_DB_COSMOSDB_OPERATION_TYPE}. */ -export const DB_COSMOSDB_OPERATION_TYPE_VALUE_UPSERT = "Upsert" as const; +export const DB_COSMOSDB_OPERATION_TYPE_VALUE_UPSERT = "upsert" as const; /** * RU consumed for that operation - * + * * @example 46.18 - * * @example 1.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_REQUEST_CHARGE = 'db.cosmosdb.request_charge' as const; /** * Request payload size in bytes - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_REQUEST_CONTENT_LENGTH = 'db.cosmosdb.request_content_length' as const; /** - * Cosmos DB status code. - * + * Deprecated, use `db.response.status_code` instead. + * * @example 200 - * * @example 201 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + * + * @deprecated Replaced by `db.response.status_code`. */ export const ATTR_DB_COSMOSDB_STATUS_CODE = 'db.cosmosdb.status_code' as const; /** * Cosmos DB sub status code. - * + * * @example 1000 - * * @example 1002 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_COSMOSDB_SUB_STATUS_CODE = 'db.cosmosdb.sub_status_code' as const; /** * Deprecated, use `db.namespace` instead. - * + * * @example e9106fc68e3044f0b1475b04bf4ffd5f - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.namespace`. + * + * @deprecated Replaced by `db.namespace`. */ export const ATTR_DB_ELASTICSEARCH_CLUSTER_NAME = 'db.elasticsearch.cluster.name' as const; /** * Represents the human-readable identifier of the node/instance to which a request was routed. - * + * * @example instance-0000000001 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_ELASTICSEARCH_NODE_NAME = 'db.elasticsearch.node.name' as const; /** * A dynamic value in the url path. - * + * * @example db.elasticsearch.path_parts.index=test-index - * * @example db.elasticsearch.path_parts.doc_id=123 - * + * * @note Many Elasticsearch url paths allow dynamic values. These **SHOULD** be recorded in span attributes in the format `db.elasticsearch.path_parts.`, where `` is the url path part name. The implementation **SHOULD** reference the [elasticsearch schema](https://raw.githubusercontent.com/elastic/elasticsearch-specification/main/output/schema/schema.json) in order to map the path part values to their names. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_ELASTICSEARCH_PATH_PARTS = (key: string) => `db.elasticsearch.path_parts.${key}`; /** * Deprecated, no general replacement at this time. For Elasticsearch, use `db.elasticsearch.node.name` instead. - * + * * @example "mysql-e26b99z.example.com" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Deprecated, no general replacement at this time. For Elasticsearch, use `db.elasticsearch.node.name` instead. + * + * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use `db.elasticsearch.node.name` instead. */ export const ATTR_DB_INSTANCE_ID = 'db.instance.id' as const; /** * Removed, no replacement at this time. - * + * * @example org.postgresql.Driver - * * @example com.microsoft.sqlserver.jdbc.SQLServerDriver - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Removed as not used. + * + * @deprecated Removed as not used. */ export const ATTR_DB_JDBC_DRIVER_CLASSNAME = 'db.jdbc.driver_classname' as const; /** * Deprecated, use `db.collection.name` instead. - * + * * @example "mytable" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.collection.name`. + * + * @deprecated Replaced by `db.collection.name`. */ export const ATTR_DB_MONGODB_COLLECTION = 'db.mongodb.collection' as const; /** * Deprecated, SQL Server instance is now populated as a part of `db.namespace` attribute. - * + * * @example "MSSQLSERVER" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Deprecated, no replacement at this time. + * + * @deprecated Deprecated, no replacement at this time. */ export const ATTR_DB_MSSQL_INSTANCE_NAME = 'db.mssql.instance_name' as const; /** * Deprecated, use `db.namespace` instead. - * + * * @example customers - * * @example main - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.namespace`. + * + * @deprecated Replaced by `db.namespace`. */ export const ATTR_DB_NAME = 'db.name' as const; /** * The name of the database, fully qualified within the server address and port. - * + * * @example customers - * * @example test.users - * - * @note If a database system has multiple namespace components, they **SHOULD** be concatenated (potentially using database system specific conventions) from most general to most specific namespace component, and more specific namespaces **SHOULD** **NOT** be captured without the more general namespaces, to ensure that "startswith" queries for the more general namespaces will be valid. + * + * @note If a database system has multiple namespace components, they **SHOULD** be concatenated (potentially using database system specific conventions) from most general to most specific namespace component, and more specific namespaces **SHOULD NOT** be captured without the more general namespaces, to ensure that "startswith" queries for the more general namespaces will be valid. * Semantic conventions for individual database systems **SHOULD** document what `db.namespace` means in the context of that system. - * It is RECOMMENDED to capture the value as provided by the application without attempting to do any case normalization. - * + * It is **RECOMMENDED** to capture the value as provided by the application without attempting to do any case normalization. + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_NAMESPACE = 'db.namespace' as const; /** * Deprecated, use `db.operation.name` instead. - * + * * @example findAndModify - * * @example HMSET - * * @example SELECT - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.operation.name`. + * + * @deprecated Replaced by `db.operation.name`. */ export const ATTR_DB_OPERATION = 'db.operation' as const; /** - * The number of queries included in a [batch operation](/docs/database/database-spans.md#batch-operations). - * + * The number of queries included in a batch operation. + * * @example 2 - * * @example 3 - * * @example 4 - * + * * @note Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` **SHOULD** never be `1`. - * + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_OPERATION_BATCH_SIZE = 'db.operation.batch.size' as const; /** * The name of the operation or command being executed. - * + * * @example findAndModify - * * @example HMSET - * * @example SELECT - * - * @note It is RECOMMENDED to capture the value as provided by the application without attempting to do any case normalization. + * + * @note It is **RECOMMENDED** to capture the value as provided by the application without attempting to do any case normalization. * If the operation name is parsed from the query text, it **SHOULD** be the first operation name found in the query. * For batch operations, if the individual operations are known to have the same operation name then that operation name **SHOULD** be used prepended by `BATCH `, otherwise `db.operation.name` **SHOULD** be `BATCH` or some other database system specific term if more applicable. - * + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_OPERATION_NAME = 'db.operation.name' as const; /** * A query parameter used in `db.query.text`, with `` being the parameter name, and the attribute value being a string representation of the parameter value. - * + * * @example someval - * * @example 55 - * + * * @note Query parameters should only be captured when `db.query.text` is parameterized with placeholders. * If a parameter has no name and instead is referenced only by index, then `` **SHOULD** be the 0-based index. - * + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_QUERY_PARAMETER = (key: string) => `db.query.parameter.${key}`; /** * The database query being executed. - * + * * @example SELECT * FROM wuser_table where username = ? - * * @example SET mykey "WuValue" - * + * * @note For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext). * For batch operations, if the individual operations are known to have the same query text then that query text **SHOULD** be used, otherwise all of the individual query texts **SHOULD** be concatenated with separator `; ` or some other database system specific separator if more applicable. * Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk. - * + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_QUERY_TEXT = 'db.query.text' as const; /** * Deprecated, use `db.namespace` instead. - * + * * @example 0 - * * @example 1 - * * @example 15 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.namespace`. + * + * @deprecated Replaced by `db.namespace`. */ export const ATTR_DB_REDIS_DATABASE_INDEX = 'db.redis.database_index' as const; +/** + * Database response status code. + * + * @example 102 + * @example ORA-17002 + * @example 08P01 + * @example 404 + * + * @note The status code returned by the database. Usually it represents an error code, but may also represent partial success, warning, or differentiate between various types of successful outcomes. + * Semantic conventions for individual database systems **SHOULD** document what `db.response.status_code` means in the context of that system. + * This attribute has stability level RELEASE CANDIDATE. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_DB_RESPONSE_STATUS_CODE = 'db.response.status_code' as const; + /** * Deprecated, use `db.collection.name` instead. - * + * * @example "mytable" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.collection.name`. + * + * @deprecated Replaced by `db.collection.name`. */ export const ATTR_DB_SQL_TABLE = 'db.sql.table' as const; /** * The database statement being executed. - * + * * @example SELECT * FROM wuser_table - * * @example SET mykey "WuValue" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.query.text`. + * + * @deprecated Replaced by `db.query.text`. */ export const ATTR_DB_STATEMENT = 'db.statement' as const; /** * The database management system (DBMS) product as identified by the client instrumentation. - * + * * @note The actual DBMS may differ from the one identified by the client. For example, when using PostgreSQL client libraries to connect to a CockroachDB, the `db.system` is set to `postgresql` based on the instrumentation's best knowledge. - * + * This attribute has stability level RELEASE CANDIDATE. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DB_SYSTEM = 'db.system' as const; @@ -2196,72 +2335,68 @@ export const DB_SYSTEM_VALUE_VERTICA = "vertica" as const; /** * Deprecated, no replacement at this time. - * + * * @example readonly_user - * * @example reporting_user - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * No replacement at this time. + * + * @deprecated No replacement at this time. */ export const ATTR_DB_USER = 'db.user' as const; /** * 'Deprecated, use `deployment.environment.name` instead.' - * + * * @example staging - * * @example production - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Deprecated, use `deployment.environment.name` instead. + * + * @deprecated Deprecated, use `deployment.environment.name` instead. */ export const ATTR_DEPLOYMENT_ENVIRONMENT = 'deployment.environment' as const; /** * Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier). - * + * * @example staging - * * @example production - * + * * @note `deployment.environment.name` does not affect the uniqueness constraints defined through * the `service.namespace`, `service.name` and `service.instance.id` resource attributes. * This implies that resources carrying the following attribute combinations **MUST** be * considered to be identifying the same service: * - * * `service.name=frontend`, `deployment.environment.name=production` - * * `service.name=frontend`, `deployment.environment.name=staging`. - * + * - `service.name=frontend`, `deployment.environment.name=production` + * - `service.name=frontend`, `deployment.environment.name=staging`. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEPLOYMENT_ENVIRONMENT_NAME = 'deployment.environment.name' as const; /** * The id of the deployment. - * + * * @example 1208 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEPLOYMENT_ID = 'deployment.id' as const; /** * The name of the deployment. - * + * * @example deploy my app - * * @example deploy-frontend - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEPLOYMENT_NAME = 'deployment.name' as const; /** * The status of the deployment. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEPLOYMENT_STATUS = 'deployment.status' as const; @@ -2278,85 +2413,79 @@ export const DEPLOYMENT_STATUS_VALUE_SUCCEEDED = "succeeded" as const; /** * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name. - * + * * @example destination.example.com - * * @example 10.1.2.80 - * * @example /tmp/my.sock - * + * * @note When observed from the source side, and when communicating through an intermediary, `destination.address` **SHOULD** represent the destination address behind any intermediaries, for example proxies, if it's available. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DESTINATION_ADDRESS = 'destination.address' as const; /** * Destination port number - * + * * @example 3389 - * * @example 2888 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DESTINATION_PORT = 'destination.port' as const; /** * A unique identifier representing the device - * + * * @example 2ab2916d-a51f-4ac8-80ee-45ac31a28092 - * - * @note The device identifier **MUST** only be defined using the values outlined below. This value is not an advertising identifier and **MUST** **NOT** be used as such. On iOS (Swift or Objective-C), this value **MUST** be equal to the [vendor identifier](https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor). On Android (Java or Kotlin), this value **MUST** be equal to the Firebase Installation ID or a globally unique UUID which is persisted across sessions in your application. More information can be found [here](https://developer.android.com/training/articles/user-data-ids) on best practices and exact implementation details. Caution should be taken when storing personal data or anything which can identify a user. GDPR and data protection laws may apply, ensure you do your own due diligence. - * + * + * @note The device identifier **MUST** only be defined using the values outlined below. This value is not an advertising identifier and **MUST NOT** be used as such. On iOS (Swift or Objective-C), this value **MUST** be equal to the [vendor identifier](https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor). On Android (Java or Kotlin), this value **MUST** be equal to the Firebase Installation ID or a globally unique UUID which is persisted across sessions in your application. More information can be found [here](https://developer.android.com/training/articles/user-data-ids) on best practices and exact implementation details. Caution should be taken when storing personal data or anything which can identify a user. GDPR and data protection laws may apply, ensure you do your own due diligence. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEVICE_ID = 'device.id' as const; /** * The name of the device manufacturer - * + * * @example Apple - * * @example Samsung - * + * * @note The Android OS provides this field via [Build](https://developer.android.com/reference/android/os/Build#MANUFACTURER). iOS apps **SHOULD** hardcode the value `Apple`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEVICE_MANUFACTURER = 'device.manufacturer' as const; /** * The model identifier for the device - * + * * @example iPhone3,4 - * * @example SM-G920F - * + * * @note It's recommended this value represents a machine-readable version of the model identifier rather than the market or consumer-friendly name of the device. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEVICE_MODEL_IDENTIFIER = 'device.model.identifier' as const; /** * The marketing name for the device model - * + * * @example iPhone 6s Plus - * * @example Samsung Galaxy S6 - * + * * @note It's recommended this value represents a human-readable version of the device model rather than a machine-readable alternative. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DEVICE_MODEL_NAME = 'device.model.name' as const; /** * The disk IO operation direction. - * + * * @example read - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DISK_IO_DIRECTION = 'disk.io.direction' as const; @@ -2373,104 +2502,136 @@ export const DISK_IO_DIRECTION_VALUE_WRITE = "write" as const; /** * The name being queried. - * + * * @example www.example.com - * * @example opentelemetry.io - * - * @note If the name field contains non-printable characters (below 32 or above 126), those characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n respectively. - * + * + * @note If the name field contains non-printable characters (below 32 or above 126), those characters should be represented as escaped base 10 integers (\\DDD). Back slashes and quotes should be escaped. Tabs, carriage returns, and line feeds should be converted to \\t, \\r, and \\n respectively. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_DNS_QUESTION_NAME = 'dns.question.name' as const; +/** + * Name of the garbage collector managed heap generation. + * + * @example gen0 + * @example gen1 + * @example gen2 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_DOTNET_GC_HEAP_GENERATION = 'dotnet.gc.heap.generation' as const; + +/** + * Enum value "gen0" for attribute {@link ATTR_DOTNET_GC_HEAP_GENERATION}. + */ +export const DOTNET_GC_HEAP_GENERATION_VALUE_GEN0 = "gen0" as const; + +/** + * Enum value "gen1" for attribute {@link ATTR_DOTNET_GC_HEAP_GENERATION}. + */ +export const DOTNET_GC_HEAP_GENERATION_VALUE_GEN1 = "gen1" as const; + +/** + * Enum value "gen2" for attribute {@link ATTR_DOTNET_GC_HEAP_GENERATION}. + */ +export const DOTNET_GC_HEAP_GENERATION_VALUE_GEN2 = "gen2" as const; + +/** + * Enum value "loh" for attribute {@link ATTR_DOTNET_GC_HEAP_GENERATION}. + */ +export const DOTNET_GC_HEAP_GENERATION_VALUE_LOH = "loh" as const; + +/** + * Enum value "poh" for attribute {@link ATTR_DOTNET_GC_HEAP_GENERATION}. + */ +export const DOTNET_GC_HEAP_GENERATION_VALUE_POH = "poh" as const; + /** * Deprecated, use `user.id` instead. - * + * * @example "username" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `user.id` attribute. + * + * @deprecated Replaced by `user.id` attribute. */ export const ATTR_ENDUSER_ID = 'enduser.id' as const; /** * Deprecated, use `user.roles` instead. - * + * * @example "admin" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `user.roles` attribute. + * + * @deprecated Replaced by `user.roles` attribute. */ export const ATTR_ENDUSER_ROLE = 'enduser.role' as const; /** * Deprecated, no replacement at this time. - * + * * @example "read:message, write:files" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Removed. + * + * @deprecated Removed. */ export const ATTR_ENDUSER_SCOPE = 'enduser.scope' as const; /** * Identifies the class / type of event. - * + * * @example browser.mouse.click - * * @example device.app.lifecycle - * + * * @note Event names are subject to the same rules as [attribute names](/docs/general/attribute-naming.md). Notably, event names are namespaced to avoid collisions and provide a clean separation of semantics for events in separate domains like browser, mobile, and kubernetes. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_EVENT_NAME = 'event.name' as const; /** * A boolean that is true if the serverless function is executed for the first time (aka cold-start). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_COLDSTART = 'faas.coldstart' as const; /** * A string containing the schedule period as [Cron Expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm). - * + * * @example "0/5 * * * ? *" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_CRON = 'faas.cron' as const; /** * The name of the source on which the triggering operation was performed. For example, in Cloud Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name. - * + * * @example myBucketName - * * @example myDbName - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_DOCUMENT_COLLECTION = 'faas.document.collection' as const; /** * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the name of the file, and in Cosmos DB the table name. - * + * * @example myFile.txt - * * @example myTableName - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_DOCUMENT_NAME = 'faas.document.name' as const; /** * Describes the type of the operation that was performed on the data. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_DOCUMENT_OPERATION = 'faas.document.operation' as const; @@ -2492,49 +2653,49 @@ export const FAAS_DOCUMENT_OPERATION_VALUE_INSERT = "insert" as const; /** * A string containing the time when the data was accessed in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). - * + * * @example "2020-01-23T13:47:06Z" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_DOCUMENT_TIME = 'faas.document.time' as const; /** * The execution environment ID as a string, that will be potentially reused for other invocations to the same function/function version. - * + * * @example 2021/06/28/[$LATEST]2f399eb14537447da05ab2a2e39309de - * + * * @note * **AWS Lambda:** Use the (full) log stream name. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_INSTANCE = 'faas.instance' as const; /** * The invocation ID of the current function invocation. - * + * * @example "af9d5aa4-a685-4c5f-a22b-444f80b3cc28" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_INVOCATION_ID = 'faas.invocation_id' as const; /** * The name of the invoked function. - * + * * @example "my-function" - * - * @note SHOULD be equal to the `faas.name` resource attribute of the invoked function. - * + * + * @note **SHOULD** be equal to the `faas.name` resource attribute of the invoked function. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_INVOKED_NAME = 'faas.invoked_name' as const; /** * The cloud provider of the invoked function. - * - * @note SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. - * + * + * @note **SHOULD** be equal to the `cloud.provider` resource attribute of the invoked function. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_INVOKED_PROVIDER = 'faas.invoked_provider' as const; @@ -2566,33 +2727,32 @@ export const FAAS_INVOKED_PROVIDER_VALUE_TENCENT_CLOUD = "tencent_cloud" as cons /** * The cloud region of the invoked function. - * + * * @example "eu-central-1" - * - * @note SHOULD be equal to the `cloud.region` resource attribute of the invoked function. - * + * + * @note **SHOULD** be equal to the `cloud.region` resource attribute of the invoked function. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_INVOKED_REGION = 'faas.invoked_region' as const; /** * The amount of memory available to the serverless function converted to Bytes. - * + * * @example 134217728 - * + * * @note It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable `AWS_LAMBDA_FUNCTION_MEMORY_SIZE` provides this information (which must be multiplied by 1,048,576). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_MAX_MEMORY = 'faas.max_memory' as const; /** * The name of the single function that this runtime instance executes. - * + * * @example my-function - * * @example myazurefunctionapp/some-function-name - * + * * @note This is the name of the function as configured/deployed on the FaaS * platform and is usually different from the name of the callback * function (which may be stored in the @@ -2603,29 +2763,29 @@ export const ATTR_FAAS_MAX_MEMORY = 'faas.max_memory' as const; * definition of function name **MUST** be used for this attribute * (and consequently the span name) for the listed cloud providers/products: * - * * **Azure:** The full name `/`, i.e., function app name - * followed by a forward slash followed by the function name (this form - * can also be seen in the resource JSON for the function). - * This means that a span attribute **MUST** be used, as an Azure function - * app can host multiple functions that would usually share - * a TracerProvider (see also the `cloud.resource_id` attribute). - * + * - **Azure:** The full name `/`, i.e., function app name + * followed by a forward slash followed by the function name (this form + * can also be seen in the resource JSON for the function). + * This means that a span attribute **MUST** be used, as an Azure function + * app can host multiple functions that would usually share + * a TracerProvider (see also the `cloud.resource_id` attribute). + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_NAME = 'faas.name' as const; /** * A string containing the function invocation time in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). - * + * * @example "2020-01-23T13:47:06Z" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_TIME = 'faas.time' as const; /** * Type of the trigger which caused this function invocation. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_TRIGGER = 'faas.trigger' as const; @@ -2657,52 +2817,49 @@ export const FAAS_TRIGGER_VALUE_TIMER = "timer" as const; /** * The immutable version of the function being executed. - * + * * @example 26 - * * @example pinkfroid-00002 - * + * * @note Depending on the cloud provider and platform, use: * - * * **AWS Lambda:** The [function version](https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html) - * (an integer represented as a decimal string). - * * **Google Cloud Run (Services):** The [revision](https://cloud.google.com/run/docs/managing/revisions) - * (i.e., the function name plus the revision suffix). - * * **Google Cloud Functions:** The value of the - * [`K_REVISION` environment variable](https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically). - * * **Azure Functions:** Not applicable. Do not set this attribute. - * + * - **AWS Lambda:** The [function version](https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html) + * (an integer represented as a decimal string). + * - **Google Cloud Run (Services):** The [revision](https://cloud.google.com/run/docs/managing/revisions) + * (i.e., the function name plus the revision suffix). + * - **Google Cloud Functions:** The value of the + * [`K_REVISION` environment variable](https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically). + * - **Azure Functions:** Not applicable. Do not set this attribute. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FAAS_VERSION = 'faas.version' as const; /** * The unique identifier of the feature flag. - * + * * @example logo-color - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FEATURE_FLAG_KEY = 'feature_flag.key' as const; /** * The name of the service provider that performs the flag evaluation. - * + * * @example Flag Manager - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FEATURE_FLAG_PROVIDER_NAME = 'feature_flag.provider_name' as const; /** * **SHOULD** be a semantic identifier for a value. If one is unavailable, a stringified version of the value can be used. - * + * * @example red - * * @example true - * * @example on - * + * * @note A semantic identifier, commonly referred to as a variant, provides a means * for referring to a value without including the value itself. This can * provide additional context for understanding the meaning behind a value. @@ -2711,141 +2868,322 @@ export const ATTR_FEATURE_FLAG_PROVIDER_NAME = 'feature_flag.provider_name' as c * A stringified version of the value can be used in situations where a * semantic identifier is unavailable. String representation of the value * should be determined by the implementer. - * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FEATURE_FLAG_VARIANT = 'feature_flag.variant' as const; /** - * Directory where the file is located. It should include the drive letter, when appropriate. - * - * @example /home/user - * - * @example C:\Program Files\MyApp - * + * Time when the file was last accessed, in ISO 8601 format. + * + * @example 2021-01-01T12:00:00Z + * + * @note This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ -export const ATTR_FILE_DIRECTORY = 'file.directory' as const; +export const ATTR_FILE_ACCESSED = 'file.accessed' as const; /** - * File extension, excluding the leading dot. - * - * @example png - * - * @example gz - * + * Array of file attributes. + * + * @example ["readonly", "hidden"] + * + * @note Attributes names depend on the OS or file system. Here’s a non-exhaustive list of values expected for this attribute: `archive`, `compressed`, `directory`, `encrypted`, `execute`, `hidden`, `immutable`, `journaled`, `read`, `readonly`, `symbolic link`, `system`, `temporary`, `write`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_ATTRIBUTES = 'file.attributes' as const; + +/** + * Time when the file attributes or metadata was last changed, in ISO 8601 format. + * + * @example 2021-01-01T12:00:00Z + * + * @note `file.changed` captures the time when any of the file's properties or attributes (including the content) are changed, while `file.modified` captures the timestamp when the file content is modified. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_CHANGED = 'file.changed' as const; + +/** + * Time when the file was created, in ISO 8601 format. + * + * @example 2021-01-01T12:00:00Z + * + * @note This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_CREATED = 'file.created' as const; + +/** + * Directory where the file is located. It should include the drive letter, when appropriate. + * + * @example /home/user + * @example C:\\Program Files\\MyApp + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_DIRECTORY = 'file.directory' as const; + +/** + * File extension, excluding the leading dot. + * + * @example png + * @example gz + * * @note When the file name has multiple extensions (example.tar.gz), only the last one should be captured ("gz", not "tar.gz"). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FILE_EXTENSION = 'file.extension' as const; +/** + * Name of the fork. A fork is additional data associated with a filesystem object. + * + * @example Zone.Identifer + * + * @note On Linux, a resource fork is used to store additional data with a filesystem object. A file always has at least one fork for the data portion, and additional forks may exist. + * On NTFS, this is analogous to an Alternate Data Stream (ADS), and the default data stream for a file is just called $DATA. Zone.Identifier is commonly used by Windows to track contents downloaded from the Internet. An ADS is typically of the form: C:\\path\\to\\filename.extension:some_fork_name, and some_fork_name is the value that should populate `fork_name`. `filename.extension` should populate `file.name`, and `extension` should populate `file.extension`. The full path, `file.path`, will include the fork name. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_FORK_NAME = 'file.fork_name' as const; + +/** + * Primary Group ID (GID) of the file. + * + * @example 1000 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_GROUP_ID = 'file.group.id' as const; + +/** + * Primary group name of the file. + * + * @example users + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_GROUP_NAME = 'file.group.name' as const; + +/** + * Inode representing the file in the filesystem. + * + * @example 256383 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_INODE = 'file.inode' as const; + +/** + * Mode of the file in octal representation. + * + * @example 0640 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_MODE = 'file.mode' as const; + +/** + * Time when the file content was last modified, in ISO 8601 format. + * + * @example 2021-01-01T12:00:00Z + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_MODIFIED = 'file.modified' as const; + /** * Name of the file including the extension, without the directory. - * + * * @example example.png - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FILE_NAME = 'file.name' as const; +/** + * The user ID (UID) or security identifier (SID) of the file owner. + * + * @example 1000 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_OWNER_ID = 'file.owner.id' as const; + +/** + * Username of the file owner. + * + * @example root + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_OWNER_NAME = 'file.owner.name' as const; + /** * Full path to the file, including the file name. It should include the drive letter, when appropriate. - * + * * @example /home/alice/example.png - * - * @example C:\Program Files\MyApp\myapp.exe - * + * @example C:\\Program Files\\MyApp\\myapp.exe + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FILE_PATH = 'file.path' as const; /** * File size in bytes. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_FILE_SIZE = 'file.size' as const; +/** + * Path to the target of a symbolic link. + * + * @example /usr/bin/python3 + * + * @note This attribute is only applicable to symbolic links. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_FILE_SYMBOLIC_LINK_TARGET_PATH = 'file.symbolic_link.target_path' as const; + /** * Identifies the Google Cloud service for which the official client library is intended. - * + * * @example appengine - * * @example run - * * @example firestore - * * @example alloydb - * * @example spanner - * + * * @note Intended to be a stable identifier for Google Cloud client libraries that is uniform across implementation languages. The value should be derived from the canonical service domain for the service; for example, 'foo.googleapis.com' should result in a value of 'foo'. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GCP_CLIENT_SERVICE = 'gcp.client.service' as const; /** * The name of the Cloud Run [execution](https://cloud.google.com/run/docs/managing/job-executions) being run for the Job, as set by the [`CLOUD_RUN_EXECUTION`](https://cloud.google.com/run/docs/container-contract#jobs-env-vars) environment variable. - * + * * @example job-name-xxxx - * * @example sample-job-mdw84 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GCP_CLOUD_RUN_JOB_EXECUTION = 'gcp.cloud_run.job.execution' as const; /** * The index for a task within an execution as provided by the [`CLOUD_RUN_TASK_INDEX`](https://cloud.google.com/run/docs/container-contract#jobs-env-vars) environment variable. - * + * * @example 0 - * * @example 1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GCP_CLOUD_RUN_JOB_TASK_INDEX = 'gcp.cloud_run.job.task_index' as const; /** * The hostname of a GCE instance. This is the full value of the default or [custom hostname](https://cloud.google.com/compute/docs/instances/custom-hostname-vm). - * + * * @example my-host1234.example.com - * * @example sample-vm.us-west1-b.c.my-project.internal - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GCP_GCE_INSTANCE_HOSTNAME = 'gcp.gce.instance.hostname' as const; /** * The instance name of a GCE instance. This is the value provided by `host.name`, the visible name of the instance in the Cloud Console UI, and the prefix for the default hostname of the instance as defined by the [default internal DNS name](https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names). - * + * * @example instance-1 - * * @example my-vm-name - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GCP_GCE_INSTANCE_NAME = 'gcp.gce.instance.name' as const; /** - * The full response received from the GenAI model. - * + * Deprecated, use Event API to report completions contents. + * * @example [{'role': 'assistant', 'content': 'The capital of France is Paris.'}] - * - * @note It's RECOMMENDED to format completions as JSON string matching [OpenAI messages format](https://platform.openai.com/docs/guides/text-generation) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + * + * @deprecated Removed, no replacement at this time. */ export const ATTR_GEN_AI_COMPLETION = 'gen_ai.completion' as const; +/** + * The response format that is requested. + * + * @example json + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT = 'gen_ai.openai.request.response_format' as const; + +/** + * Enum value "json_object" for attribute {@link ATTR_GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT}. + */ +export const GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT_VALUE_JSON_OBJECT = "json_object" as const; + +/** + * Enum value "json_schema" for attribute {@link ATTR_GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT}. + */ +export const GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT_VALUE_JSON_SCHEMA = "json_schema" as const; + +/** + * Enum value "text" for attribute {@link ATTR_GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT}. + */ +export const GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT_VALUE_TEXT = "text" as const; + +/** + * Requests with same seed value more likely to return same result. + * + * @example 100 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_GEN_AI_OPENAI_REQUEST_SEED = 'gen_ai.openai.request.seed' as const; + +/** + * The service tier requested. May be a specific tier, detault, or auto. + * + * @example auto + * @example default + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_GEN_AI_OPENAI_REQUEST_SERVICE_TIER = 'gen_ai.openai.request.service_tier' as const; + +/** + * Enum value "auto" for attribute {@link ATTR_GEN_AI_OPENAI_REQUEST_SERVICE_TIER}. + */ +export const GEN_AI_OPENAI_REQUEST_SERVICE_TIER_VALUE_AUTO = "auto" as const; + +/** + * Enum value "default" for attribute {@link ATTR_GEN_AI_OPENAI_REQUEST_SERVICE_TIER}. + */ +export const GEN_AI_OPENAI_REQUEST_SERVICE_TIER_VALUE_DEFAULT = "default" as const; + +/** + * The service tier used for the response. + * + * @example scale + * @example detault + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_GEN_AI_OPENAI_RESPONSE_SERVICE_TIER = 'gen_ai.openai.response.service_tier' as const; + /** * The name of the operation being performed. - * - * @note If one of the predefined values applies, but specific system uses a different name it's RECOMMENDED to document it in the semantic conventions for specific GenAI system and use system-specific name in the instrumentation. If a different name is not documented, instrumentation libraries **SHOULD** use applicable predefined value. - * + * + * @note If one of the predefined values applies, but specific system uses a different name it's **RECOMMENDED** to document it in the semantic conventions for specific GenAI system and use system-specific name in the instrumentation. If a different name is not documented, instrumentation libraries **SHOULD** use applicable predefined value. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_OPERATION_NAME = 'gen_ai.operation.name' as const; @@ -2861,122 +3199,121 @@ export const GEN_AI_OPERATION_NAME_VALUE_CHAT = "chat" as const; export const GEN_AI_OPERATION_NAME_VALUE_TEXT_COMPLETION = "text_completion" as const; /** - * The full prompt sent to the GenAI model. - * + * Deprecated, use Event API to report prompt contents. + * * @example [{'role': 'user', 'content': 'What is the capital of France?'}] - * - * @note It's RECOMMENDED to format prompts as JSON string matching [OpenAI messages format](https://platform.openai.com/docs/guides/text-generation) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + * + * @deprecated Removed, no replacement at this time. */ export const ATTR_GEN_AI_PROMPT = 'gen_ai.prompt' as const; /** * The frequency penalty setting for the GenAI request. - * + * * @example 0.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_FREQUENCY_PENALTY = 'gen_ai.request.frequency_penalty' as const; /** * The maximum number of tokens the model generates for a request. - * + * * @example 100 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_MAX_TOKENS = 'gen_ai.request.max_tokens' as const; /** * The name of the GenAI model a request is being made to. - * + * * @example "gpt-4" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_MODEL = 'gen_ai.request.model' as const; /** * The presence penalty setting for the GenAI request. - * + * * @example 0.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_PRESENCE_PENALTY = 'gen_ai.request.presence_penalty' as const; /** * List of sequences that the model will use to stop generating further tokens. - * - * @example forest - * - * @example lived - * + * + * @example ["forest", "lived"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_STOP_SEQUENCES = 'gen_ai.request.stop_sequences' as const; /** * The temperature setting for the GenAI request. - * + * * @example 0.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_TEMPERATURE = 'gen_ai.request.temperature' as const; /** * The top_k sampling setting for the GenAI request. - * + * * @example 1.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_TOP_K = 'gen_ai.request.top_k' as const; /** * The top_p sampling setting for the GenAI request. - * + * * @example 1.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_REQUEST_TOP_P = 'gen_ai.request.top_p' as const; /** * Array of reasons the model stopped generating tokens, corresponding to each generation received. - * - * @example stop - * + * + * @example ["stop"] + * @example ["stop", "length"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_RESPONSE_FINISH_REASONS = 'gen_ai.response.finish_reasons' as const; /** * The unique identifier for the completion. - * + * * @example chatcmpl-123 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_RESPONSE_ID = 'gen_ai.response.id' as const; /** * The name of the model that generated the response. - * + * * @example gpt-4-0613 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_RESPONSE_MODEL = 'gen_ai.response.model' as const; /** * The Generative AI product as identified by the client or server instrumentation. - * + * * @example "openai" - * + * * @note The `gen_ai.system` describes a family of GenAI models with specific model identified * by `gen_ai.request.model` and `gen_ai.response.model` attributes. * @@ -2986,7 +3323,7 @@ export const ATTR_GEN_AI_RESPONSE_MODEL = 'gen_ai.response.model' as const; * * For custom model, a custom friendly name **SHOULD** be used. * If none of these options apply, the `gen_ai.system` **SHOULD** be set to `_OTHER`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_SYSTEM = 'gen_ai.system' as const; @@ -3013,11 +3350,10 @@ export const GEN_AI_SYSTEM_VALUE_VERTEX_AI = "vertex_ai" as const; /** * The type of token being counted. - * + * * @example input - * * @example output - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_TOKEN_TYPE = 'gen_ai.token.type' as const; @@ -3034,51 +3370,50 @@ export const GEN_AI_TOKEN_TYPE_VALUE_COMPLETION = "output" as const; /** * Deprecated, use `gen_ai.usage.output_tokens` instead. - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `gen_ai.usage.output_tokens` attribute. + * + * @deprecated Replaced by `gen_ai.usage.output_tokens` attribute. */ export const ATTR_GEN_AI_USAGE_COMPLETION_TOKENS = 'gen_ai.usage.completion_tokens' as const; /** * The number of tokens used in the GenAI input (prompt). - * + * * @example 100 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_USAGE_INPUT_TOKENS = 'gen_ai.usage.input_tokens' as const; /** * The number of tokens used in the GenAI response (completion). - * + * * @example 180 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GEN_AI_USAGE_OUTPUT_TOKENS = 'gen_ai.usage.output_tokens' as const; /** * Deprecated, use `gen_ai.usage.input_tokens` instead. - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `gen_ai.usage.input_tokens` attribute. + * + * @deprecated Replaced by `gen_ai.usage.input_tokens` attribute. */ export const ATTR_GEN_AI_USAGE_PROMPT_TOKENS = 'gen_ai.usage.prompt_tokens' as const; /** * The type of memory. - * + * * @example other - * * @example stack - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GO_MEMORY_TYPE = 'go.memory.type' as const; @@ -3095,33 +3430,30 @@ export const GO_MEMORY_TYPE_VALUE_STACK = "stack" as const; /** * The GraphQL document being executed. - * + * * @example "query findBookById { bookById(id: ?) { name } }" - * + * * @note The value may be sanitized to exclude sensitive information. - * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GRAPHQL_DOCUMENT = 'graphql.document' as const; /** * The name of the operation being executed. - * + * * @example "findBookById" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GRAPHQL_OPERATION_NAME = 'graphql.operation.name' as const; /** * The type of the operation being executed. - * + * * @example query - * * @example mutation - * * @example subscription - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_GRAPHQL_OPERATION_TYPE = 'graphql.operation.type' as const; @@ -3143,34 +3475,34 @@ export const GRAPHQL_OPERATION_TYPE_VALUE_SUBSCRIPTION = "subscription" as const /** * Unique identifier for the application - * + * * @example 2daa2797-e42b-4624-9322-ec3f968df4da - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HEROKU_APP_ID = 'heroku.app.id' as const; /** * Commit hash for the current release - * + * * @example e6134959463efd8966b20e75b913cafe3f5ec - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HEROKU_RELEASE_COMMIT = 'heroku.release.commit' as const; /** * Time and date the release was created - * + * * @example 2022-10-23T18:00:42Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HEROKU_RELEASE_CREATION_TIMESTAMP = 'heroku.release.creation_timestamp' as const; /** * The CPU architecture the host system is running on. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_ARCH = 'host.arch' as const; @@ -3217,166 +3549,157 @@ export const HOST_ARCH_VALUE_X86 = "x86" as const; /** * The amount of level 2 memory cache available to the processor (in Bytes). - * + * * @example 12288000 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_CACHE_L2_SIZE = 'host.cpu.cache.l2.size' as const; /** * Family or generation of the CPU. - * + * * @example 6 - * * @example PA-RISC 1.1e - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_FAMILY = 'host.cpu.family' as const; /** * Model identifier. It provides more granular information about the CPU, distinguishing it from other CPUs within the same family. - * + * * @example 6 - * * @example 9000/778/B180L - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_MODEL_ID = 'host.cpu.model.id' as const; /** * Model designation of the processor. - * + * * @example 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_MODEL_NAME = 'host.cpu.model.name' as const; /** * Stepping or core revisions. - * + * * @example 1 - * * @example r1p1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_STEPPING = 'host.cpu.stepping' as const; /** * Processor manufacturer identifier. A maximum 12-character string. - * + * * @example GenuineIntel - * + * * @note [CPUID](https://wiki.osdev.org/CPUID) command returns the vendor ID string in EBX, EDX and ECX registers. Writing these to memory in this order results in a 12-character string. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_CPU_VENDOR_ID = 'host.cpu.vendor.id' as const; /** * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For non-containerized systems, this should be the `machine-id`. See the table below for the sources to use to determine the `machine-id` based on operating system. - * + * * @example fdbf79e8af94cb7f9e8df36789187052 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_ID = 'host.id' as const; /** * VM image ID or host OS image ID. For Cloud, this value is from the provider. - * + * * @example ami-07b06b442921831e5 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_IMAGE_ID = 'host.image.id' as const; /** * Name of the VM image or OS install the host was instantiated from. - * + * * @example infra-ami-eks-worker-node-7d4ec78312 - * * @example CentOS-8-x86_64-1905 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_IMAGE_NAME = 'host.image.name' as const; /** * The version string of the VM image or host OS as defined in [Version Attributes](/docs/resource/README.md#version-attributes). - * + * * @example 0.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_IMAGE_VERSION = 'host.image.version' as const; /** * Available IP addresses of the host, excluding loopback interfaces. - * - * @example 192.168.1.140 - * - * @example fe80::abc2:4a28:737a:609e - * + * + * @example ["192.168.1.140", "fe80::abc2:4a28:737a:609e"] + * * @note IPv4 Addresses **MUST** be specified in dotted-quad notation. IPv6 addresses **MUST** be specified in the [RFC 5952](https://www.rfc-editor.org/rfc/rfc5952.html) format. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_IP = 'host.ip' as const; /** * Available MAC addresses of the host, excluding loopback interfaces. - * - * @example AC-DE-48-23-45-67 - * - * @example AC-DE-48-23-45-67-01-9F - * + * + * @example ["AC-DE-48-23-45-67", "AC-DE-48-23-45-67-01-9F"] + * * @note MAC Addresses **MUST** be represented in [IEEE RA hexadecimal form](https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf): as hyphen-separated octets in uppercase hexadecimal form from most to least significant. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_MAC = 'host.mac' as const; /** * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully qualified hostname, or another name specified by the user. - * + * * @example opentelemetry-test - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_NAME = 'host.name' as const; /** * Type of host. For Cloud, this must be the machine type. - * + * * @example n1-standard-1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HOST_TYPE = 'host.type' as const; /** * Deprecated, use `client.address` instead. - * + * * @example "83.164.160.102" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `client.address`. + * + * @deprecated Replaced by `client.address`. */ export const ATTR_HTTP_CLIENT_IP = 'http.client_ip' as const; /** * State of the HTTP connection in the HTTP connection pool. - * + * * @example active - * * @example idle - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HTTP_CONNECTION_STATE = 'http.connection.state' as const; @@ -3393,10 +3716,10 @@ export const HTTP_CONNECTION_STATE_VALUE_IDLE = "idle" as const; /** * Deprecated, use `network.protocol.name` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.protocol.name`. + * + * @deprecated Replaced by `network.protocol.name`. */ export const ATTR_HTTP_FLAVOR = 'http.flavor' as const; @@ -3432,188 +3755,312 @@ export const HTTP_FLAVOR_VALUE_SPDY = "SPDY" as const; /** * Deprecated, use one of `server.address`, `client.address` or `http.request.header.host` instead, depending on the usage. - * + * * @example www.example.org - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by one of `server.address`, `client.address` or `http.request.header.host`, depending on the usage. + * + * @deprecated Replaced by one of `server.address`, `client.address` or `http.request.header.host`, depending on the usage. */ export const ATTR_HTTP_HOST = 'http.host' as const; /** * Deprecated, use `http.request.method` instead. - * + * * @example GET - * * @example POST - * * @example HEAD - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `http.request.method`. + * + * @deprecated Replaced by `http.request.method`. */ export const ATTR_HTTP_METHOD = 'http.method' as const; /** * The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @example 3495 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HTTP_REQUEST_BODY_SIZE = 'http.request.body.size' as const; /** * The total size of the request in bytes. This should be the total number of bytes sent over the wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request body if any. - * + * * @example 1437 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HTTP_REQUEST_SIZE = 'http.request.size' as const; /** - * Deprecated, use `http.request.header.content-length` instead. - * + * Deprecated, use `http.request.header.` instead. + * * @example 3495 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `http.request.header.content-length`. + * + * @deprecated Replaced by `http.request.header.`. */ export const ATTR_HTTP_REQUEST_CONTENT_LENGTH = 'http.request_content_length' as const; /** * Deprecated, use `http.request.body.size` instead. - * + * * @example 5493 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `http.request.body.size`. + * + * @deprecated Replaced by `http.request.body.size`. */ export const ATTR_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED = 'http.request_content_length_uncompressed' as const; /** * The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @example 3495 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HTTP_RESPONSE_BODY_SIZE = 'http.response.body.size' as const; /** * The total size of the response in bytes. This should be the total number of bytes sent over the wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response body and trailers if any. - * + * * @example 1437 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_HTTP_RESPONSE_SIZE = 'http.response.size' as const; /** - * Deprecated, use `http.response.header.content-length` instead. - * + * Deprecated, use `http.response.header.` instead. + * * @example 3495 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `http.response.header.content-length`. + * + * @deprecated Replaced by `http.response.header.`. */ export const ATTR_HTTP_RESPONSE_CONTENT_LENGTH = 'http.response_content_length' as const; /** * Deprecated, use `http.response.body.size` instead. - * + * * @example 5493 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replace by `http.response.body.size`. + * + * @deprecated Replace by `http.response.body.size`. */ export const ATTR_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED = 'http.response_content_length_uncompressed' as const; /** * Deprecated, use `url.scheme` instead. - * + * * @example http - * * @example https - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `url.scheme` instead. + * + * @deprecated Replaced by `url.scheme` instead. */ export const ATTR_HTTP_SCHEME = 'http.scheme' as const; /** * Deprecated, use `server.address` instead. - * + * * @example example.com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.address`. + * + * @deprecated Replaced by `server.address`. */ export const ATTR_HTTP_SERVER_NAME = 'http.server_name' as const; /** * Deprecated, use `http.response.status_code` instead. - * + * * @example 200 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `http.response.status_code`. + * + * @deprecated Replaced by `http.response.status_code`. */ export const ATTR_HTTP_STATUS_CODE = 'http.status_code' as const; /** * Deprecated, use `url.path` and `url.query` instead. - * + * * @example /search?q=OpenTelemetry#SemConv - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Split to `url.path` and `url.query. + * + * @deprecated Split to `url.path` and `url.query. */ export const ATTR_HTTP_TARGET = 'http.target' as const; /** * Deprecated, use `url.full` instead. - * + * * @example https://www.foo.bar/search?q=OpenTelemetry#SemConv - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `url.full`. + * + * @deprecated Replaced by `url.full`. */ export const ATTR_HTTP_URL = 'http.url' as const; /** * Deprecated, use `user_agent.original` instead. - * + * * @example CERN-LineMode/2.15 libwww/2.17b3 - * * @example Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `user_agent.original`. + * + * @deprecated Replaced by `user_agent.original`. */ export const ATTR_HTTP_USER_AGENT = 'http.user_agent' as const; +/** + * An identifier for the hardware component, unique within the monitored host + * + * @example win32battery_battery_testsysa33_1 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_HW_ID = 'hw.id' as const; + +/** + * An easily-recognizable name for the hardware component + * + * @example eth0 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_HW_NAME = 'hw.name' as const; + +/** + * Unique identifier of the parent component (typically the `hw.id` attribute of the enclosure, or disk controller) + * + * @example dellStorage_perc_0 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_HW_PARENT = 'hw.parent' as const; + +/** + * The current state of the component + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_HW_STATE = 'hw.state' as const; + +/** + * Enum value "degraded" for attribute {@link ATTR_HW_STATE}. + */ +export const HW_STATE_VALUE_DEGRADED = "degraded" as const; + +/** + * Enum value "failed" for attribute {@link ATTR_HW_STATE}. + */ +export const HW_STATE_VALUE_FAILED = "failed" as const; + +/** + * Enum value "ok" for attribute {@link ATTR_HW_STATE}. + */ +export const HW_STATE_VALUE_OK = "ok" as const; + +/** + * Type of the component + * + * @note Describes the category of the hardware component for which `hw.state` is being reported. For example, `hw.type=temperature` along with `hw.state=degraded` would indicate that the temperature of the hardware component has been reported as `degraded`. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_HW_TYPE = 'hw.type' as const; + +/** + * Enum value "battery" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_BATTERY = "battery" as const; + +/** + * Enum value "cpu" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_CPU = "cpu" as const; + +/** + * Enum value "disk_controller" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_DISK_CONTROLLER = "disk_controller" as const; + +/** + * Enum value "enclosure" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_ENCLOSURE = "enclosure" as const; + +/** + * Enum value "fan" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_FAN = "fan" as const; + +/** + * Enum value "gpu" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_GPU = "gpu" as const; + +/** + * Enum value "logical_disk" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_LOGICAL_DISK = "logical_disk" as const; + +/** + * Enum value "memory" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_MEMORY = "memory" as const; + +/** + * Enum value "network" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_NETWORK = "network" as const; + +/** + * Enum value "physical_disk" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_PHYSICAL_DISK = "physical_disk" as const; + +/** + * Enum value "power_supply" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_POWER_SUPPLY = "power_supply" as const; + +/** + * Enum value "tape_drive" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_TAPE_DRIVE = "tape_drive" as const; + +/** + * Enum value "temperature" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_TEMPERATURE = "temperature" as const; + +/** + * Enum value "voltage" for attribute {@link ATTR_HW_TYPE}. + */ +export const HW_TYPE_VALUE_VOLTAGE = "voltage" as const; + /** * Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a payload field instead. - * + * * @note The iOS lifecycle states are defined in the [UIApplicationDelegate documentation](https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902), and from which the `OS terminology` column values are derived. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Moved to a payload field of `device.app.lifecycle`. + * + * @deprecated Moved to a payload field of `device.app.lifecycle`. */ export const ATTR_IOS_STATE = 'ios.state' as const; @@ -3644,31 +4091,30 @@ export const IOS_STATE_VALUE_TERMINATE = "terminate" as const; /** * Name of the buffer pool. - * + * * @example mapped - * * @example direct - * + * * @note Pool names are generally obtained via [BufferPoolMXBean#getName()](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_JVM_BUFFER_POOL_NAME = 'jvm.buffer.pool.name' as const; /** * The name of the cluster. - * + * * @example opentelemetry-cluster - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CLUSTER_NAME = 'k8s.cluster.name' as const; /** * A pseudo-ID for the cluster, set to the UID of the `kube-system` namespace. - * + * * @example 218fc5a9-a5f1-4b54-aa05-46717d0ab26d - * + * * @note K8s doesn't have support for obtaining a cluster ID. If this is ever * added, we will recommend collecting the `k8s.cluster.uid` through the * official APIs. In the meantime, we are able to use the `uid` of the @@ -3685,241 +4131,284 @@ export const ATTR_K8S_CLUSTER_NAME = 'k8s.cluster.name' as const; * Which states: * * > If generated according to one of the mechanisms defined in Rec. - * ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be - * different from all other UUIDs generated before 3603 A.D., or is - * extremely likely to be different (depending on the mechanism chosen). + * > ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be + * > different from all other UUIDs generated before 3603 A.D., or is + * > extremely likely to be different (depending on the mechanism chosen). * * Therefore, UIDs between clusters should be extremely unlikely to * conflict. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CLUSTER_UID = 'k8s.cluster.uid' as const; /** * The name of the Container from Pod specification, must be unique within a Pod. Container runtime usually uses different globally unique name (`container.name`). - * + * * @example redis - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CONTAINER_NAME = 'k8s.container.name' as const; /** * Number of times the container was restarted. This attribute can be used to identify a particular container (running or stopped) within a container spec. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CONTAINER_RESTART_COUNT = 'k8s.container.restart_count' as const; /** * Last terminated reason of the Container. - * + * * @example Evicted - * * @example Error - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CONTAINER_STATUS_LAST_TERMINATED_REASON = 'k8s.container.status.last_terminated_reason' as const; /** * The name of the CronJob. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CRONJOB_NAME = 'k8s.cronjob.name' as const; /** * The UID of the CronJob. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_CRONJOB_UID = 'k8s.cronjob.uid' as const; /** * The name of the DaemonSet. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_DAEMONSET_NAME = 'k8s.daemonset.name' as const; /** * The UID of the DaemonSet. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_DAEMONSET_UID = 'k8s.daemonset.uid' as const; /** * The name of the Deployment. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_DEPLOYMENT_NAME = 'k8s.deployment.name' as const; /** * The UID of the Deployment. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_DEPLOYMENT_UID = 'k8s.deployment.uid' as const; /** * The name of the Job. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_JOB_NAME = 'k8s.job.name' as const; /** * The UID of the Job. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_JOB_UID = 'k8s.job.uid' as const; /** * The name of the namespace that the pod is running in. - * + * * @example default - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_NAMESPACE_NAME = 'k8s.namespace.name' as const; /** * The name of the Node. - * + * * @example node-1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_NODE_NAME = 'k8s.node.name' as const; /** * The UID of the Node. - * + * * @example 1eb3a0c6-0477-4080-a9cb-0cb7db65c6a2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_NODE_UID = 'k8s.node.uid' as const; /** * The annotation key-value pairs placed on the Pod, the `` being the annotation name, the value being the annotation value. - * + * * @example k8s.pod.annotation.kubernetes.io/enforce-mountable-secrets=true - * * @example k8s.pod.annotation.mycompany.io/arch=x64 - * * @example k8s.pod.annotation.data= - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_POD_ANNOTATION = (key: string) => `k8s.pod.annotation.${key}`; /** * The label key-value pairs placed on the Pod, the `` being the label name, the value being the label value. - * + * * @example k8s.pod.label.app=my-app - * * @example k8s.pod.label.mycompany.io/arch=x64 - * * @example k8s.pod.label.data= - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_POD_LABEL = (key: string) => `k8s.pod.label.${key}`; /** * Deprecated, use `k8s.pod.label` instead. - * + * * @example k8s.pod.label.app=my-app - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `k8s.pod.label`. + * + * @deprecated Replaced by `k8s.pod.label`. */ export const ATTR_K8S_POD_LABELS = (key: string) => `k8s.pod.labels.${key}`; /** * The name of the Pod. - * + * * @example opentelemetry-pod-autoconf - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_POD_NAME = 'k8s.pod.name' as const; /** * The UID of the Pod. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_POD_UID = 'k8s.pod.uid' as const; /** * The name of the ReplicaSet. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_REPLICASET_NAME = 'k8s.replicaset.name' as const; /** * The UID of the ReplicaSet. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_REPLICASET_UID = 'k8s.replicaset.uid' as const; /** * The name of the StatefulSet. - * + * * @example opentelemetry - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_STATEFULSET_NAME = 'k8s.statefulset.name' as const; /** * The UID of the StatefulSet. - * + * * @example 275ecb36-5aa8-4c2a-9c47-d8bb681b9aff - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_K8S_STATEFULSET_UID = 'k8s.statefulset.uid' as const; +/** + * The name of the K8s volume. + * + * @example volume0 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_K8S_VOLUME_NAME = 'k8s.volume.name' as const; + +/** + * The type of the K8s volume. + * + * @example emptyDir + * @example persistentVolumeClaim + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_K8S_VOLUME_TYPE = 'k8s.volume.type' as const; + +/** + * Enum value "configMap" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_CONFIG_MAP = "configMap" as const; + +/** + * Enum value "downwardAPI" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_DOWNWARD_API = "downwardAPI" as const; + +/** + * Enum value "emptyDir" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_EMPTY_DIR = "emptyDir" as const; + +/** + * Enum value "local" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_LOCAL = "local" as const; + +/** + * Enum value "persistentVolumeClaim" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_PERSISTENT_VOLUME_CLAIM = "persistentVolumeClaim" as const; + +/** + * Enum value "secret" for attribute {@link ATTR_K8S_VOLUME_TYPE}. + */ +export const K8S_VOLUME_TYPE_VALUE_SECRET = "secret" as const; + /** * The Linux Slab memory state - * + * * @example reclaimable - * * @example unreclaimable - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LINUX_MEMORY_SLAB_STATE = 'linux.memory.slab.state' as const; @@ -3936,43 +4425,43 @@ export const LINUX_MEMORY_SLAB_STATE_VALUE_UNRECLAIMABLE = "unreclaimable" as co /** * The basename of the file. - * + * * @example audit.log - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_FILE_NAME = 'log.file.name' as const; /** * The basename of the file, with symlinks resolved. - * + * * @example uuid.log - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_FILE_NAME_RESOLVED = 'log.file.name_resolved' as const; /** * The full path to the file. - * + * * @example /var/log/mysql/audit.log - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_FILE_PATH = 'log.file.path' as const; /** * The full path to the file, with symlinks resolved. - * + * * @example /var/lib/docker/uuid.log - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_FILE_PATH_RESOLVED = 'log.file.path_resolved' as const; /** * The stream associated with the log. See below for a list of well-known values. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_IOSTREAM = 'log.iostream' as const; @@ -3988,54 +4477,53 @@ export const LOG_IOSTREAM_VALUE_STDERR = "stderr" as const; export const LOG_IOSTREAM_VALUE_STDOUT = "stdout" as const; /** - * The complete orignal Log Record. - * + * The complete original Log Record. + * * @example 77 <86>1 2015-08-06T21:58:59.694Z 192.168.2.133 inactive - - - Something happened - * * @example [INFO] 8/3/24 12:34:56 Something happened - * + * * @note This value **MAY** be added when processing a Log Record which was originally transmitted as a string or equivalent data type AND the Body field of the Log Record does not contain the same value. (e.g. a syslog or a log record read from a file.) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_RECORD_ORIGINAL = 'log.record.original' as const; /** * A unique identifier for the Log Record. - * + * * @example 01ARZ3NDEKTSV4RRFFQ69G5FAV - * + * * @note If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. This means, that two distinguishable log records **MUST** have different values. * The id **MAY** be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), but other identifiers (e.g. UUID) may be used as needed. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_LOG_RECORD_UID = 'log.record.uid' as const; /** * Deprecated, use `rpc.message.compressed_size` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `rpc.message.compressed_size`. + * + * @deprecated Replaced by `rpc.message.compressed_size`. */ export const ATTR_MESSAGE_COMPRESSED_SIZE = 'message.compressed_size' as const; /** * Deprecated, use `rpc.message.id` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `rpc.message.id`. + * + * @deprecated Replaced by `rpc.message.id`. */ export const ATTR_MESSAGE_ID = 'message.id' as const; /** * Deprecated, use `rpc.message.type` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `rpc.message.type`. + * + * @deprecated Replaced by `rpc.message.type`. */ export const ATTR_MESSAGE_TYPE = 'message.type' as const; @@ -4051,324 +4539,313 @@ export const MESSAGE_TYPE_VALUE_SENT = "SENT" as const; /** * Deprecated, use `rpc.message.uncompressed_size` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `rpc.message.uncompressed_size`. + * + * @deprecated Replaced by `rpc.message.uncompressed_size`. */ export const ATTR_MESSAGE_UNCOMPRESSED_SIZE = 'message.uncompressed_size' as const; /** * The number of messages sent, received, or processed in the scope of the batching operation. - * + * * @example 0 - * * @example 1 - * * @example 2 - * - * @note Instrumentations **SHOULD** **NOT** set `messaging.batch.message_count` on spans that operate with a single message. When a messaging client library supports both batch and single-message API for the same operation, instrumentations **SHOULD** use `messaging.batch.message_count` for batching APIs and **SHOULD** **NOT** use it for single-message APIs. - * + * + * @note Instrumentations **SHOULD NOT** set `messaging.batch.message_count` on spans that operate with a single message. When a messaging client library supports both batch and single-message API for the same operation, instrumentations **SHOULD** use `messaging.batch.message_count` for batching APIs and **SHOULD NOT** use it for single-message APIs. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_BATCH_MESSAGE_COUNT = 'messaging.batch.message_count' as const; /** * A unique identifier for the client that consumes or produces a message. - * + * * @example client-5 - * * @example myhost@8742@s8083jm - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_CLIENT_ID = 'messaging.client.id' as const; /** * The name of the consumer group with which a consumer is associated. - * + * * @example my-group - * * @example indexer - * + * * @note Semantic conventions for individual messaging systems **SHOULD** document whether `messaging.consumer.group.name` is applicable and what it means in the context of that system. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_CONSUMER_GROUP_NAME = 'messaging.consumer.group.name' as const; /** * A boolean that is true if the message destination is anonymous (could be unnamed or have auto-generated name). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_ANONYMOUS = 'messaging.destination.anonymous' as const; /** * The message destination name - * + * * @example MyQueue - * * @example MyTopic - * + * * @note Destination name **SHOULD** uniquely identify a specific queue, topic or other entity within the broker. If * the broker doesn't have such notion, the destination name **SHOULD** uniquely identify the broker. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_NAME = 'messaging.destination.name' as const; /** * The identifier of the partition messages are sent to or received from, unique within the `messaging.destination.name`. - * + * * @example "1" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_PARTITION_ID = 'messaging.destination.partition.id' as const; /** * The name of the destination subscription from which a message is consumed. - * + * * @example subscription-a - * + * * @note Semantic conventions for individual messaging systems **SHOULD** document whether `messaging.destination.subscription.name` is applicable and what it means in the context of that system. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_SUBSCRIPTION_NAME = 'messaging.destination.subscription.name' as const; /** * Low cardinality representation of the messaging destination name - * + * * @example /customers/{customerId} - * + * * @note Destination names could be constructed from templates. An example would be a destination name involving a user name or product id. Although the destination name in this case is of high cardinality, the underlying template is of low cardinality and can be effectively used for grouping and aggregation. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_TEMPLATE = 'messaging.destination.template' as const; /** * A boolean that is true if the message destination is temporary and might not exist anymore after messages are processed. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_DESTINATION_TEMPORARY = 'messaging.destination.temporary' as const; /** * Deprecated, no replacement at this time. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * No replacement at this time. + * + * @deprecated No replacement at this time. */ export const ATTR_MESSAGING_DESTINATION_PUBLISH_ANONYMOUS = 'messaging.destination_publish.anonymous' as const; /** * Deprecated, no replacement at this time. - * + * * @example MyQueue - * * @example MyTopic - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * No replacement at this time. + * + * @deprecated No replacement at this time. */ export const ATTR_MESSAGING_DESTINATION_PUBLISH_NAME = 'messaging.destination_publish.name' as const; /** * Deprecated, use `messaging.consumer.group.name` instead. - * + * * @example "$Default" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.consumer.group.name`. + * + * @deprecated Replaced by `messaging.consumer.group.name`. */ export const ATTR_MESSAGING_EVENTHUBS_CONSUMER_GROUP = 'messaging.eventhubs.consumer.group' as const; /** * The UTC epoch seconds at which the message has been accepted and stored in the entity. - * + * * @example 1701393730 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_EVENTHUBS_MESSAGE_ENQUEUED_TIME = 'messaging.eventhubs.message.enqueued_time' as const; /** * The ack deadline in seconds set for the modify ack deadline request. - * + * * @example 10 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_GCP_PUBSUB_MESSAGE_ACK_DEADLINE = 'messaging.gcp_pubsub.message.ack_deadline' as const; /** * The ack id for a given message. - * + * * @example "ack_id" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_GCP_PUBSUB_MESSAGE_ACK_ID = 'messaging.gcp_pubsub.message.ack_id' as const; /** * The delivery attempt for a given message. - * + * * @example 2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_GCP_PUBSUB_MESSAGE_DELIVERY_ATTEMPT = 'messaging.gcp_pubsub.message.delivery_attempt' as const; /** * The ordering key for a given message. If the attribute is not present, the message does not have an ordering key. - * + * * @example "ordering_key" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY = 'messaging.gcp_pubsub.message.ordering_key' as const; /** * Deprecated, use `messaging.consumer.group.name` instead. - * + * * @example "my-group" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.consumer.group.name`. + * + * @deprecated Replaced by `messaging.consumer.group.name`. */ export const ATTR_MESSAGING_KAFKA_CONSUMER_GROUP = 'messaging.kafka.consumer.group' as const; /** * Deprecated, use `messaging.destination.partition.id` instead. - * + * * @example 2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.destination.partition.id`. + * + * @deprecated Replaced by `messaging.destination.partition.id`. */ export const ATTR_MESSAGING_KAFKA_DESTINATION_PARTITION = 'messaging.kafka.destination.partition' as const; /** - * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same partition. They differ from `messaging.message.id` in that they're not unique. If the key is `null`, the attribute **MUST** **NOT** be set. - * + * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same partition. They differ from `messaging.message.id` in that they're not unique. If the key is `null`, the attribute **MUST NOT** be set. + * * @example "myKey" - * + * * @note If the key type is not string, it's string representation has to be supplied for the attribute. If the key has no unambiguous, canonical string form, don't include its value. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_KAFKA_MESSAGE_KEY = 'messaging.kafka.message.key' as const; /** * Deprecated, use `messaging.kafka.offset` instead. - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.kafka.offset`. + * + * @deprecated Replaced by `messaging.kafka.offset`. */ export const ATTR_MESSAGING_KAFKA_MESSAGE_OFFSET = 'messaging.kafka.message.offset' as const; /** * A boolean that is true if the message is a tombstone. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE = 'messaging.kafka.message.tombstone' as const; /** * The offset of a record in the corresponding Kafka partition. - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_KAFKA_OFFSET = 'messaging.kafka.offset' as const; /** * The size of the message body in bytes. - * + * * @example 1439 - * + * * @note This can refer to both the compressed or uncompressed body size. If both sizes are known, the uncompressed * body size should be used. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_MESSAGE_BODY_SIZE = 'messaging.message.body.size' as const; /** * The conversation ID identifying the conversation to which the message belongs, represented as a string. Sometimes called "Correlation ID". - * + * * @example "MyConversationId" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_MESSAGE_CONVERSATION_ID = 'messaging.message.conversation_id' as const; /** * The size of the message body and metadata in bytes. - * + * * @example 2738 - * + * * @note This can refer to both the compressed or uncompressed size. If both sizes are known, the uncompressed * size should be used. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_MESSAGE_ENVELOPE_SIZE = 'messaging.message.envelope.size' as const; /** * A value used by the messaging system as an identifier for the message, represented as a string. - * + * * @example "452a7c7c7c7048c2f887f61572b18fc2" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_MESSAGE_ID = 'messaging.message.id' as const; /** * Deprecated, use `messaging.operation.type` instead. - * + * * @example publish - * * @example create - * * @example process - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.operation.type`. + * + * @deprecated Replaced by `messaging.operation.type`. */ export const ATTR_MESSAGING_OPERATION = 'messaging.operation' as const; /** * The system-specific name of the messaging operation. - * + * * @example ack - * * @example nack - * * @example send - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_OPERATION_NAME = 'messaging.operation.name' as const; /** * A string identifying the type of the messaging operation. - * + * * @note If a custom value is used, it **MUST** be of low cardinality. - * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_OPERATION_TYPE = 'messaging.operation.type' as const; @@ -4398,6 +4875,11 @@ export const MESSAGING_OPERATION_TYPE_VALUE_PUBLISH = "publish" as const; */ export const MESSAGING_OPERATION_TYPE_VALUE_RECEIVE = "receive" as const; +/** + * Enum value "send" for attribute {@link ATTR_MESSAGING_OPERATION_TYPE}. + */ +export const MESSAGING_OPERATION_TYPE_VALUE_SEND = "send" as const; + /** * Enum value "settle" for attribute {@link ATTR_MESSAGING_OPERATION_TYPE}. */ @@ -4405,36 +4887,36 @@ export const MESSAGING_OPERATION_TYPE_VALUE_SETTLE = "settle" as const; /** * RabbitMQ message routing key. - * + * * @example "myKey" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY = 'messaging.rabbitmq.destination.routing_key' as const; /** * RabbitMQ message delivery tag - * + * * @example 123 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_RABBITMQ_MESSAGE_DELIVERY_TAG = 'messaging.rabbitmq.message.delivery_tag' as const; /** * Deprecated, use `messaging.consumer.group.name` instead. - * + * * @example "myConsumerGroup" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.consumer.group.name` on the consumer spans. No replacement for producer spans. + * + * @deprecated Replaced by `messaging.consumer.group.name` on the consumer spans. No replacement for producer spans. */ export const ATTR_MESSAGING_ROCKETMQ_CLIENT_GROUP = 'messaging.rocketmq.client_group' as const; /** * Model of message consumption. This only applies to consumer spans. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_CONSUMPTION_MODEL = 'messaging.rocketmq.consumption_model' as const; @@ -4451,54 +4933,52 @@ export const MESSAGING_ROCKETMQ_CONSUMPTION_MODEL_VALUE_CLUSTERING = "clustering /** * The delay time level for delay message, which determines the message delay time. - * + * * @example 3 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL = 'messaging.rocketmq.message.delay_time_level' as const; /** * The timestamp in milliseconds that the delay message is expected to be delivered to consumer. - * + * * @example 1665987217045 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP = 'messaging.rocketmq.message.delivery_timestamp' as const; /** * It is essential for FIFO message. Messages that belong to the same message group are always processed one by one within the same consumer group. - * + * * @example "myMessageGroup" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_GROUP = 'messaging.rocketmq.message.group' as const; /** * Key(s) of message, another way to mark message besides message id. - * - * @example keyA - * - * @example keyB - * + * + * @example ["keyA", "keyB"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_KEYS = 'messaging.rocketmq.message.keys' as const; /** * The secondary classifier of message besides topic. - * + * * @example "tagA" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_TAG = 'messaging.rocketmq.message.tag' as const; /** * Type of message. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_MESSAGE_TYPE = 'messaging.rocketmq.message.type' as const; @@ -4525,27 +5005,27 @@ export const MESSAGING_ROCKETMQ_MESSAGE_TYPE_VALUE_TRANSACTION = "transaction" a /** * Namespace of RocketMQ resources, resources in different namespaces are individual. - * + * * @example "myNamespace" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_ROCKETMQ_NAMESPACE = 'messaging.rocketmq.namespace' as const; /** - * Deprecated, use `messaging.servicebus.destination.subscription_name` instead. - * + * Deprecated, use `messaging.destination.subscription.name` instead. + * * @example "subscription-a" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.servicebus.destination.subscription_name`. + * + * @deprecated Replaced by `messaging.destination.subscription.name`. */ export const ATTR_MESSAGING_SERVICEBUS_DESTINATION_SUBSCRIPTION_NAME = 'messaging.servicebus.destination.subscription_name' as const; /** * Describes the [settlement type](https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_SERVICEBUS_DISPOSITION_STATUS = 'messaging.servicebus.disposition_status' as const; @@ -4572,27 +5052,27 @@ export const MESSAGING_SERVICEBUS_DISPOSITION_STATUS_VALUE_DEFER = "defer" as co /** * Number of deliveries that have been attempted for this message. - * + * * @example 2 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_SERVICEBUS_MESSAGE_DELIVERY_COUNT = 'messaging.servicebus.message.delivery_count' as const; /** * The UTC epoch seconds at which the message has been accepted and stored in the entity. - * + * * @example 1701393730 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_SERVICEBUS_MESSAGE_ENQUEUED_TIME = 'messaging.servicebus.message.enqueued_time' as const; /** * The messaging system as identified by the client instrumentation. - * + * * @note The actual messaging system may differ from the one known by the client. For example, when using Kafka client libraries to communicate with Azure Event Hubs, the `messaging.system` is set to `kafka` based on the instrumentation's best knowledge. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_MESSAGING_SYSTEM = 'messaging.system' as const; @@ -4654,102 +5134,100 @@ export const MESSAGING_SYSTEM_VALUE_SERVICEBUS = "servicebus" as const; /** * Deprecated, use `network.local.address`. - * + * * @example "192.168.0.1" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.local.address`. + * + * @deprecated Replaced by `network.local.address`. */ export const ATTR_NET_HOST_IP = 'net.host.ip' as const; /** * Deprecated, use `server.address`. - * + * * @example example.com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.address`. + * + * @deprecated Replaced by `server.address`. */ export const ATTR_NET_HOST_NAME = 'net.host.name' as const; /** * Deprecated, use `server.port`. - * + * * @example 8080 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.port`. + * + * @deprecated Replaced by `server.port`. */ export const ATTR_NET_HOST_PORT = 'net.host.port' as const; /** * Deprecated, use `network.peer.address`. - * + * * @example "127.0.0.1" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.peer.address`. + * + * @deprecated Replaced by `network.peer.address`. */ export const ATTR_NET_PEER_IP = 'net.peer.ip' as const; /** * Deprecated, use `server.address` on client spans and `client.address` on server spans. - * + * * @example example.com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.address` on client spans and `client.address` on server spans. + * + * @deprecated Replaced by `server.address` on client spans and `client.address` on server spans. */ export const ATTR_NET_PEER_NAME = 'net.peer.name' as const; /** * Deprecated, use `server.port` on client spans and `client.port` on server spans. - * + * * @example 8080 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.port` on client spans and `client.port` on server spans. + * + * @deprecated Replaced by `server.port` on client spans and `client.port` on server spans. */ export const ATTR_NET_PEER_PORT = 'net.peer.port' as const; /** * Deprecated, use `network.protocol.name`. - * + * * @example amqp - * * @example http - * * @example mqtt - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.protocol.name`. + * + * @deprecated Replaced by `network.protocol.name`. */ export const ATTR_NET_PROTOCOL_NAME = 'net.protocol.name' as const; /** * Deprecated, use `network.protocol.version`. - * + * * @example "3.1.1" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.protocol.version`. + * + * @deprecated Replaced by `network.protocol.version`. */ export const ATTR_NET_PROTOCOL_VERSION = 'net.protocol.version' as const; /** * Deprecated, use `network.transport` and `network.type`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Split to `network.transport` and `network.type`. + * + * @deprecated Split to `network.transport` and `network.type`. */ export const ATTR_NET_SOCK_FAMILY = 'net.sock.family' as const; @@ -4770,65 +5248,65 @@ export const NET_SOCK_FAMILY_VALUE_UNIX = "unix" as const; /** * Deprecated, use `network.local.address`. - * + * * @example /var/my.sock - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.local.address`. + * + * @deprecated Replaced by `network.local.address`. */ export const ATTR_NET_SOCK_HOST_ADDR = 'net.sock.host.addr' as const; /** * Deprecated, use `network.local.port`. - * + * * @example 8080 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.local.port`. + * + * @deprecated Replaced by `network.local.port`. */ export const ATTR_NET_SOCK_HOST_PORT = 'net.sock.host.port' as const; /** * Deprecated, use `network.peer.address`. - * + * * @example 192.168.0.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.peer.address`. + * + * @deprecated Replaced by `network.peer.address`. */ export const ATTR_NET_SOCK_PEER_ADDR = 'net.sock.peer.addr' as const; /** * Deprecated, no replacement at this time. - * + * * @example /var/my.sock - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Removed. + * + * @deprecated Removed. */ export const ATTR_NET_SOCK_PEER_NAME = 'net.sock.peer.name' as const; /** * Deprecated, use `network.peer.port`. - * + * * @example 65531 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.peer.port`. + * + * @deprecated Replaced by `network.peer.port`. */ export const ATTR_NET_SOCK_PEER_PORT = 'net.sock.peer.port' as const; /** * Deprecated, use `network.transport`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `network.transport`. + * + * @deprecated Replaced by `network.transport`. */ export const ATTR_NET_TRANSPORT = 'net.transport' as const; @@ -4859,45 +5337,45 @@ export const NET_TRANSPORT_VALUE_PIPE = "pipe" as const; /** * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network. - * + * * @example "DE" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CARRIER_ICC = 'network.carrier.icc' as const; /** * The mobile carrier country code. - * + * * @example "310" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CARRIER_MCC = 'network.carrier.mcc' as const; /** * The mobile carrier network code. - * + * * @example "001" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CARRIER_MNC = 'network.carrier.mnc' as const; /** * The name of the mobile carrier. - * + * * @example "sprint" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CARRIER_NAME = 'network.carrier.name' as const; /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. - * + * * @example "LTE" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CONNECTION_SUBTYPE = 'network.connection.subtype' as const; @@ -5009,9 +5487,9 @@ export const NETWORK_CONNECTION_SUBTYPE_VALUE_UMTS = "umts" as const; /** * The internet connection type. - * + * * @example "wifi" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_CONNECTION_TYPE = 'network.connection.type' as const; @@ -5043,9 +5521,9 @@ export const NETWORK_CONNECTION_TYPE_VALUE_WIRED = "wired" as const; /** * The network IO operation direction. - * + * * @example transmit - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_NETWORK_IO_DIRECTION = 'network.io.direction' as const; @@ -5060,23 +5538,40 @@ export const NETWORK_IO_DIRECTION_VALUE_RECEIVE = "receive" as const; */ export const NETWORK_IO_DIRECTION_VALUE_TRANSMIT = "transmit" as const; +/** + * The state of event loop time. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_NODEJS_EVENTLOOP_STATE = 'nodejs.eventloop.state' as const; + +/** + * Enum value "active" for attribute {@link ATTR_NODEJS_EVENTLOOP_STATE}. + */ +export const NODEJS_EVENTLOOP_STATE_VALUE_ACTIVE = "active" as const; + +/** + * Enum value "idle" for attribute {@link ATTR_NODEJS_EVENTLOOP_STATE}. + */ +export const NODEJS_EVENTLOOP_STATE_VALUE_IDLE = "idle" as const; + /** * The digest of the OCI image manifest. For container images specifically is the digest by which the container image is known. - * + * * @example sha256:e4ca62c0d62f3e886e684806dfe9d4e0cda60d54986898173c1083856cfda0f4 - * + * * @note Follows [OCI Image Manifest Specification](https://github.com/opencontainers/image-spec/blob/main/manifest.md), and specifically the [Digest property](https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests). * An example can be found in [Example Image Manifest](https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OCI_MANIFEST_DIGEST = 'oci.manifest.digest' as const; /** * Parent-child Reference type - * + * * @note The causal relationship between a child Span and a parent Span. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OPENTRACING_REF_TYPE = 'opentracing.ref_type' as const; @@ -5093,44 +5588,39 @@ export const OPENTRACING_REF_TYPE_VALUE_FOLLOWS_FROM = "follows_from" as const; /** * Unique identifier for a particular build or compilation of the operating system. - * + * * @example TQ3C.230805.001.B2 - * * @example 20E247 - * * @example 22621 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OS_BUILD_ID = 'os.build_id' as const; /** * Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. - * + * * @example Microsoft Windows [Version 10.0.18363.778] - * * @example Ubuntu 18.04.1 LTS - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OS_DESCRIPTION = 'os.description' as const; /** * Human readable operating system name. - * + * * @example iOS - * * @example Android - * * @example Ubuntu - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OS_NAME = 'os.name' as const; /** * The operating system type. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OS_TYPE = 'os.type' as const; @@ -5192,89 +5682,97 @@ export const OS_TYPE_VALUE_Z_OS = "z_os" as const; /** * The version string of the operating system as defined in [Version Attributes](/docs/resource/README.md#version-attributes). - * + * * @example 14.2.1 - * * @example 18.04.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_OS_VERSION = 'os.version' as const; /** - - * + * Deprecated. Use the `otel.scope.name` attribute + * * @example io.opentelemetry.contrib.mongodb - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * use the `otel.scope.name` attribute. + * + * @deprecated Use the `otel.scope.name` attribute. */ export const ATTR_OTEL_LIBRARY_NAME = 'otel.library.name' as const; /** - - * + * Deprecated. Use the `otel.scope.version` attribute. + * * @example 1.0.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * use the `otel.scope.version` attribute. + * + * @deprecated Use the `otel.scope.version` attribute. */ export const ATTR_OTEL_LIBRARY_VERSION = 'otel.library.version' as const; /** * The [`service.name`](/docs/resource/README.md#service) of the remote service. **SHOULD** be equal to the actual `service.name` resource attribute of the remote service if any. - * + * * @example "AuthTokenCache" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PEER_SERVICE = 'peer.service' as const; /** * Deprecated, use `db.client.connection.pool.name` instead. - * + * * @example myDataSource - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.pool.name`. + * + * @deprecated Replaced by `db.client.connection.pool.name`. */ export const ATTR_POOL_NAME = 'pool.name' as const; +/** + * Length of the process.command_args array + * + * @example 4 + * + * @note This field can be useful for querying or performing bucket analysis on how many arguments were provided to start a process. More arguments may be an indication of suspicious activity. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_ARGS_COUNT = 'process.args_count' as const; + /** * The command used to launch the process (i.e. the command name). On Linux based systems, can be set to the zeroth string in `proc/[pid]/cmdline`. On Windows, can be set to the first parameter extracted from `GetCommandLineW`. - * + * * @example cmd/otelcol - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_COMMAND = 'process.command' as const; /** * All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. - * - * @example cmd/otecol - * - * @example --config=config.yaml - * + * + * @example ["cmd/otecol", "--config=config.yaml"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_COMMAND_ARGS = 'process.command_args' as const; /** * The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. - * - * @example C:\cmd\otecol --config="my directory\config.yaml" - * + * + * @example C:\\cmd\\otecol --config="my directory\\config.yaml" + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_COMMAND_LINE = 'process.command_line' as const; /** * Specifies whether the context switches for this data point were voluntary or involuntary. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_CONTEXT_SWITCH_TYPE = 'process.context_switch_type' as const; @@ -5291,10 +5789,10 @@ export const PROCESS_CONTEXT_SWITCH_TYPE_VALUE_VOLUNTARY = "voluntary" as const; /** * Deprecated, use `cpu.mode` instead. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `cpu.mode` + * + * @deprecated Replaced by `cpu.mode` */ export const ATTR_PROCESS_CPU_STATE = 'process.cpu.state' as const; @@ -5315,77 +5813,104 @@ export const PROCESS_CPU_STATE_VALUE_WAIT = "wait" as const; /** * The date and time the process was created, in ISO 8601 format. - * + * * @example 2023-11-21T09:25:34.853Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_CREATION_TIME = 'process.creation.time' as const; +/** + * The GNU build ID as found in the `.note.gnu.build-id` ELF section (hex string). + * + * @example c89b11207f6479603b0d49bf291c092c2b719293 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_EXECUTABLE_BUILD_ID_GNU = 'process.executable.build_id.gnu' as const; + +/** + * The Go build ID as retrieved by `go tool buildid `. + * + * @example foh3mEXu7BLZjsN9pOwG/kATcXlYVCDEFouRMQed_/WwRFB1hPo9LBkekthSPG/x8hMC8emW2cCjXD0_1aY + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_EXECUTABLE_BUILD_ID_GO = 'process.executable.build_id.go' as const; + +/** + * Profiling specific build ID for executables. See the OTel specification for Profiles for more information. + * + * @example 600DCAFE4A110000F2BF38C493F5FB92 + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_EXECUTABLE_BUILD_ID_PROFILING = 'process.executable.build_id.profiling' as const; + /** * The name of the process executable. On Linux based systems, can be set to the `Name` in `proc/[pid]/status`. On Windows, can be set to the base name of `GetProcessImageFileNameW`. - * + * * @example otelcol - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_EXECUTABLE_NAME = 'process.executable.name' as const; /** * The full path to the process executable. On Linux based systems, can be set to the target of `proc/[pid]/exe`. On Windows, can be set to the result of `GetProcessImageFileNameW`. - * + * * @example /usr/bin/cmd/otelcol - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_EXECUTABLE_PATH = 'process.executable.path' as const; /** * The exit code of the process. - * + * * @example 127 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_EXIT_CODE = 'process.exit.code' as const; /** * The date and time the process exited, in ISO 8601 format. - * + * * @example 2023-11-21T09:26:12.315Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_EXIT_TIME = 'process.exit.time' as const; /** * The PID of the process's group leader. This is also the process group ID (PGID) of the process. - * + * * @example 23 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_GROUP_LEADER_PID = 'process.group_leader.pid' as const; /** * Whether the process is connected to an interactive shell. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_INTERACTIVE = 'process.interactive' as const; /** * The username of the user that owns the process. - * + * * @example root - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_OWNER = 'process.owner' as const; /** * The type of page fault for this data point. Type `major` is for major/hard page faults, and `minor` is for minor/soft page faults. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_PAGING_FAULT_TYPE = 'process.paging.fault_type' as const; @@ -5402,126 +5927,202 @@ export const PROCESS_PAGING_FAULT_TYPE_VALUE_MINOR = "minor" as const; /** * Parent Process identifier (PPID). - * + * * @example 111 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_PARENT_PID = 'process.parent_pid' as const; /** * Process identifier (PID). - * + * * @example 1234 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_PID = 'process.pid' as const; /** * The real user ID (RUID) of the process. - * + * * @example 1000 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_REAL_USER_ID = 'process.real_user.id' as const; /** * The username of the real user of the process. - * + * * @example operator - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_REAL_USER_NAME = 'process.real_user.name' as const; /** * An additional description about the runtime of the process, for example a specific vendor customization of the runtime environment. - * + * * @example "Eclipse OpenJ9 Eclipse OpenJ9 VM openj9-0.21.0" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_RUNTIME_DESCRIPTION = 'process.runtime.description' as const; /** * The name of the runtime of this process. - * + * * @example OpenJDK Runtime Environment - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_RUNTIME_NAME = 'process.runtime.name' as const; /** * The version of the runtime of this process, as returned by the runtime without modification. - * + * * @example "14.0.2" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_RUNTIME_VERSION = 'process.runtime.version' as const; /** * The saved user ID (SUID) of the process. - * + * * @example 1002 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_SAVED_USER_ID = 'process.saved_user.id' as const; /** * The username of the saved user. - * + * * @example operator - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_SAVED_USER_NAME = 'process.saved_user.name' as const; /** * The PID of the process's session leader. This is also the session ID (SID) of the process. - * + * * @example 14 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_SESSION_LEADER_PID = 'process.session_leader.pid' as const; +/** + * Process title (proctitle) + * + * @example cat /etc/hostname + * @example xfce4-session + * @example bash + * + * @note In many Unix-like systems, process title (proctitle), is the string that represents the name or command line of a running process, displayed by system monitoring tools like ps, top, and htop. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_TITLE = 'process.title' as const; + /** * The effective user ID (EUID) of the process. - * + * * @example 1001 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_PROCESS_USER_ID = 'process.user.id' as const; /** - * The username of the effective user of the process. - * - * @example root - * - * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - */ -export const ATTR_PROCESS_USER_NAME = 'process.user.name' as const; + * The username of the effective user of the process. + * + * @example root + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_USER_NAME = 'process.user.name' as const; + +/** + * Virtual process identifier. + * + * @example 12 + * + * @note The process ID within a PID namespace. This is not necessarily unique across all processes on the host but it is unique within the process namespace that the process exists within. + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_VPID = 'process.vpid' as const; + +/** + * The working directory of the process. + * + * @example /root + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROCESS_WORKING_DIRECTORY = 'process.working_directory' as const; + +/** + * Describes the interpreter or compiler of a single frame. + * + * @example cpython + * + * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const ATTR_PROFILE_FRAME_TYPE = 'profile.frame.type' as const; + +/** + * Enum value "cpython" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_CPYTHON = "cpython" as const; + +/** + * Enum value "dotnet" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_DOTNET = "dotnet" as const; + +/** + * Enum value "jvm" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_JVM = "jvm" as const; + +/** + * Enum value "kernel" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_KERNEL = "kernel" as const; + +/** + * Enum value "native" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_NATIVE = "native" as const; + +/** + * Enum value "perl" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_PERL = "perl" as const; + +/** + * Enum value "php" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_PHP = "php" as const; /** - * Virtual process identifier. - * - * @example 12 - * - * @note The process ID within a PID namespace. This is not necessarily unique across all processes on the host but it is unique within the process namespace that the process exists within. - * - * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - */ -export const ATTR_PROCESS_VPID = 'process.vpid' as const; + * Enum value "ruby" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_RUBY = "ruby" as const; + +/** + * Enum value "v8js" for attribute {@link ATTR_PROFILE_FRAME_TYPE}. + */ +export const PROFILE_FRAME_TYPE_VALUE_V8JS = "v8js" as const; /** * The [error codes](https://connect.build/docs/protocol/#error-codes) of the Connect request. Error codes are always string values. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_CONNECT_RPC_ERROR_CODE = 'rpc.connect_rpc.error_code' as const; @@ -5608,51 +6209,51 @@ export const RPC_CONNECT_RPC_ERROR_CODE_VALUE_UNKNOWN = "unknown" as const; /** * Connect request metadata, `` being the normalized Connect Metadata key (lowercase), the value being the metadata values. - * + * * @example rpc.request.metadata.my-custom-metadata-attribute=["1.2.3.4", "1.2.3.5"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which metadata values are to be captured. Including all request metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_CONNECT_RPC_REQUEST_METADATA = (key: string) => `rpc.connect_rpc.request.metadata.${key}`; /** * Connect response metadata, `` being the normalized Connect Metadata key (lowercase), the value being the metadata values. - * + * * @example rpc.response.metadata.my-custom-metadata-attribute=["attribute_value"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which metadata values are to be captured. Including all response metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_CONNECT_RPC_RESPONSE_METADATA = (key: string) => `rpc.connect_rpc.response.metadata.${key}`; /** * gRPC request metadata, `` being the normalized gRPC Metadata key (lowercase), the value being the metadata values. - * + * * @example rpc.grpc.request.metadata.my-custom-metadata-attribute=["1.2.3.4", "1.2.3.5"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which metadata values are to be captured. Including all request metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_GRPC_REQUEST_METADATA = (key: string) => `rpc.grpc.request.metadata.${key}`; /** * gRPC response metadata, `` being the normalized gRPC Metadata key (lowercase), the value being the metadata values. - * + * * @example rpc.grpc.response.metadata.my-custom-metadata-attribute=["attribute_value"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which metadata values are to be captured. Including all response metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_GRPC_RESPONSE_METADATA = (key: string) => `rpc.grpc.response.metadata.${key}`; /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_GRPC_STATUS_CODE = 'rpc.grpc.status_code' as const; @@ -5744,69 +6345,63 @@ export const RPC_GRPC_STATUS_CODE_VALUE_UNAUTHENTICATED = 16 as const; /** * `error.code` property of response if it is an error response. - * + * * @example -32700 - * * @example 100 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_JSONRPC_ERROR_CODE = 'rpc.jsonrpc.error_code' as const; /** * `error.message` property of response if it is an error response. - * + * * @example Parse error - * * @example User already exists - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_JSONRPC_ERROR_MESSAGE = 'rpc.jsonrpc.error_message' as const; /** * `id` property of request or response. Since protocol allows id to be int, string, `null` or missing (for notifications), value is expected to be cast to string for simplicity. Use empty string in case of `null` value. Omit entirely if this is a notification. - * + * * @example 10 - * * @example request-7 - * - * @example - * + * @example + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_JSONRPC_REQUEST_ID = 'rpc.jsonrpc.request_id' as const; /** * Protocol version as in `jsonrpc` property of request/response. Since JSON-RPC 1.0 doesn't specify this, the value can be omitted. - * + * * @example 2.0 - * * @example 1.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_JSONRPC_VERSION = 'rpc.jsonrpc.version' as const; /** * Compressed size of the message in bytes. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_MESSAGE_COMPRESSED_SIZE = 'rpc.message.compressed_size' as const; /** * **MUST** be calculated as two different counters starting from `1` one for sent messages and one for received message. - * + * * @note This way we guarantee that the values will be consistent between different implementations. - * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_MESSAGE_ID = 'rpc.message.id' as const; /** * Whether this is a received or sent message. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_MESSAGE_TYPE = 'rpc.message.type' as const; @@ -5823,36 +6418,36 @@ export const RPC_MESSAGE_TYPE_VALUE_SENT = "SENT" as const; /** * Uncompressed size of the message in bytes. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_MESSAGE_UNCOMPRESSED_SIZE = 'rpc.message.uncompressed_size' as const; /** * The name of the (logical) method being called, must be equal to the $method part in the span name. - * + * * @example "exampleMethod" - * + * * @note This is the logical name of the method from the RPC interface perspective, which can be different from the name of any implementing method/function. The `code.function` attribute may be used to store the latter (e.g., method actually executing the call on the server side, RPC client stub method on the client side). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_METHOD = 'rpc.method' as const; /** * The full (logical) name of the service being called, including its package name, if applicable. - * + * * @example "myservice.EchoService" - * + * * @note This is the logical name of the service from the RPC interface perspective, which can be different from the name of any implementing class. The `code.namespace` attribute may be used to store the latter (despite the attribute name, it may include a class name; e.g., class with method actually executing the call on the server side, RPC client stub class on the client side). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_SERVICE = 'rpc.service' as const; /** * A string identifying the remoting system. See below for a list of well-known identifiers. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_RPC_SYSTEM = 'rpc.system' as const; @@ -5884,10 +6479,10 @@ export const RPC_SYSTEM_VALUE_JAVA_RMI = "java_rmi" as const; /** * The string ID of the service instance. - * + * * @example 627cc493-f310-47de-96bd-71410b7dec09 - * - * @note MUST be unique for each instance of the same `service.namespace,service.name` pair (in other words + * + * @note **MUST** be unique for each instance of the same `service.namespace,service.name` pair (in other words * `service.namespace,service.name,service.instance.id` triplet **MUST** be globally unique). The ID helps to * distinguish instances of the same service that exist at the same time (e.g. instances of a horizontally scaled * service). @@ -5895,7 +6490,7 @@ export const RPC_SYSTEM_VALUE_JAVA_RMI = "java_rmi" as const; * Implementations, such as SDKs, are recommended to generate a random Version 1 or Version 4 [RFC * 4122](https://www.ietf.org/rfc/rfc4122.txt) UUID, but are free to use an inherent unique ID as the source of * this value if stability is desirable. In that case, the ID **SHOULD** be used as source of a UUID Version 5 and - * SHOULD use the following UUID as the namespace: `4d63009a-8d0f-11ee-aad7-4c796ed8e320`. + * **SHOULD** use the following UUID as the namespace: `4d63009a-8d0f-11ee-aad7-4c796ed8e320`. * * UUIDs are typically recommended, as only an opaque value for the purposes of identifying a service instance is * needed. Similar to what can be seen in the man page for the @@ -5913,74 +6508,71 @@ export const RPC_SYSTEM_VALUE_JAVA_RMI = "java_rmi" as const; * However, Collectors can set the `service.instance.id` if they can unambiguously determine the service instance * for that telemetry. This is typically the case for scraping receivers, as they know the target address and * port. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SERVICE_INSTANCE_ID = 'service.instance.id' as const; /** * A namespace for `service.name`. - * + * * @example Shop - * + * * @note A string value having a meaning that helps to distinguish a group of services, for example the team name that owns a group of services. `service.name` is expected to be unique within the same namespace. If `service.namespace` is not specified in the Resource then `service.name` is expected to be unique for all services that have no explicit namespace defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length namespace string is assumed equal to unspecified namespace. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SERVICE_NAMESPACE = 'service.namespace' as const; /** * A unique id to identify a session. - * + * * @example "00112233-4455-6677-8899-aabbccddeeff" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SESSION_ID = 'session.id' as const; /** * The previous `session.id` for this user, when known. - * + * * @example "00112233-4455-6677-8899-aabbccddeeff" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SESSION_PREVIOUS_ID = 'session.previous_id' as const; /** * Source address - domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name. - * + * * @example source.example.com - * * @example 10.1.2.80 - * * @example /tmp/my.sock - * + * * @note When observed from the destination side, and when communicating through an intermediary, `source.address` **SHOULD** represent the source address behind any intermediaries, for example proxies, if it's available. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SOURCE_ADDRESS = 'source.address' as const; /** * Source port number - * + * * @example 3389 - * * @example 2888 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SOURCE_PORT = 'source.port' as const; /** * Deprecated, use `db.client.connection.state` instead. - * + * * @example idle - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.state`. + * + * @deprecated Replaced by `db.client.connection.state`. */ export const ATTR_STATE = 'state' as const; @@ -5996,23 +6588,22 @@ export const STATE_VALUE_USED = "used" as const; /** * The logical CPU number [0..n-1] - * + * * @example 1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_CPU_LOGICAL_NUMBER = 'system.cpu.logical_number' as const; /** * Deprecated, use `cpu.mode` instead. - * + * * @example idle - * * @example interrupt - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `cpu.mode` + * + * @deprecated Replaced by `cpu.mode` */ export const ATTR_SYSTEM_CPU_STATE = 'system.cpu.state' as const; @@ -6053,36 +6644,36 @@ export const SYSTEM_CPU_STATE_VALUE_USER = "user" as const; /** * The device identifier - * + * * @example (identifier) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_DEVICE = 'system.device' as const; /** * The filesystem mode - * + * * @example rw, ro - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_FILESYSTEM_MODE = 'system.filesystem.mode' as const; /** * The filesystem mount path - * + * * @example /mnt/data - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_FILESYSTEM_MOUNTPOINT = 'system.filesystem.mountpoint' as const; /** * The filesystem state - * + * * @example used - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_FILESYSTEM_STATE = 'system.filesystem.state' as const; @@ -6104,9 +6695,9 @@ export const SYSTEM_FILESYSTEM_STATE_VALUE_USED = "used" as const; /** * The filesystem type - * + * * @example ext4 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_FILESYSTEM_TYPE = 'system.filesystem.type' as const; @@ -6143,11 +6734,10 @@ export const SYSTEM_FILESYSTEM_TYPE_VALUE_REFS = "refs" as const; /** * The memory state - * + * * @example free - * * @example cached - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_MEMORY_STATE = 'system.memory.state' as const; @@ -6178,10 +6768,10 @@ export const SYSTEM_MEMORY_STATE_VALUE_SHARED = "shared" as const; export const SYSTEM_MEMORY_STATE_VALUE_USED = "used" as const; /** - * A stateless protocol **MUST** **NOT** set this attribute - * + * A stateless protocol **MUST NOT** set this attribute + * * @example close_wait - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_NETWORK_STATE = 'system.network.state' as const; @@ -6248,9 +6838,9 @@ export const SYSTEM_NETWORK_STATE_VALUE_TIME_WAIT = "time_wait" as const; /** * The paging access direction - * + * * @example in - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_PAGING_DIRECTION = 'system.paging.direction' as const; @@ -6267,9 +6857,9 @@ export const SYSTEM_PAGING_DIRECTION_VALUE_OUT = "out" as const; /** * The memory paging state - * + * * @example free - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_PAGING_STATE = 'system.paging.state' as const; @@ -6286,9 +6876,9 @@ export const SYSTEM_PAGING_STATE_VALUE_USED = "used" as const; /** * The memory paging type - * + * * @example minor - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_PAGING_TYPE = 'system.paging.type' as const; @@ -6305,9 +6895,9 @@ export const SYSTEM_PAGING_TYPE_VALUE_MINOR = "minor" as const; /** * The process state, e.g., [Linux Process State Codes](https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES) - * + * * @example running - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_SYSTEM_PROCESS_STATUS = 'system.process.status' as const; @@ -6334,12 +6924,12 @@ export const SYSTEM_PROCESS_STATUS_VALUE_STOPPED = "stopped" as const; /** * Deprecated, use `system.process.status` instead. - * + * * @example running - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `system.process.status`. + * + * @deprecated Replaced by `system.process.status`. */ export const ATTR_SYSTEM_PROCESSES_STATUS = 'system.processes.status' as const; @@ -6365,45 +6955,42 @@ export const SYSTEM_PROCESSES_STATUS_VALUE_STOPPED = "stopped" as const; /** * The name of the auto instrumentation agent or distribution, if used. - * + * * @example parts-unlimited-java - * + * * @note Official auto instrumentation agents and distributions **SHOULD** set the `telemetry.distro.name` attribute to * a string starting with `opentelemetry-`, e.g. `opentelemetry-java-instrumentation`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TELEMETRY_DISTRO_NAME = 'telemetry.distro.name' as const; /** * The version string of the auto instrumentation agent or distribution, if used. - * + * * @example 1.2.3 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TELEMETRY_DISTRO_VERSION = 'telemetry.distro.version' as const; /** * The fully qualified human readable name of the [test case](https://en.wikipedia.org/wiki/Test_case). - * + * * @example org.example.TestCase1.test1 - * * @example example/tests/TestCase1.test1 - * * @example ExampleTestCase1_test1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TEST_CASE_NAME = 'test.case.name' as const; /** * The status of the actual test case result from test execution. - * + * * @example pass - * * @example fail - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TEST_CASE_RESULT_STATUS = 'test.case.result.status' as const; @@ -6420,28 +7007,23 @@ export const TEST_CASE_RESULT_STATUS_VALUE_PASS = "pass" as const; /** * The human readable name of a [test suite](https://en.wikipedia.org/wiki/Test_suite). - * + * * @example TestSuite1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TEST_SUITE_NAME = 'test.suite.name' as const; /** * The status of the test suite run. - * + * * @example success - * * @example failure - * * @example skipped - * * @example aborted - * * @example timed_out - * * @example in_progress - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TEST_SUITE_RUN_STATUS = 'test.suite.run.status' as const; @@ -6478,181 +7060,174 @@ export const TEST_SUITE_RUN_STATUS_VALUE_TIMED_OUT = "timed_out" as const; /** * Current "managed" thread ID (as opposed to OS thread ID). - * + * * @example 42 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_THREAD_ID = 'thread.id' as const; /** * Current thread name. - * + * * @example "main" - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_THREAD_NAME = 'thread.name' as const; /** * String indicating the [cipher](https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5) used during the current connection. - * + * * @example TLS_RSA_WITH_3DES_EDE_CBC_SHA - * * @example TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - * + * * @note The values allowed for `tls.cipher` **MUST** be one of the `Descriptions` of the [registered TLS Cipher Suits](https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CIPHER = 'tls.cipher' as const; /** * PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of `client.certificate_chain` since this value also exists in that list. - * + * * @example MII... - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_CERTIFICATE = 'tls.client.certificate' as const; /** * Array of PEM-encoded certificates that make up the certificate chain offered by the client. This is usually mutually-exclusive of `client.certificate` since that value should be the first certificate in the chain. - * - * @example MII... - * - * @example MI... - * + * + * @example ["MII...", "MI..."] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_CERTIFICATE_CHAIN = 'tls.client.certificate_chain' as const; /** * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the client. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 0F76C7F2C55BFD7D8E8B8F4BFBF0C9EC - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_HASH_MD5 = 'tls.client.hash.md5' as const; /** * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the client. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 9E393D93138888D288266C2D915214D1D1CCEB2A - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_HASH_SHA1 = 'tls.client.hash.sha1' as const; /** * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by the client. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 0687F666A054EF17A08E2F2162EAB4CBC0D265E1D7875BE74BF3C712CA92DAF0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_HASH_SHA256 = 'tls.client.hash.sha256' as const; /** * Distinguished name of [subject](https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6) of the issuer of the x.509 certificate presented by the client. - * + * * @example CN=Example Root CA, OU=Infrastructure Team, DC=example, DC=com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_ISSUER = 'tls.client.issuer' as const; /** * A hash that identifies clients based on how they perform an SSL/TLS handshake. - * + * * @example d4e5b18d6b55c71272893221c96ba240 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_JA3 = 'tls.client.ja3' as const; /** * Date/Time indicating when client certificate is no longer considered valid. - * + * * @example 2021-01-01T00:00:00.000Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_NOT_AFTER = 'tls.client.not_after' as const; /** * Date/Time indicating when client certificate is first considered valid. - * + * * @example 1970-01-01T00:00:00.000Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_NOT_BEFORE = 'tls.client.not_before' as const; /** * Deprecated, use `server.address` instead. - * + * * @example opentelemetry.io - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `server.address. + * + * @deprecated Replaced by `server.address`. */ export const ATTR_TLS_CLIENT_SERVER_NAME = 'tls.client.server_name' as const; /** * Distinguished name of subject of the x.509 certificate presented by the client. - * + * * @example CN=myclient, OU=Documentation Team, DC=example, DC=com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_SUBJECT = 'tls.client.subject' as const; /** * Array of ciphers offered by the client during the client hello. - * - * @example TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - * - * @example TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 - * - * @example ... - * + * + * @example ["TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CLIENT_SUPPORTED_CIPHERS = 'tls.client.supported_ciphers' as const; /** * String indicating the curve used for the given cipher, when applicable - * + * * @example secp256r1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_CURVE = 'tls.curve' as const; /** * Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted tunnel. - * + * * @example true - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_ESTABLISHED = 'tls.established' as const; /** * String indicating the protocol being tunneled. Per the values in the [IANA registry](https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids), this string should be lower case. - * + * * @example http/1.1 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_NEXT_PROTOCOL = 'tls.next_protocol' as const; /** * Normalized lowercase protocol name parsed from original string of the negotiated [SSL/TLS protocol version](https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_PROTOCOL_NAME = 'tls.protocol.name' as const; @@ -6669,308 +7244,291 @@ export const TLS_PROTOCOL_NAME_VALUE_TLS = "tls" as const; /** * Numeric part of the version parsed from the original string of the negotiated [SSL/TLS protocol version](https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES) - * + * * @example 1.2 - * * @example 3 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_PROTOCOL_VERSION = 'tls.protocol.version' as const; /** * Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation. - * + * * @example true - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_RESUMED = 'tls.resumed' as const; /** * PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of `server.certificate_chain` since this value also exists in that list. - * + * * @example MII... - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_CERTIFICATE = 'tls.server.certificate' as const; /** * Array of PEM-encoded certificates that make up the certificate chain offered by the server. This is usually mutually-exclusive of `server.certificate` since that value should be the first certificate in the chain. - * - * @example MII... - * - * @example MI... - * + * + * @example ["MII...", "MI..."] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_CERTIFICATE_CHAIN = 'tls.server.certificate_chain' as const; /** * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the server. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 0F76C7F2C55BFD7D8E8B8F4BFBF0C9EC - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_HASH_MD5 = 'tls.server.hash.md5' as const; /** * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the server. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 9E393D93138888D288266C2D915214D1D1CCEB2A - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_HASH_SHA1 = 'tls.server.hash.sha1' as const; /** * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by the server. For consistency with other hash values, this value should be formatted as an uppercase hash. - * + * * @example 0687F666A054EF17A08E2F2162EAB4CBC0D265E1D7875BE74BF3C712CA92DAF0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_HASH_SHA256 = 'tls.server.hash.sha256' as const; /** * Distinguished name of [subject](https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6) of the issuer of the x.509 certificate presented by the client. - * + * * @example CN=Example Root CA, OU=Infrastructure Team, DC=example, DC=com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_ISSUER = 'tls.server.issuer' as const; /** * A hash that identifies servers based on how they perform an SSL/TLS handshake. - * + * * @example d4e5b18d6b55c71272893221c96ba240 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_JA3S = 'tls.server.ja3s' as const; /** * Date/Time indicating when server certificate is no longer considered valid. - * + * * @example 2021-01-01T00:00:00.000Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_NOT_AFTER = 'tls.server.not_after' as const; /** * Date/Time indicating when server certificate is first considered valid. - * + * * @example 1970-01-01T00:00:00.000Z - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_NOT_BEFORE = 'tls.server.not_before' as const; /** * Distinguished name of subject of the x.509 certificate presented by the server. - * + * * @example CN=myserver, OU=Documentation Team, DC=example, DC=com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_TLS_SERVER_SUBJECT = 'tls.server.subject' as const; /** * Domain extracted from the `url.full`, such as "opentelemetry.io". - * + * * @example www.foo.bar - * * @example opentelemetry.io - * * @example 3.12.167.2 - * * @example [1080:0:0:0:8:800:200C:417A] - * + * * @note In some cases a URL may refer to an IP and/or port directly, without a domain name. In this case, the IP address would go to the domain field. If the URL contains a [literal IPv6 address](https://www.rfc-editor.org/rfc/rfc2732#section-2) enclosed by `[` and `]`, the `[` and `]` characters should also be captured in the domain field. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_DOMAIN = 'url.domain' as const; /** * The file extension extracted from the `url.full`, excluding the leading dot. - * + * * @example png - * * @example gz - * + * * @note The file extension is only set if it exists, as not every url has a file extension. When the file name has multiple extensions `example.tar.gz`, only the last one should be captured `gz`, not `tar.gz`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_EXTENSION = 'url.extension' as const; /** * Unmodified original URL as seen in the event source. - * + * * @example https://www.foo.bar/search?q=OpenTelemetry#SemConv - * * @example search?q=OpenTelemetry - * + * * @note In network monitoring, the observed URL may be a full URL, whereas in access logs, the URL is often just represented as a path. This field is meant to represent the URL as it was observed, complete or not. - * `url.original` might contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case password and username **SHOULD** **NOT** be redacted and attribute's value **SHOULD** remain the same. - * + * `url.original` might contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case password and username **SHOULD NOT** be redacted and attribute's value **SHOULD** remain the same. + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_ORIGINAL = 'url.original' as const; /** * Port extracted from the `url.full` - * + * * @example 443 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_PORT = 'url.port' as const; /** * The highest registered url domain, stripped of the subdomain. - * + * * @example example.com - * * @example foo.co.uk - * + * * @note This value can be determined precisely with the [public suffix list](http://publicsuffix.org). For example, the registered domain for `foo.example.com` is `example.com`. Trying to approximate this by simply taking the last two labels will not work well for TLDs such as `co.uk`. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_REGISTERED_DOMAIN = 'url.registered_domain' as const; /** * The subdomain portion of a fully qualified domain name includes all of the names except the host name under the registered_domain. In a partially qualified domain, or if the qualification level of the full name cannot be determined, subdomain contains all of the names below the registered domain. - * + * * @example east - * * @example sub2.sub1 - * + * * @note The subdomain portion of `www.east.mydomain.co.uk` is `east`. If the domain has multiple levels of subdomain, such as `sub2.sub1.example.com`, the subdomain field should contain `sub2.sub1`, with no trailing period. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_SUBDOMAIN = 'url.subdomain' as const; /** * The low-cardinality template of an [absolute path reference](https://www.rfc-editor.org/rfc/rfc3986#section-4.2). - * + * * @example /users/{id} - * * @example /users/:id - * * @example /users?id={id} - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_TEMPLATE = 'url.template' as const; /** * The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is `com`. - * + * * @example com - * * @example co.uk - * + * * @note This value can be determined precisely with the [public suffix list](http://publicsuffix.org). - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_URL_TOP_LEVEL_DOMAIN = 'url.top_level_domain' as const; /** * User email address. - * + * * @example a.einstein@example.com - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_EMAIL = 'user.email' as const; /** * User's full name - * + * * @example Albert Einstein - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_FULL_NAME = 'user.full_name' as const; /** * Unique user hash to correlate information for a user in anonymized form. - * + * * @example 364fc68eaf4c8acec74a4e52d7d1feaa - * + * * @note Useful if `user.id` or `user.name` contain confidential information and cannot be used. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_HASH = 'user.hash' as const; /** * Unique identifier of the user. - * + * * @example S-1-5-21-202424912787-2692429404-2351956786-1000 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_ID = 'user.id' as const; /** * Short name or login/username of the user. - * + * * @example a.einstein - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_NAME = 'user.name' as const; /** * Array of user roles at the time of the event. - * - * @example admin - * - * @example reporting_user - * + * + * @example ["admin", "reporting_user"] + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_ROLES = 'user.roles' as const; /** * Name of the user-agent extracted from original. Usually refers to the browser's name. - * + * * @example Safari - * * @example YourApp - * + * * @note [Example](https://www.whatsmyua.info) of extracting browser's name from original string. In the case of using a user-agent for non-browser products, such as microservices with multiple names/versions inside the `user_agent.original`, the most significant name **SHOULD** be selected. In such a scenario it should align with `user_agent.version` - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_AGENT_NAME = 'user_agent.name' as const; /** * Version of the user-agent extracted from original. Usually refers to the browser's version - * + * * @example 14.1.2 - * * @example 1.0.0 - * + * * @note [Example](https://www.whatsmyua.info) of extracting browser's version from original string. In the case of using a user-agent for non-browser products, such as microservices with multiple names/versions inside the `user_agent.original`, the most significant version **SHOULD** be selected. In such a scenario it should align with `user_agent.name` - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_USER_AGENT_VERSION = 'user_agent.version' as const; /** * The type of garbage collection. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_V8JS_GC_TYPE = 'v8js.gc.type' as const; @@ -6997,9 +7555,9 @@ export const V8JS_GC_TYPE_VALUE_WEAKCB = "weakcb" as const; /** * The name of the space type of heap memory. - * + * * @note Value can be retrieved from value `space_name` of [`v8.getHeapSpaceStatistics()`](https://nodejs.org/api/v8.html#v8getheapspacestatistics) - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_V8JS_HEAP_SPACE_NAME = 'v8js.heap.space.name' as const; @@ -7031,48 +7589,42 @@ export const V8JS_HEAP_SPACE_NAME_VALUE_OLD_SPACE = "old_space" as const; /** * The ID of the change (pull request/merge request) if applicable. This is usually a unique (within repository) identifier generated by the VCS system. - * + * * @example 123 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_CHANGE_ID = 'vcs.repository.change.id' as const; /** * The human readable title of the change (pull request/merge request). This title is often a brief summary of the change and may get merged in to a ref as the commit summary. - * + * * @example Fixes broken thing - * * @example feat: add my new feature - * * @example [chore] update dependency - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_CHANGE_TITLE = 'vcs.repository.change.title' as const; /** * The name of the [reference](https://git-scm.com/docs/gitglossary#def_ref) such as **branch** or **tag** in the repository. - * + * * @example my-feature-branch - * * @example tag-1-test - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_REF_NAME = 'vcs.repository.ref.name' as const; /** * The revision, literally [revised version](https://www.merriam-webster.com/dictionary/revision), The revision most often refers to a commit object in Git, or a revision number in SVN. - * + * * @example 9d59409acf479dfa0df1aa568182e43e43df8bbe28d60fcf2bc52e30068802cc - * * @example main - * * @example 123 - * * @example HEAD - * + * * @note The revision can be a full [hash value (see glossary)](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf), * of the recorded change to a ref within a repository pointing to a * commit [commit](https://git-scm.com/docs/git-commit) object. It does @@ -7082,18 +7634,17 @@ export const ATTR_VCS_REPOSITORY_REF_NAME = 'vcs.repository.ref.name' as const; * it is identical to the `ref.name`, it **SHOULD** still be included. It is * up to the implementer to decide which value to set as the revision * based on the VCS system and situational context. - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_REF_REVISION = 'vcs.repository.ref.revision' as const; /** * The type of the [reference](https://git-scm.com/docs/gitglossary#def_ref) in the repository. - * + * * @example branch - * * @example tag - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_REF_TYPE = 'vcs.repository.ref.type' as const; @@ -7110,38 +7661,37 @@ export const VCS_REPOSITORY_REF_TYPE_VALUE_TAG = "tag" as const; /** * The [URL](https://en.wikipedia.org/wiki/URL) of the repository providing the complete address in order to locate and identify the repository. - * + * * @example https://github.com/opentelemetry/open-telemetry-collector-contrib - * * @example https://gitlab.com/my-org/my-project/my-projects-project/repo - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_VCS_REPOSITORY_URL_FULL = 'vcs.repository.url.full' as const; /** * Additional description of the web engine (e.g. detailed version and edition information). - * + * * @example WildFly Full 21.0.0.Final (WildFly Core 13.0.1.Final) - 2.2.2.Final - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_WEBENGINE_DESCRIPTION = 'webengine.description' as const; /** * The name of the web engine. - * + * * @example WildFly - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_WEBENGINE_NAME = 'webengine.name' as const; /** * The version of the web engine. - * + * * @example 21.0.0 - * + * * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const ATTR_WEBENGINE_VERSION = 'webengine.version' as const; diff --git a/semantic-conventions/src/experimental_metrics.ts b/semantic-conventions/src/experimental_metrics.ts index 5cd24283ba5..4c9a12271f6 100644 --- a/semantic-conventions/src/experimental_metrics.ts +++ b/semantic-conventions/src/experimental_metrics.ts @@ -20,1112 +20,1418 @@ /** * Total CPU time consumed - * + * * @note Total CPU time consumed by the specific container on all available CPU cores - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_CONTAINER_CPU_TIME = 'container.cpu.time' as const; +/** + * Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs + * + * @note CPU usage of the specific container on all available CPU cores, averaged over the sample window + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_CONTAINER_CPU_USAGE = 'container.cpu.usage' as const; + /** * Disk bytes for the container. - * + * * @note The total number of bytes read/written successfully (aggregated from all disks). - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_CONTAINER_DISK_IO = 'container.disk.io' as const; /** * Memory usage of the container. - * + * * @note Memory usage of the container. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_CONTAINER_MEMORY_USAGE = 'container.memory.usage' as const; /** * Network bytes for the container. - * + * * @note The number of bytes sent/received on all network interfaces by the container. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_CONTAINER_NETWORK_IO = 'container.network.io' as const; /** * The number of connections that are currently in state described by the `state` attribute - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_COUNT = 'db.client.connection.count' as const; /** * The time it took to create a new connection - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_CREATE_TIME = 'db.client.connection.create_time' as const; /** * The maximum number of idle open connections allowed - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_IDLE_MAX = 'db.client.connection.idle.max' as const; /** * The minimum number of idle open connections allowed - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_IDLE_MIN = 'db.client.connection.idle.min' as const; /** * The maximum number of open connections allowed - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_MAX = 'db.client.connection.max' as const; /** - * The number of pending requests for an open connection, cumulative for the entire pool - * + * The number of current pending requests for an open connection + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_PENDING_REQUESTS = 'db.client.connection.pending_requests' as const; /** * The number of connection timeouts that have occurred trying to obtain a connection from the pool - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_TIMEOUTS = 'db.client.connection.timeouts' as const; /** * The time between borrowing a connection and returning it to the pool - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_USE_TIME = 'db.client.connection.use_time' as const; /** * The time it took to obtain an open connection from the pool - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_CONNECTION_WAIT_TIME = 'db.client.connection.wait_time' as const; /** * Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from `ms` to `s`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.create_time`. Note: the unit also changed from `ms` to `s`. + * + * @deprecated Replaced by `db.client.connection.create_time`. Note: the unit also changed from `ms` to `s`. */ export const METRIC_DB_CLIENT_CONNECTIONS_CREATE_TIME = 'db.client.connections.create_time' as const; /** * Deprecated, use `db.client.connection.idle.max` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.idle.max`. + * + * @deprecated Replaced by `db.client.connection.idle.max`. */ export const METRIC_DB_CLIENT_CONNECTIONS_IDLE_MAX = 'db.client.connections.idle.max' as const; /** * Deprecated, use `db.client.connection.idle.min` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.idle.min`. + * + * @deprecated Replaced by `db.client.connection.idle.min`. */ export const METRIC_DB_CLIENT_CONNECTIONS_IDLE_MIN = 'db.client.connections.idle.min' as const; /** * Deprecated, use `db.client.connection.max` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.max`. + * + * @deprecated Replaced by `db.client.connection.max`. */ export const METRIC_DB_CLIENT_CONNECTIONS_MAX = 'db.client.connections.max' as const; /** * Deprecated, use `db.client.connection.pending_requests` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.pending_requests`. + * + * @deprecated Replaced by `db.client.connection.pending_requests`. */ export const METRIC_DB_CLIENT_CONNECTIONS_PENDING_REQUESTS = 'db.client.connections.pending_requests' as const; /** * Deprecated, use `db.client.connection.timeouts` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.timeouts`. + * + * @deprecated Replaced by `db.client.connection.timeouts`. */ export const METRIC_DB_CLIENT_CONNECTIONS_TIMEOUTS = 'db.client.connections.timeouts' as const; /** * Deprecated, use `db.client.connection.count` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.count`. + * + * @deprecated Replaced by `db.client.connection.count`. */ export const METRIC_DB_CLIENT_CONNECTIONS_USAGE = 'db.client.connections.usage' as const; /** * Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from `ms` to `s`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.use_time`. Note: the unit also changed from `ms` to `s`. + * + * @deprecated Replaced by `db.client.connection.use_time`. Note: the unit also changed from `ms` to `s`. */ export const METRIC_DB_CLIENT_CONNECTIONS_USE_TIME = 'db.client.connections.use_time' as const; /** * Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from `ms` to `s`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `db.client.connection.wait_time`. Note: the unit also changed from `ms` to `s`. + * + * @deprecated Replaced by `db.client.connection.wait_time`. Note: the unit also changed from `ms` to `s`. */ export const METRIC_DB_CLIENT_CONNECTIONS_WAIT_TIME = 'db.client.connections.wait_time' as const; /** * Duration of database client operations. - * + * * @note Batch operations **SHOULD** be recorded as a single operation. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DB_CLIENT_OPERATION_DURATION = 'db.client.operation.duration' as const; /** * Measures the time taken to perform a DNS lookup. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_DNS_LOOKUP_DURATION = 'dns.lookup.duration' as const; +/** + * The number of .NET assemblies that are currently loaded. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`AppDomain.CurrentDomain.GetAssemblies().Length`](https://learn.microsoft.com/dotnet/api/system.appdomain.getassemblies). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_ASSEMBLY_COUNT = 'dotnet.assembly.count' as const; + +/** + * The number of exceptions that have been thrown in managed code. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as counting calls to [`AppDomain.CurrentDomain.FirstChanceException`](https://learn.microsoft.com/dotnet/api/system.appdomain.firstchanceexception). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_EXCEPTIONS = 'dotnet.exceptions' as const; + +/** + * The number of garbage collections that have occurred since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric uses the [`GC.CollectionCount(int generation)`](https://learn.microsoft.com/dotnet/api/system.gc.collectioncount) API to calculate exclusive collections per generation. + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_COLLECTIONS = 'dotnet.gc.collections' as const; + +/** + * The *approximate* number of bytes allocated on the managed GC heap since the process has started. The returned value does not include any native allocations. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`GC.GetTotalAllocatedBytes()`](https://learn.microsoft.com/dotnet/api/system.gc.gettotalallocatedbytes). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_HEAP_TOTAL_ALLOCATED = 'dotnet.gc.heap.total_allocated' as const; + +/** + * The heap fragmentation, as observed during the latest garbage collection. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`GC.GetGCMemoryInfo().GenerationInfo.FragmentationAfterBytes`](https://learn.microsoft.com/dotnet/api/system.gcgenerationinfo.fragmentationafterbytes). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_LAST_COLLECTION_HEAP_FRAGMENTATION_SIZE = 'dotnet.gc.last_collection.heap.fragmentation.size' as const; + +/** + * The managed GC heap size (including fragmentation), as observed during the latest garbage collection. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`GC.GetGCMemoryInfo().GenerationInfo.SizeAfterBytes`](https://learn.microsoft.com/dotnet/api/system.gcgenerationinfo.sizeafterbytes). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_LAST_COLLECTION_HEAP_SIZE = 'dotnet.gc.last_collection.heap.size' as const; + +/** + * The amount of committed virtual memory in use by the .NET GC, as observed during the latest garbage collection. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`GC.GetGCMemoryInfo().TotalCommittedBytes`](https://learn.microsoft.com/dotnet/api/system.gcmemoryinfo.totalcommittedbytes). Committed virtual memory may be larger than the heap size because it includes both memory for storing existing objects (the heap size) and some extra memory that is ready to handle newly allocated objects in the future. + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_LAST_COLLECTION_MEMORY_COMMITTED_SIZE = 'dotnet.gc.last_collection.memory.committed_size' as const; + +/** + * The total amount of time paused in GC since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`GC.GetTotalPauseDuration()`](https://learn.microsoft.com/dotnet/api/system.gc.gettotalpauseduration). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_GC_PAUSE_TIME = 'dotnet.gc.pause.time' as const; + +/** + * The amount of time the JIT compiler has spent compiling methods since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`JitInfo.GetCompilationTime()`](https://learn.microsoft.com/dotnet/api/system.runtime.jitinfo.getcompilationtime). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_JIT_COMPILATION_TIME = 'dotnet.jit.compilation.time' as const; + +/** + * Count of bytes of intermediate language that have been compiled since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`JitInfo.GetCompiledILBytes()`](https://learn.microsoft.com/dotnet/api/system.runtime.jitinfo.getcompiledilbytes). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_JIT_COMPILED_IL_SIZE = 'dotnet.jit.compiled_il.size' as const; + +/** + * The number of times the JIT compiler (re)compiled methods since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`JitInfo.GetCompiledMethodCount()`](https://learn.microsoft.com/dotnet/api/system.runtime.jitinfo.getcompiledmethodcount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_JIT_COMPILED_METHODS = 'dotnet.jit.compiled_methods' as const; + +/** + * The number of times there was contention when trying to acquire a monitor lock since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`Monitor.LockContentionCount`](https://learn.microsoft.com/dotnet/api/system.threading.monitor.lockcontentioncount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_MONITOR_LOCK_CONTENTIONS = 'dotnet.monitor.lock_contentions' as const; + +/** + * The number of processors available to the process. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as accessing [`Environment.ProcessorCount`](https://learn.microsoft.com/dotnet/api/system.environment.processorcount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_PROCESS_CPU_COUNT = 'dotnet.process.cpu.count' as const; + +/** + * CPU time used by the process. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as accessing the corresponding processor time properties on [`System.Diagnostics.Process`](https://learn.microsoft.com/dotnet/api/system.diagnostics.process). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_PROCESS_CPU_TIME = 'dotnet.process.cpu.time' as const; + +/** + * The number of bytes of physical memory mapped to the process context. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`Environment.WorkingSet`](https://learn.microsoft.com/dotnet/api/system.environment.workingset). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_PROCESS_MEMORY_WORKING_SET = 'dotnet.process.memory.working_set' as const; + +/** + * The number of work items that are currently queued to be processed by the thread pool. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`ThreadPool.PendingWorkItemCount`](https://learn.microsoft.com/dotnet/api/system.threading.threadpool.pendingworkitemcount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_THREAD_POOL_QUEUE_LENGTH = 'dotnet.thread_pool.queue.length' as const; + +/** + * The number of thread pool threads that currently exist. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`ThreadPool.ThreadCount`](https://learn.microsoft.com/dotnet/api/system.threading.threadpool.threadcount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_THREAD_POOL_THREAD_COUNT = 'dotnet.thread_pool.thread.count' as const; + +/** + * The number of work items that the thread pool has completed since the process has started. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`ThreadPool.CompletedWorkItemCount`](https://learn.microsoft.com/dotnet/api/system.threading.threadpool.completedworkitemcount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_THREAD_POOL_WORK_ITEM_COUNT = 'dotnet.thread_pool.work_item.count' as const; + +/** + * The number of timer instances that are currently active. + * + * @note Meter name: `System.Runtime`; Added in: .NET 9.0. + * This metric reports the same values as calling [`Timer.ActiveCount`](https://learn.microsoft.com/dotnet/api/system.threading.timer.activecount). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_DOTNET_TIMER_COUNT = 'dotnet.timer.count' as const; + /** * Number of invocation cold starts - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_COLDSTARTS = 'faas.coldstarts' as const; /** * Distribution of CPU usage per invocation - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_CPU_USAGE = 'faas.cpu_usage' as const; /** * Number of invocation errors - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_ERRORS = 'faas.errors' as const; /** * Measures the duration of the function's initialization, such as a cold start - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_INIT_DURATION = 'faas.init_duration' as const; /** * Number of successful invocations - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_INVOCATIONS = 'faas.invocations' as const; /** * Measures the duration of the function's logic execution - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_INVOKE_DURATION = 'faas.invoke_duration' as const; /** * Distribution of max memory usage per invocation - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_MEM_USAGE = 'faas.mem_usage' as const; /** * Distribution of net I/O usage per invocation - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_NET_IO = 'faas.net_io' as const; /** * Number of invocation timeouts - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_FAAS_TIMEOUTS = 'faas.timeouts' as const; /** * GenAI operation duration - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GEN_AI_CLIENT_OPERATION_DURATION = 'gen_ai.client.operation.duration' as const; /** * Measures number of input and output tokens used - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GEN_AI_CLIENT_TOKEN_USAGE = 'gen_ai.client.token.usage' as const; /** * Generative AI server request duration such as time-to-last byte or last output token - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GEN_AI_SERVER_REQUEST_DURATION = 'gen_ai.server.request.duration' as const; /** * Time per output token generated after the first token for successful responses - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GEN_AI_SERVER_TIME_PER_OUTPUT_TOKEN = 'gen_ai.server.time_per_output_token' as const; /** * Time to generate first token for successful responses - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GEN_AI_SERVER_TIME_TO_FIRST_TOKEN = 'gen_ai.server.time_to_first_token' as const; /** * Heap size target percentage configured by the user, otherwise 100. - * + * * @note The value range is [0.0,100.0]. Computed from `/gc/gogc:percent`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_CONFIG_GOGC = 'go.config.gogc' as const; /** * Count of live goroutines. - * + * * @note Computed from `/sched/goroutines:goroutines`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_GOROUTINE_COUNT = 'go.goroutine.count' as const; /** * Memory allocated to the heap by the application. - * + * * @note Computed from `/gc/heap/allocs:bytes`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_MEMORY_ALLOCATED = 'go.memory.allocated' as const; /** * Count of allocations to the heap by the application. - * + * * @note Computed from `/gc/heap/allocs:objects`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_MEMORY_ALLOCATIONS = 'go.memory.allocations' as const; /** * Heap size target for the end of the GC cycle. - * + * * @note Computed from `/gc/heap/goal:bytes`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_MEMORY_GC_GOAL = 'go.memory.gc.goal' as const; /** * Go runtime memory limit configured by the user, if a limit exists. - * + * * @note Computed from `/gc/gomemlimit:bytes`. This metric is excluded if the limit obtained from the Go runtime is math.MaxInt64. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_MEMORY_LIMIT = 'go.memory.limit' as const; /** * Memory used by the Go runtime. - * + * * @note Computed from `(/memory/classes/total:bytes - /memory/classes/heap/released:bytes)`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_MEMORY_USED = 'go.memory.used' as const; /** * The number of OS threads that can execute user-level Go code simultaneously. - * + * * @note Computed from `/sched/gomaxprocs:threads`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_PROCESSOR_LIMIT = 'go.processor.limit' as const; /** * The time goroutines have spent in the scheduler in a runnable state before actually running. - * + * * @note Computed from `/sched/latencies:seconds`. Bucket boundaries are provided by the runtime, and are subject to change. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_GO_SCHEDULE_DURATION = 'go.schedule.duration' as const; /** * Number of active HTTP requests. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_CLIENT_ACTIVE_REQUESTS = 'http.client.active_requests' as const; /** * The duration of the successfully established outbound HTTP connections. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_CLIENT_CONNECTION_DURATION = 'http.client.connection.duration' as const; /** * Number of outbound HTTP connections that are currently active or idle on the client. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_CLIENT_OPEN_CONNECTIONS = 'http.client.open_connections' as const; /** * Size of HTTP client request bodies. - * + * * @note The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_CLIENT_REQUEST_BODY_SIZE = 'http.client.request.body.size' as const; /** * Size of HTTP client response bodies. - * + * * @note The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_CLIENT_RESPONSE_BODY_SIZE = 'http.client.response.body.size' as const; /** * Number of active HTTP server requests. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_SERVER_ACTIVE_REQUESTS = 'http.server.active_requests' as const; /** * Size of HTTP server request bodies. - * + * * @note The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_SERVER_REQUEST_BODY_SIZE = 'http.server.request.body.size' as const; /** * Size of HTTP server response bodies. - * + * * @note The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_HTTP_SERVER_RESPONSE_BODY_SIZE = 'http.server.response.body.size' as const; +/** + * Energy consumed by the component + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_HW_ENERGY = 'hw.energy' as const; + +/** + * Number of errors encountered by the component + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_HW_ERRORS = 'hw.errors' as const; + +/** + * Instantaneous power consumed by the component + * + * @note It is recommended to report `hw.energy` instead of `hw.power` when possible. + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_HW_POWER = 'hw.power' as const; + +/** + * Operational status: `1` (true) or `0` (false) for each of the possible states + * + * @note `hw.status` is currently specified as an *UpDownCounter* but would ideally be represented using a [*StateSet* as defined in OpenMetrics](https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#stateset). This semantic convention will be updated once *StateSet* is specified in OpenTelemetry. This planned change is not expected to have any consequence on the way users query their timeseries backend to retrieve the values of `hw.status` over time. + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_HW_STATUS = 'hw.status' as const; + /** * Number of buffers in the pool. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_JVM_BUFFER_COUNT = 'jvm.buffer.count' as const; /** * Measure of total memory capacity of buffers. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_JVM_BUFFER_MEMORY_LIMIT = 'jvm.buffer.memory.limit' as const; /** * Deprecated, use `jvm.buffer.memory.used` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `jvm.buffer.memory.used`. + * + * @deprecated Replaced by `jvm.buffer.memory.used`. */ export const METRIC_JVM_BUFFER_MEMORY_USAGE = 'jvm.buffer.memory.usage' as const; /** * Measure of memory used by buffers. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_JVM_BUFFER_MEMORY_USED = 'jvm.buffer.memory.used' as const; /** * Measure of initial memory requested. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_JVM_MEMORY_INIT = 'jvm.memory.init' as const; /** * Average CPU load of the whole system for the last minute as reported by the JVM. - * + * * @note The value range is [0,n], where n is the number of CPU cores - or a negative number if the value is not available. This utilization is not defined as being for the specific interval since last measurement (unlike `system.cpu.utilization`). [Reference](https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/OperatingSystemMXBean.html#getSystemLoadAverage()). - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_JVM_SYSTEM_CPU_LOAD_1M = 'jvm.system.cpu.load_1m' as const; /** - * Recent CPU utilization for the whole system as reported by the JVM. - * - * @note The value range is [0.0,1.0]. This utilization is not defined as being for the specific interval since last measurement (unlike `system.cpu.utilization`). [Reference](https://docs.oracle.com/en/java/javase/17/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getCpuLoad()). - * + * Recent CPU utilization for the whole system as reported by the JVM. + * + * @note The value range is [0.0,1.0]. This utilization is not defined as being for the specific interval since last measurement (unlike `system.cpu.utilization`). [Reference](https://docs.oracle.com/en/java/javase/17/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getCpuLoad()). + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_JVM_SYSTEM_CPU_UTILIZATION = 'jvm.system.cpu.utilization' as const; + +/** + * Total CPU time consumed + * + * @note Total CPU time consumed by the specific Node on all available CPU cores + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_K8S_NODE_CPU_TIME = 'k8s.node.cpu.time' as const; + +/** + * Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs + * + * @note CPU usage of the specific Node on all available CPU cores, averaged over the sample window + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_K8S_NODE_CPU_USAGE = 'k8s.node.cpu.usage' as const; + +/** + * Memory usage of the Node + * + * @note Total memory usage of the Node + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_K8S_NODE_MEMORY_USAGE = 'k8s.node.memory.usage' as const; + +/** + * Total CPU time consumed + * + * @note Total CPU time consumed by the specific Pod on all available CPU cores + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_K8S_POD_CPU_TIME = 'k8s.pod.cpu.time' as const; + +/** + * Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs + * + * @note CPU usage of the specific Pod on all available CPU cores, averaged over the sample window + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_K8S_POD_CPU_USAGE = 'k8s.pod.cpu.usage' as const; + +/** + * Memory usage of the Pod + * + * @note Total memory usage of the Pod + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ -export const METRIC_JVM_SYSTEM_CPU_UTILIZATION = 'jvm.system.cpu.utilization' as const; +export const METRIC_K8S_POD_MEMORY_USAGE = 'k8s.pod.memory.usage' as const; /** * Number of messages that were delivered to the application. - * + * * @note Records the number of messages pulled from the broker or number of messages dispatched to the application in push-based scenarios. * The metric **SHOULD** be reported once per message delivery. For example, if receiving and processing operations are both instrumented for a single message delivery, this counter is incremented when the message is received and not reported when it is processed. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_MESSAGING_CLIENT_CONSUMED_MESSAGES = 'messaging.client.consumed.messages' as const; /** * Duration of messaging operation initiated by a producer or consumer client. - * - * @note This metric **SHOULD** **NOT** be used to report processing duration - processing duration is reported in `messaging.process.duration` metric. - * + * + * @note This metric **SHOULD NOT** be used to report processing duration - processing duration is reported in `messaging.process.duration` metric. + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_MESSAGING_CLIENT_OPERATION_DURATION = 'messaging.client.operation.duration' as const; /** - * Number of messages producer attempted to publish to the broker. - * - * @note This metric **MUST** **NOT** count messages that were created haven't yet been attempted to be published. - * + * Deprecated. Use `messaging.client.sent.messages` instead. + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + * + * @deprecated Replaced by `messaging.client.sent.messages`. */ export const METRIC_MESSAGING_CLIENT_PUBLISHED_MESSAGES = 'messaging.client.published.messages' as const; +/** + * Number of messages producer attempted to send to the broker. + * + * @note This metric **MUST NOT** count messages that were created but haven't yet been sent. + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_MESSAGING_CLIENT_SENT_MESSAGES = 'messaging.client.sent.messages' as const; + /** * Duration of processing operation. - * + * * @note This metric **MUST** be reported for operations with `messaging.operation.type` that matches `process`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_MESSAGING_PROCESS_DURATION = 'messaging.process.duration' as const; /** * Deprecated. Use `messaging.client.consumed.messages` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.client.consumed.messages`. + * + * @deprecated Replaced by `messaging.client.consumed.messages`. */ export const METRIC_MESSAGING_PROCESS_MESSAGES = 'messaging.process.messages' as const; /** * Deprecated. Use `messaging.client.operation.duration` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.client.operation.duration`. + * + * @deprecated Replaced by `messaging.client.operation.duration`. */ export const METRIC_MESSAGING_PUBLISH_DURATION = 'messaging.publish.duration' as const; /** * Deprecated. Use `messaging.client.produced.messages` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.client.produced.messages`. + * + * @deprecated Replaced by `messaging.client.produced.messages`. */ export const METRIC_MESSAGING_PUBLISH_MESSAGES = 'messaging.publish.messages' as const; /** * Deprecated. Use `messaging.client.operation.duration` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.client.operation.duration`. + * + * @deprecated Replaced by `messaging.client.operation.duration`. */ export const METRIC_MESSAGING_RECEIVE_DURATION = 'messaging.receive.duration' as const; /** * Deprecated. Use `messaging.client.consumed.messages` instead. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. - * - * @deprecated * Replaced by `messaging.client.consumed.messages`. + * + * @deprecated Replaced by `messaging.client.consumed.messages`. */ export const METRIC_MESSAGING_RECEIVE_MESSAGES = 'messaging.receive.messages' as const; /** * Event loop maximum delay. - * + * * @note Value can be retrieved from value `histogram.max` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_MAX = 'nodejs.eventloop.delay.max' as const; /** * Event loop mean delay. - * + * * @note Value can be retrieved from value `histogram.mean` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_MEAN = 'nodejs.eventloop.delay.mean' as const; /** * Event loop minimum delay. - * + * * @note Value can be retrieved from value `histogram.min` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_MIN = 'nodejs.eventloop.delay.min' as const; /** * Event loop 50 percentile delay. - * + * * @note Value can be retrieved from value `histogram.percentile(50)` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_P50 = 'nodejs.eventloop.delay.p50' as const; /** * Event loop 90 percentile delay. - * + * * @note Value can be retrieved from value `histogram.percentile(90)` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_P90 = 'nodejs.eventloop.delay.p90' as const; /** * Event loop 99 percentile delay. - * + * * @note Value can be retrieved from value `histogram.percentile(99)` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_P99 = 'nodejs.eventloop.delay.p99' as const; /** * Event loop standard deviation delay. - * + * * @note Value can be retrieved from value `histogram.stddev` of [`perf_hooks.monitorEventLoopDelay([options])`](https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_DELAY_STDDEV = 'nodejs.eventloop.delay.stddev' as const; +/** + * Cumulative duration of time the event loop has been in each state. + * + * @note Value can be retrieved from [`performance.eventLoopUtilization([utilization1[, utilization2]])`](https://nodejs.org/api/perf_hooks.html#performanceeventlooputilizationutilization1-utilization2) + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_NODEJS_EVENTLOOP_TIME = 'nodejs.eventloop.time' as const; + /** * Event loop utilization. - * - * @note The value range is [0.0,1.0] and can be retrieved from value [`performance.eventLoopUtilization([utilization1[, utilization2]])`](https://nodejs.org/api/perf_hooks.html#performanceeventlooputilizationutilization1-utilization2) - * + * + * @note The value range is [0.0, 1.0] and can be retrieved from [`performance.eventLoopUtilization([utilization1[, utilization2]])`](https://nodejs.org/api/perf_hooks.html#performanceeventlooputilizationutilization1-utilization2) + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_NODEJS_EVENTLOOP_UTILIZATION = 'nodejs.eventloop.utilization' as const; /** * Number of times the process has been context switched. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_CONTEXT_SWITCHES = 'process.context_switches' as const; /** * Total CPU seconds broken down by different states. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_CPU_TIME = 'process.cpu.time' as const; /** * Difference in process.cpu.time since the last measurement, divided by the elapsed time and number of CPUs available to the process. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_CPU_UTILIZATION = 'process.cpu.utilization' as const; /** * Disk bytes transferred. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_DISK_IO = 'process.disk.io' as const; /** * The amount of physical memory in use. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_MEMORY_USAGE = 'process.memory.usage' as const; /** * The amount of committed virtual memory. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_MEMORY_VIRTUAL = 'process.memory.virtual' as const; /** * Network bytes transferred. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_NETWORK_IO = 'process.network.io' as const; /** * Number of file descriptors in use by the process. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_OPEN_FILE_DESCRIPTOR_COUNT = 'process.open_file_descriptor.count' as const; /** * Number of page faults the process has made. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_PAGING_FAULTS = 'process.paging.faults' as const; /** * Process threads count. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_PROCESS_THREAD_COUNT = 'process.thread.count' as const; +/** + * The time the process has been running. + * + * @note Instrumentations **SHOULD** use counter with type `double` and measure uptime with at least millisecond precision + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_PROCESS_UPTIME = 'process.uptime' as const; + /** * Measures the duration of outbound RPC. - * + * * @note While streaming RPCs may record this metric as start-of-batch * to end-of-batch, it's hard to interpret in practice. * * **Streaming**: N/A. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_CLIENT_DURATION = 'rpc.client.duration' as const; /** * Measures the size of RPC request messages (uncompressed). - * + * * @note **Streaming**: Recorded per message in a streaming batch - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_CLIENT_REQUEST_SIZE = 'rpc.client.request.size' as const; /** * Measures the number of messages received per RPC. - * + * * @note Should be 1 for all non-streaming RPCs. * * **Streaming**: This metric is required for server and client streaming RPCs - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_CLIENT_REQUESTS_PER_RPC = 'rpc.client.requests_per_rpc' as const; /** * Measures the size of RPC response messages (uncompressed). - * + * * @note **Streaming**: Recorded per response in a streaming batch - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_CLIENT_RESPONSE_SIZE = 'rpc.client.response.size' as const; /** * Measures the number of messages sent per RPC. - * + * * @note Should be 1 for all non-streaming RPCs. * * **Streaming**: This metric is required for server and client streaming RPCs - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_CLIENT_RESPONSES_PER_RPC = 'rpc.client.responses_per_rpc' as const; /** * Measures the duration of inbound RPC. - * + * * @note While streaming RPCs may record this metric as start-of-batch * to end-of-batch, it's hard to interpret in practice. * * **Streaming**: N/A. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_SERVER_DURATION = 'rpc.server.duration' as const; /** * Measures the size of RPC request messages (uncompressed). - * + * * @note **Streaming**: Recorded per message in a streaming batch - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_SERVER_REQUEST_SIZE = 'rpc.server.request.size' as const; /** * Measures the number of messages received per RPC. - * + * * @note Should be 1 for all non-streaming RPCs. * * **Streaming** : This metric is required for server and client streaming RPCs - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_SERVER_REQUESTS_PER_RPC = 'rpc.server.requests_per_rpc' as const; /** * Measures the size of RPC response messages (uncompressed). - * + * * @note **Streaming**: Recorded per response in a streaming batch - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_SERVER_RESPONSE_SIZE = 'rpc.server.response.size' as const; /** * Measures the number of messages sent per RPC. - * + * * @note Should be 1 for all non-streaming RPCs. * * **Streaming**: This metric is required for server and client streaming RPCs - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_RPC_SERVER_RESPONSES_PER_RPC = 'rpc.server.responses_per_rpc' as const; /** * Reports the current frequency of the CPU in Hz - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_CPU_FREQUENCY = 'system.cpu.frequency' as const; /** * Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_CPU_LOGICAL_COUNT = 'system.cpu.logical.count' as const; /** * Reports the number of actual physical processor cores on the hardware - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_CPU_PHYSICAL_COUNT = 'system.cpu.physical.count' as const; /** * Seconds each logical CPU spent on each mode - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_CPU_TIME = 'system.cpu.time' as const; /** * Difference in system.cpu.time since the last measurement, divided by the elapsed time and number of logical CPUs - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_CPU_UTILIZATION = 'system.cpu.utilization' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_DISK_IO = 'system.disk.io' as const; /** * Time disk spent activated - * + * * @note The real elapsed time ("wall clock") used in the I/O path (time from operations running in parallel are not counted). Measured as: * - * - Linux: Field 13 from [procfs-diskstats](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) - * - Windows: The complement of - * ["Disk\% Idle Time"](https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained) - * performance counter: `uptime * (100 - "Disk\% Idle Time") / 100` - * + * - Linux: Field 13 from [procfs-diskstats](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) + * - Windows: The complement of + * ["Disk% Idle Time"](https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained) + * performance counter: `uptime * (100 - "Disk\% Idle Time") / 100` + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_DISK_IO_TIME = 'system.disk.io_time' as const; /** + * The total storage capacity of the disk + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_SYSTEM_DISK_LIMIT = 'system.disk.limit' as const; - * +/** * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_DISK_MERGED = 'system.disk.merged' as const; /** * Sum of the time each operation took to complete - * + * * @note Because it is the sum of time each request took, parallel-issued requests each contribute to make the count grow. Measured as: * - * - Linux: Fields 7 & 11 from [procfs-diskstats](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) - * - Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter (similar for Writes) - * + * - Linux: Fields 7 & 11 from [procfs-diskstats](https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats) + * - Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter (similar for Writes) + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_DISK_OPERATION_TIME = 'system.disk.operation_time' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_DISK_OPERATIONS = 'system.disk.operations' as const; /** + * The total storage capacity of the filesystem + * + * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. + */ +export const METRIC_SYSTEM_FILESYSTEM_LIMIT = 'system.filesystem.limit' as const; - * +/** + * Reports a filesystem's space usage across different states. + * + * @note The sum of all `system.filesystem.usage` values over the different `system.filesystem.state` attributes + * **SHOULD** equal the total storage capacity of the filesystem, that is `system.filesystem.limit`. + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_FILESYSTEM_USAGE = 'system.filesystem.usage' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_FILESYSTEM_UTILIZATION = 'system.filesystem.utilization' as const; /** * An estimate of how much memory is available for starting new applications, without causing swapping - * + * * @note This is an alternative to `system.memory.usage` metric with `state=free`. * Linux starting from 3.14 exports "available" memory. It takes "free" memory as a baseline, and then factors in kernel-specific values. * This is supposed to be more accurate than just "free" memory. * For reference, see the calculations [here](https://superuser.com/a/980821). * See also `MemAvailable` in [/proc/meminfo](https://man7.org/linux/man-pages/man5/proc.5.html). - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_LINUX_MEMORY_AVAILABLE = 'system.linux.memory.available' as const; /** * Reports the memory used by the Linux kernel for managing caches of frequently used objects. - * + * * @note The sum over the `reclaimable` and `unreclaimable` state values in `linux.memory.slab.usage` **SHOULD** be equal to the total slab memory available on the system. * Note that the total slab memory is not constant and may vary over time. * See also the [Slab allocator](https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics) and `Slab` in [/proc/meminfo](https://man7.org/linux/man-pages/man5/proc.5.html). - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_LINUX_MEMORY_SLAB_USAGE = 'system.linux.memory.slab.usage' as const; /** * Total memory available in the system. - * + * * @note Its value **SHOULD** equal the sum of `system.memory.state` over all states. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_MEMORY_LIMIT = 'system.memory.limit' as const; /** * Shared memory used (mostly by tmpfs). - * + * * @note Equivalent of `shared` from [`free` command](https://man7.org/linux/man-pages/man1/free.1.html) or * `Shmem` from [`/proc/meminfo`](https://man7.org/linux/man-pages/man5/proc.5.html)" - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_MEMORY_SHARED = 'system.memory.shared' as const; /** * Reports memory in use by state. - * + * * @note The sum over all `system.memory.state` values **SHOULD** equal the total memory * available on the system, that is `system.memory.limit`. - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_MEMORY_USAGE = 'system.memory.usage' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_MEMORY_UTILIZATION = 'system.memory.utilization' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_NETWORK_CONNECTIONS = 'system.network.connections' as const; /** * Count of packets that are dropped or discarded even though there was no error - * + * * @note Measured as: * - * - Linux: the `drop` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)) - * - Windows: [`InDiscards`/`OutDiscards`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2) - * from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2) - * + * - Linux: the `drop` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)) + * - Windows: [`InDiscards`/`OutDiscards`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2) + * from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2) + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_NETWORK_DROPPED = 'system.network.dropped' as const; /** * Count of network errors detected - * + * * @note Measured as: * - * - Linux: the `errs` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)). - * - Windows: [`InErrors`/`OutErrors`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2) - * from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2). - * + * - Linux: the `errs` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)). + * - Windows: [`InErrors`/`OutErrors`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2) + * from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2). + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_NETWORK_ERRORS = 'system.network.errors' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_NETWORK_IO = 'system.network.io' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_NETWORK_PACKETS = 'system.network.packets' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PAGING_FAULTS = 'system.paging.faults' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PAGING_OPERATIONS = 'system.paging.operations' as const; /** * Unix swap or windows pagefile usage - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PAGING_USAGE = 'system.paging.usage' as const; /** - - * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PAGING_UTILIZATION = 'system.paging.utilization' as const; /** * Total number of processes in each state - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PROCESS_COUNT = 'system.process.count' as const; /** * Total number of processes created over uptime of the host - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_SYSTEM_PROCESS_CREATED = 'system.process.created' as const; /** * Garbage collection duration. - * + * * @note The values can be retrieve from [`perf_hooks.PerformanceObserver(...).observe({ entryTypes: ['gc'] })`](https://nodejs.org/api/perf_hooks.html#performanceobserverobserveoptions) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_V8JS_GC_DURATION = 'v8js.gc.duration' as const; /** * Heap space available size. - * + * * @note Value can be retrieved from value `space_available_size` of [`v8.getHeapSpaceStatistics()`](https://nodejs.org/api/v8.html#v8getheapspacestatistics) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_V8JS_HEAP_SPACE_AVAILABLE_SIZE = 'v8js.heap.space.available_size' as const; /** * Committed size of a heap space. - * + * * @note Value can be retrieved from value `physical_space_size` of [`v8.getHeapSpaceStatistics()`](https://nodejs.org/api/v8.html#v8getheapspacestatistics) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_V8JS_HEAP_SPACE_PHYSICAL_SIZE = 'v8js.heap.space.physical_size' as const; /** * Total heap memory size pre-allocated. - * + * * @note The value can be retrieved from value `space_size` of [`v8.getHeapSpaceStatistics()`](https://nodejs.org/api/v8.html#v8getheapspacestatistics) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_V8JS_MEMORY_HEAP_LIMIT = 'v8js.memory.heap.limit' as const; /** * Heap Memory size allocated. - * + * * @note The value can be retrieved from value `space_used_size` of [`v8.getHeapSpaceStatistics()`](https://nodejs.org/api/v8.html#v8getheapspacestatistics) - * + * * @experimental This metric is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`. */ export const METRIC_V8JS_MEMORY_HEAP_USED = 'v8js.memory.heap.used' as const; diff --git a/semantic-conventions/src/resource/SemanticResourceAttributes.ts b/semantic-conventions/src/resource/SemanticResourceAttributes.ts index e69bb8e56e7..cd16b30ac13 100644 --- a/semantic-conventions/src/resource/SemanticResourceAttributes.ts +++ b/semantic-conventions/src/resource/SemanticResourceAttributes.ts @@ -111,21 +111,21 @@ const TMP_WEBENGINE_DESCRIPTION = 'webengine.description'; /** * Name of the cloud provider. * - * @deprecated use ATTR_CLOUD_PROVIDER + * @deprecated Use ATTR_CLOUD_PROVIDER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CLOUD_PROVIDER = TMP_CLOUD_PROVIDER; /** * The cloud account ID the resource is assigned to. * - * @deprecated use ATTR_CLOUD_ACCOUNT_ID + * @deprecated Use ATTR_CLOUD_ACCOUNT_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CLOUD_ACCOUNT_ID = TMP_CLOUD_ACCOUNT_ID; /** * The geographical region the resource is running. Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations). * - * @deprecated use ATTR_CLOUD_REGION + * @deprecated Use ATTR_CLOUD_REGION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CLOUD_REGION = TMP_CLOUD_REGION; @@ -134,7 +134,7 @@ export const SEMRESATTRS_CLOUD_REGION = TMP_CLOUD_REGION; * * Note: Availability zones are called "zones" on Alibaba Cloud and Google Cloud. * - * @deprecated use ATTR_CLOUD_AVAILABILITY_ZONE + * @deprecated Use ATTR_CLOUD_AVAILABILITY_ZONE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CLOUD_AVAILABILITY_ZONE = TMP_CLOUD_AVAILABILITY_ZONE; @@ -143,56 +143,56 @@ export const SEMRESATTRS_CLOUD_AVAILABILITY_ZONE = TMP_CLOUD_AVAILABILITY_ZONE; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated use ATTR_CLOUD_PLATFORM + * @deprecated Use ATTR_CLOUD_PLATFORM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CLOUD_PLATFORM = TMP_CLOUD_PLATFORM; /** * The Amazon Resource Name (ARN) of an [ECS container instance](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html). * - * @deprecated use ATTR_AWS_ECS_CONTAINER_ARN + * @deprecated Use ATTR_AWS_ECS_CONTAINER_ARN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_CONTAINER_ARN = TMP_AWS_ECS_CONTAINER_ARN; /** * The ARN of an [ECS cluster](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html). * - * @deprecated use ATTR_AWS_ECS_CLUSTER_ARN + * @deprecated Use ATTR_AWS_ECS_CLUSTER_ARN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_CLUSTER_ARN = TMP_AWS_ECS_CLUSTER_ARN; /** * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. * - * @deprecated use ATTR_AWS_ECS_LAUNCHTYPE + * @deprecated Use ATTR_AWS_ECS_LAUNCHTYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_LAUNCHTYPE = TMP_AWS_ECS_LAUNCHTYPE; /** * The ARN of an [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html). * - * @deprecated use ATTR_AWS_ECS_TASK_ARN + * @deprecated Use ATTR_AWS_ECS_TASK_ARN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_TASK_ARN = TMP_AWS_ECS_TASK_ARN; /** * The task definition family this task definition is a member of. * - * @deprecated use ATTR_AWS_ECS_TASK_FAMILY + * @deprecated Use ATTR_AWS_ECS_TASK_FAMILY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_TASK_FAMILY = TMP_AWS_ECS_TASK_FAMILY; /** * The revision for this task definition. * - * @deprecated use ATTR_AWS_ECS_TASK_REVISION + * @deprecated Use ATTR_AWS_ECS_TASK_REVISION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_ECS_TASK_REVISION = TMP_AWS_ECS_TASK_REVISION; /** * The ARN of an EKS cluster. * - * @deprecated use ATTR_AWS_EKS_CLUSTER_ARN + * @deprecated Use ATTR_AWS_EKS_CLUSTER_ARN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_EKS_CLUSTER_ARN = TMP_AWS_EKS_CLUSTER_ARN; @@ -201,7 +201,7 @@ export const SEMRESATTRS_AWS_EKS_CLUSTER_ARN = TMP_AWS_EKS_CLUSTER_ARN; * * Note: Multiple log groups must be supported for cases like multi-container applications, where a single application has sidecar containers, and each write to their own log group. * - * @deprecated use ATTR_AWS_LOG_GROUP_NAMES + * @deprecated Use ATTR_AWS_LOG_GROUP_NAMES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_LOG_GROUP_NAMES = TMP_AWS_LOG_GROUP_NAMES; @@ -210,14 +210,14 @@ export const SEMRESATTRS_AWS_LOG_GROUP_NAMES = TMP_AWS_LOG_GROUP_NAMES; * * Note: See the [log group ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). * - * @deprecated use ATTR_AWS_LOG_GROUP_ARNS + * @deprecated Use ATTR_AWS_LOG_GROUP_ARNS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_LOG_GROUP_ARNS = TMP_AWS_LOG_GROUP_ARNS; /** * The name(s) of the AWS log stream(s) an application is writing to. * - * @deprecated use ATTR_AWS_LOG_STREAM_NAMES + * @deprecated Use ATTR_AWS_LOG_STREAM_NAMES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_LOG_STREAM_NAMES = TMP_AWS_LOG_STREAM_NAMES; @@ -226,49 +226,49 @@ export const SEMRESATTRS_AWS_LOG_STREAM_NAMES = TMP_AWS_LOG_STREAM_NAMES; * * Note: See the [log stream ARN format documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format). One log group can contain several log streams, so these ARNs necessarily identify both a log group and a log stream. * - * @deprecated use ATTR_AWS_LOG_STREAM_ARNS + * @deprecated Use ATTR_AWS_LOG_STREAM_ARNS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_AWS_LOG_STREAM_ARNS = TMP_AWS_LOG_STREAM_ARNS; /** * Container name. * - * @deprecated use ATTR_CONTAINER_NAME + * @deprecated Use ATTR_CONTAINER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CONTAINER_NAME = TMP_CONTAINER_NAME; /** * Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. * - * @deprecated use ATTR_CONTAINER_ID + * @deprecated Use ATTR_CONTAINER_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CONTAINER_ID = TMP_CONTAINER_ID; /** * The container runtime managing this container. * - * @deprecated use ATTR_CONTAINER_RUNTIME + * @deprecated Use ATTR_CONTAINER_RUNTIME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CONTAINER_RUNTIME = TMP_CONTAINER_RUNTIME; /** * Name of the image the container was built on. * - * @deprecated use ATTR_CONTAINER_IMAGE_NAME + * @deprecated Use ATTR_CONTAINER_IMAGE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CONTAINER_IMAGE_NAME = TMP_CONTAINER_IMAGE_NAME; /** * Container image tag. * - * @deprecated use ATTR_CONTAINER_IMAGE_TAG + * @deprecated Use ATTR_CONTAINER_IMAGE_TAGS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_CONTAINER_IMAGE_TAG = TMP_CONTAINER_IMAGE_TAG; /** * Name of the [deployment environment](https://en.wikipedia.org/wiki/Deployment_environment) (aka deployment tier). * - * @deprecated use ATTR_DEPLOYMENT_ENVIRONMENT + * @deprecated Use ATTR_DEPLOYMENT_ENVIRONMENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_DEPLOYMENT_ENVIRONMENT = TMP_DEPLOYMENT_ENVIRONMENT; @@ -277,7 +277,7 @@ export const SEMRESATTRS_DEPLOYMENT_ENVIRONMENT = TMP_DEPLOYMENT_ENVIRONMENT; * * Note: The device identifier MUST only be defined using the values outlined below. This value is not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this value MUST be equal to the [vendor identifier](https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor). On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation ID or a globally unique UUID which is persisted across sessions in your application. More information can be found [here](https://developer.android.com/training/articles/user-data-ids) on best practices and exact implementation details. Caution should be taken when storing personal data or anything which can identify a user. GDPR and data protection laws may apply, ensure you do your own due diligence. * - * @deprecated use ATTR_DEVICE_ID + * @deprecated Use ATTR_DEVICE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_DEVICE_ID = TMP_DEVICE_ID; @@ -286,7 +286,7 @@ export const SEMRESATTRS_DEVICE_ID = TMP_DEVICE_ID; * * Note: It's recommended this value represents a machine readable version of the model identifier rather than the market or consumer-friendly name of the device. * - * @deprecated use ATTR_DEVICE_MODEL_IDENTIFIER + * @deprecated Use ATTR_DEVICE_MODEL_IDENTIFIER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_DEVICE_MODEL_IDENTIFIER = TMP_DEVICE_MODEL_IDENTIFIER; @@ -295,7 +295,7 @@ export const SEMRESATTRS_DEVICE_MODEL_IDENTIFIER = TMP_DEVICE_MODEL_IDENTIFIER; * * Note: It's recommended this value represents a human readable version of the device model rather than a machine readable alternative. * - * @deprecated use ATTR_DEVICE_MODEL_NAME + * @deprecated Use ATTR_DEVICE_MODEL_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_DEVICE_MODEL_NAME = TMP_DEVICE_MODEL_NAME; @@ -304,7 +304,7 @@ export const SEMRESATTRS_DEVICE_MODEL_NAME = TMP_DEVICE_MODEL_NAME; * * Note: This is the name of the function as configured/deployed on the FaaS platform and is usually different from the name of the callback function (which may be stored in the [`code.namespace`/`code.function`](../../trace/semantic_conventions/span-general.md#source-code-attributes) span attributes). * - * @deprecated use ATTR_FAAS_NAME + * @deprecated Use ATTR_FAAS_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_FAAS_NAME = TMP_FAAS_NAME; @@ -326,7 +326,7 @@ part of the ARN is not available without calling another AWS API which may be deemed too slow for a short-running lambda function. As an alternative, consider setting `faas.id` as a span attribute instead. * -* @deprecated use ATTR_FAAS_ID +* @deprecated Use ATTR_CLOUD_RESOURCE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_FAAS_ID = TMP_FAAS_ID; @@ -343,7 +343,7 @@ export const SEMRESATTRS_FAAS_ID = TMP_FAAS_ID; [`K_REVISION` environment variable](https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically). * **Azure Functions:** Not applicable. Do not set this attribute. * -* @deprecated use ATTR_FAAS_VERSION +* @deprecated Use ATTR_FAAS_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_FAAS_VERSION = TMP_FAAS_VERSION; @@ -352,7 +352,7 @@ export const SEMRESATTRS_FAAS_VERSION = TMP_FAAS_VERSION; * * Note: * **AWS Lambda:** Use the (full) log stream name. * - * @deprecated use ATTR_FAAS_INSTANCE + * @deprecated Use ATTR_FAAS_INSTANCE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_FAAS_INSTANCE = TMP_FAAS_INSTANCE; @@ -361,287 +361,287 @@ export const SEMRESATTRS_FAAS_INSTANCE = TMP_FAAS_INSTANCE; * * Note: It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable `AWS_LAMBDA_FUNCTION_MEMORY_SIZE` provides this information. * - * @deprecated use ATTR_FAAS_MAX_MEMORY + * @deprecated Use ATTR_FAAS_MAX_MEMORY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_FAAS_MAX_MEMORY = TMP_FAAS_MAX_MEMORY; /** * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. * - * @deprecated use ATTR_HOST_ID + * @deprecated Use ATTR_HOST_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_ID = TMP_HOST_ID; /** * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully qualified hostname, or another name specified by the user. * - * @deprecated use ATTR_HOST_NAME + * @deprecated Use ATTR_HOST_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_NAME = TMP_HOST_NAME; /** * Type of host. For Cloud, this must be the machine type. * - * @deprecated use ATTR_HOST_TYPE + * @deprecated Use ATTR_HOST_TYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_TYPE = TMP_HOST_TYPE; /** * The CPU architecture the host system is running on. * - * @deprecated use ATTR_HOST_ARCH + * @deprecated Use ATTR_HOST_ARCH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_ARCH = TMP_HOST_ARCH; /** * Name of the VM image or OS install the host was instantiated from. * - * @deprecated use ATTR_HOST_IMAGE_NAME + * @deprecated Use ATTR_HOST_IMAGE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_IMAGE_NAME = TMP_HOST_IMAGE_NAME; /** * VM image ID. For Cloud, this value is from the provider. * - * @deprecated use ATTR_HOST_IMAGE_ID + * @deprecated Use ATTR_HOST_IMAGE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_IMAGE_ID = TMP_HOST_IMAGE_ID; /** * The version string of the VM image as defined in [Version Attributes](README.md#version-attributes). * - * @deprecated use ATTR_HOST_IMAGE_VERSION + * @deprecated Use ATTR_HOST_IMAGE_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_HOST_IMAGE_VERSION = TMP_HOST_IMAGE_VERSION; /** * The name of the cluster. * - * @deprecated use ATTR_K8S_CLUSTER_NAME + * @deprecated Use ATTR_K8S_CLUSTER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_CLUSTER_NAME = TMP_K8S_CLUSTER_NAME; /** * The name of the Node. * - * @deprecated use ATTR_K8S_NODE_NAME + * @deprecated Use ATTR_K8S_NODE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_NODE_NAME = TMP_K8S_NODE_NAME; /** * The UID of the Node. * - * @deprecated use ATTR_K8S_NODE_UID + * @deprecated Use ATTR_K8S_NODE_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_NODE_UID = TMP_K8S_NODE_UID; /** * The name of the namespace that the pod is running in. * - * @deprecated use ATTR_K8S_NAMESPACE_NAME + * @deprecated Use ATTR_K8S_NAMESPACE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_NAMESPACE_NAME = TMP_K8S_NAMESPACE_NAME; /** * The UID of the Pod. * - * @deprecated use ATTR_K8S_POD_UID + * @deprecated Use ATTR_K8S_POD_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_POD_UID = TMP_K8S_POD_UID; /** * The name of the Pod. * - * @deprecated use ATTR_K8S_POD_NAME + * @deprecated Use ATTR_K8S_POD_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_POD_NAME = TMP_K8S_POD_NAME; /** * The name of the Container in a Pod template. * - * @deprecated use ATTR_K8S_CONTAINER_NAME + * @deprecated Use ATTR_K8S_CONTAINER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_CONTAINER_NAME = TMP_K8S_CONTAINER_NAME; /** * The UID of the ReplicaSet. * - * @deprecated use ATTR_K8S_REPLICASET_UID + * @deprecated Use ATTR_K8S_REPLICASET_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_REPLICASET_UID = TMP_K8S_REPLICASET_UID; /** * The name of the ReplicaSet. * - * @deprecated use ATTR_K8S_REPLICASET_NAME + * @deprecated Use ATTR_K8S_REPLICASET_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_REPLICASET_NAME = TMP_K8S_REPLICASET_NAME; /** * The UID of the Deployment. * - * @deprecated use ATTR_K8S_DEPLOYMENT_UID + * @deprecated Use ATTR_K8S_DEPLOYMENT_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_DEPLOYMENT_UID = TMP_K8S_DEPLOYMENT_UID; /** * The name of the Deployment. * - * @deprecated use ATTR_K8S_DEPLOYMENT_NAME + * @deprecated Use ATTR_K8S_DEPLOYMENT_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_DEPLOYMENT_NAME = TMP_K8S_DEPLOYMENT_NAME; /** * The UID of the StatefulSet. * - * @deprecated use ATTR_K8S_STATEFULSET_UID + * @deprecated Use ATTR_K8S_STATEFULSET_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_STATEFULSET_UID = TMP_K8S_STATEFULSET_UID; /** * The name of the StatefulSet. * - * @deprecated use ATTR_K8S_STATEFULSET_NAME + * @deprecated Use ATTR_K8S_STATEFULSET_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_STATEFULSET_NAME = TMP_K8S_STATEFULSET_NAME; /** * The UID of the DaemonSet. * - * @deprecated use ATTR_K8S_DAEMONSET_UID + * @deprecated Use ATTR_K8S_DAEMONSET_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_DAEMONSET_UID = TMP_K8S_DAEMONSET_UID; /** * The name of the DaemonSet. * - * @deprecated use ATTR_K8S_DAEMONSET_NAME + * @deprecated Use ATTR_K8S_DAEMONSET_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_DAEMONSET_NAME = TMP_K8S_DAEMONSET_NAME; /** * The UID of the Job. * - * @deprecated use ATTR_K8S_JOB_UID + * @deprecated Use ATTR_K8S_JOB_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_JOB_UID = TMP_K8S_JOB_UID; /** * The name of the Job. * - * @deprecated use ATTR_K8S_JOB_NAME + * @deprecated Use ATTR_K8S_JOB_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_JOB_NAME = TMP_K8S_JOB_NAME; /** * The UID of the CronJob. * - * @deprecated use ATTR_K8S_CRONJOB_UID + * @deprecated Use ATTR_K8S_CRONJOB_UID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_CRONJOB_UID = TMP_K8S_CRONJOB_UID; /** * The name of the CronJob. * - * @deprecated use ATTR_K8S_CRONJOB_NAME + * @deprecated Use ATTR_K8S_CRONJOB_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_K8S_CRONJOB_NAME = TMP_K8S_CRONJOB_NAME; /** * The operating system type. * - * @deprecated use ATTR_OS_TYPE + * @deprecated Use ATTR_OS_TYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_OS_TYPE = TMP_OS_TYPE; /** * Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. * - * @deprecated use ATTR_OS_DESCRIPTION + * @deprecated Use ATTR_OS_DESCRIPTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_OS_DESCRIPTION = TMP_OS_DESCRIPTION; /** * Human readable operating system name. * - * @deprecated use ATTR_OS_NAME + * @deprecated Use ATTR_OS_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_OS_NAME = TMP_OS_NAME; /** * The version string of the operating system as defined in [Version Attributes](../../resource/semantic_conventions/README.md#version-attributes). * - * @deprecated use ATTR_OS_VERSION + * @deprecated Use ATTR_OS_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_OS_VERSION = TMP_OS_VERSION; /** * Process identifier (PID). * - * @deprecated use ATTR_PROCESS_PID + * @deprecated Use ATTR_PROCESS_PID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_PID = TMP_PROCESS_PID; /** * The name of the process executable. On Linux based systems, can be set to the `Name` in `proc/[pid]/status`. On Windows, can be set to the base name of `GetProcessImageFileNameW`. * - * @deprecated use ATTR_PROCESS_EXECUTABLE_NAME + * @deprecated Use ATTR_PROCESS_EXECUTABLE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_EXECUTABLE_NAME = TMP_PROCESS_EXECUTABLE_NAME; /** * The full path to the process executable. On Linux based systems, can be set to the target of `proc/[pid]/exe`. On Windows, can be set to the result of `GetProcessImageFileNameW`. * - * @deprecated use ATTR_PROCESS_EXECUTABLE_PATH + * @deprecated Use ATTR_PROCESS_EXECUTABLE_PATH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_EXECUTABLE_PATH = TMP_PROCESS_EXECUTABLE_PATH; /** * The command used to launch the process (i.e. the command name). On Linux based systems, can be set to the zeroth string in `proc/[pid]/cmdline`. On Windows, can be set to the first parameter extracted from `GetCommandLineW`. * - * @deprecated use ATTR_PROCESS_COMMAND + * @deprecated Use ATTR_PROCESS_COMMAND in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_COMMAND = TMP_PROCESS_COMMAND; /** * The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. * - * @deprecated use ATTR_PROCESS_COMMAND_LINE + * @deprecated Use ATTR_PROCESS_COMMAND_LINE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_COMMAND_LINE = TMP_PROCESS_COMMAND_LINE; /** * All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. * - * @deprecated use ATTR_PROCESS_COMMAND_ARGS + * @deprecated Use ATTR_PROCESS_COMMAND_ARGS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_COMMAND_ARGS = TMP_PROCESS_COMMAND_ARGS; /** * The username of the user that owns the process. * - * @deprecated use ATTR_PROCESS_OWNER + * @deprecated Use ATTR_PROCESS_OWNER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_OWNER = TMP_PROCESS_OWNER; /** * The name of the runtime of this process. For compiled native binaries, this SHOULD be the name of the compiler. * - * @deprecated use ATTR_PROCESS_RUNTIME_NAME + * @deprecated Use ATTR_PROCESS_RUNTIME_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_RUNTIME_NAME = TMP_PROCESS_RUNTIME_NAME; /** * The version of the runtime of this process, as returned by the runtime without modification. * - * @deprecated use ATTR_PROCESS_RUNTIME_VERSION + * @deprecated Use ATTR_PROCESS_RUNTIME_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_RUNTIME_VERSION = TMP_PROCESS_RUNTIME_VERSION; /** * An additional description about the runtime of the process, for example a specific vendor customization of the runtime environment. * - * @deprecated use ATTR_PROCESS_RUNTIME_DESCRIPTION + * @deprecated Use ATTR_PROCESS_RUNTIME_DESCRIPTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_PROCESS_RUNTIME_DESCRIPTION = TMP_PROCESS_RUNTIME_DESCRIPTION; @@ -651,7 +651,7 @@ export const SEMRESATTRS_PROCESS_RUNTIME_DESCRIPTION = * * Note: MUST be the same for all instances of horizontally scaled services. If the value was not specified, SDKs MUST fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md#process), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value MUST be set to `unknown_service`. * - * @deprecated use ATTR_SERVICE_NAME + * @deprecated Use ATTR_SERVICE_NAME. */ export const SEMRESATTRS_SERVICE_NAME = TMP_SERVICE_NAME; @@ -660,7 +660,7 @@ export const SEMRESATTRS_SERVICE_NAME = TMP_SERVICE_NAME; * * Note: A string value having a meaning that helps to distinguish a group of services, for example the team name that owns a group of services. `service.name` is expected to be unique within the same namespace. If `service.namespace` is not specified in the Resource then `service.name` is expected to be unique for all services that have no explicit namespace defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length namespace string is assumed equal to unspecified namespace. * - * @deprecated use ATTR_SERVICE_NAMESPACE + * @deprecated Use ATTR_SERVICE_NAMESPACE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_SERVICE_NAMESPACE = TMP_SERVICE_NAMESPACE; @@ -669,63 +669,63 @@ export const SEMRESATTRS_SERVICE_NAMESPACE = TMP_SERVICE_NAMESPACE; * * Note: MUST be unique for each instance of the same `service.namespace,service.name` pair (in other words `service.namespace,service.name,service.instance.id` triplet MUST be globally unique). The ID helps to distinguish instances of the same service that exist at the same time (e.g. instances of a horizontally scaled service). It is preferable for the ID to be persistent and stay the same for the lifetime of the service instance, however it is acceptable that the ID is ephemeral and changes during important lifetime events for the service (e.g. service restarts). If the service has no inherent unique ID that can be used as the value of this attribute it is recommended to generate a random Version 1 or Version 4 RFC 4122 UUID (services aiming for reproducible UUIDs may also use Version 5, see RFC 4122 for more recommendations). * - * @deprecated use ATTR_SERVICE_INSTANCE_ID + * @deprecated Use ATTR_SERVICE_INSTANCE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_SERVICE_INSTANCE_ID = TMP_SERVICE_INSTANCE_ID; /** * The version string of the service API or implementation. * - * @deprecated use ATTR_SERVICE_VERSION + * @deprecated Use ATTR_SERVICE_VERSION. */ export const SEMRESATTRS_SERVICE_VERSION = TMP_SERVICE_VERSION; /** * The name of the telemetry SDK as defined above. * - * @deprecated use ATTR_TELEMETRY_SDK_NAME + * @deprecated Use ATTR_TELEMETRY_SDK_NAME. */ export const SEMRESATTRS_TELEMETRY_SDK_NAME = TMP_TELEMETRY_SDK_NAME; /** * The language of the telemetry SDK. * - * @deprecated use ATTR_TELEMETRY_SDK_LANGUAGE + * @deprecated Use ATTR_TELEMETRY_SDK_LANGUAGE. */ export const SEMRESATTRS_TELEMETRY_SDK_LANGUAGE = TMP_TELEMETRY_SDK_LANGUAGE; /** * The version string of the telemetry SDK. * - * @deprecated use ATTR_TELEMETRY_SDK_VERSION + * @deprecated Use ATTR_TELEMETRY_SDK_VERSION. */ export const SEMRESATTRS_TELEMETRY_SDK_VERSION = TMP_TELEMETRY_SDK_VERSION; /** * The version string of the auto instrumentation agent, if used. * - * @deprecated use ATTR_TELEMETRY_AUTO_VERSION + * @deprecated Use ATTR_TELEMETRY_DISTRO_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_TELEMETRY_AUTO_VERSION = TMP_TELEMETRY_AUTO_VERSION; /** * The name of the web engine. * - * @deprecated use ATTR_WEBENGINE_NAME + * @deprecated Use ATTR_WEBENGINE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_WEBENGINE_NAME = TMP_WEBENGINE_NAME; /** * The version of the web engine. * - * @deprecated use ATTR_WEBENGINE_VERSION + * @deprecated Use ATTR_WEBENGINE_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_WEBENGINE_VERSION = TMP_WEBENGINE_VERSION; /** * Additional description of the web engine (e.g. detailed version and edition information). * - * @deprecated use ATTR_WEBENGINE_DESCRIPTION + * @deprecated Use ATTR_WEBENGINE_DESCRIPTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMRESATTRS_WEBENGINE_DESCRIPTION = TMP_WEBENGINE_DESCRIPTION; @@ -1301,7 +1301,7 @@ const TMP_CLOUDPROVIDERVALUES_GCP = 'gcp'; /** * Name of the cloud provider. * - * @deprecated Use CLOUD_PROVIDER_VALUE_ALIBABA_CLOUD. + * @deprecated Use CLOUD_PROVIDER_VALUE_ALIBABA_CLOUD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPROVIDERVALUES_ALIBABA_CLOUD = TMP_CLOUDPROVIDERVALUES_ALIBABA_CLOUD; @@ -1309,21 +1309,21 @@ export const CLOUDPROVIDERVALUES_ALIBABA_CLOUD = /** * Name of the cloud provider. * - * @deprecated Use CLOUD_PROVIDER_VALUE_AWS. + * @deprecated Use CLOUD_PROVIDER_VALUE_AWS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPROVIDERVALUES_AWS = TMP_CLOUDPROVIDERVALUES_AWS; /** * Name of the cloud provider. * - * @deprecated Use CLOUD_PROVIDER_VALUE_AZURE. + * @deprecated Use CLOUD_PROVIDER_VALUE_AZURE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPROVIDERVALUES_AZURE = TMP_CLOUDPROVIDERVALUES_AZURE; /** * Name of the cloud provider. * - * @deprecated Use CLOUD_PROVIDER_VALUE_GCP. + * @deprecated Use CLOUD_PROVIDER_VALUE_GCP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPROVIDERVALUES_GCP = TMP_CLOUDPROVIDERVALUES_GCP; @@ -1393,7 +1393,7 @@ const TMP_CLOUDPLATFORMVALUES_GCP_APP_ENGINE = 'gcp_app_engine'; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_ALIBABA_CLOUD_ECS. + * @deprecated Use CLOUD_PLATFORM_VALUE_ALIBABA_CLOUD_ECS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS = TMP_CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS; @@ -1403,7 +1403,7 @@ export const CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_ALIBABA_CLOUD_FC. + * @deprecated Use CLOUD_PLATFORM_VALUE_ALIBABA_CLOUD_FC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_ALIBABA_CLOUD_FC = TMP_CLOUDPLATFORMVALUES_ALIBABA_CLOUD_FC; @@ -1413,7 +1413,7 @@ export const CLOUDPLATFORMVALUES_ALIBABA_CLOUD_FC = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_EC2. + * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_EC2 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AWS_EC2 = TMP_CLOUDPLATFORMVALUES_AWS_EC2; @@ -1422,7 +1422,7 @@ export const CLOUDPLATFORMVALUES_AWS_EC2 = TMP_CLOUDPLATFORMVALUES_AWS_EC2; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_ECS. + * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_ECS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AWS_ECS = TMP_CLOUDPLATFORMVALUES_AWS_ECS; @@ -1431,7 +1431,7 @@ export const CLOUDPLATFORMVALUES_AWS_ECS = TMP_CLOUDPLATFORMVALUES_AWS_ECS; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_EKS. + * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_EKS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AWS_EKS = TMP_CLOUDPLATFORMVALUES_AWS_EKS; @@ -1440,7 +1440,7 @@ export const CLOUDPLATFORMVALUES_AWS_EKS = TMP_CLOUDPLATFORMVALUES_AWS_EKS; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_LAMBDA. + * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_LAMBDA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AWS_LAMBDA = TMP_CLOUDPLATFORMVALUES_AWS_LAMBDA; @@ -1450,7 +1450,7 @@ export const CLOUDPLATFORMVALUES_AWS_LAMBDA = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK. + * @deprecated Use CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK = TMP_CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK; @@ -1460,7 +1460,7 @@ export const CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_VM. + * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_VM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AZURE_VM = TMP_CLOUDPLATFORMVALUES_AZURE_VM; @@ -1469,7 +1469,7 @@ export const CLOUDPLATFORMVALUES_AZURE_VM = TMP_CLOUDPLATFORMVALUES_AZURE_VM; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_CONTAINER_INSTANCES. + * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_CONTAINER_INSTANCES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AZURE_CONTAINER_INSTANCES = TMP_CLOUDPLATFORMVALUES_AZURE_CONTAINER_INSTANCES; @@ -1479,7 +1479,7 @@ export const CLOUDPLATFORMVALUES_AZURE_CONTAINER_INSTANCES = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_AKS. + * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_AKS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AZURE_AKS = TMP_CLOUDPLATFORMVALUES_AZURE_AKS; @@ -1488,7 +1488,7 @@ export const CLOUDPLATFORMVALUES_AZURE_AKS = TMP_CLOUDPLATFORMVALUES_AZURE_AKS; * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_FUNCTIONS. + * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_FUNCTIONS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AZURE_FUNCTIONS = TMP_CLOUDPLATFORMVALUES_AZURE_FUNCTIONS; @@ -1498,7 +1498,7 @@ export const CLOUDPLATFORMVALUES_AZURE_FUNCTIONS = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_APP_SERVICE. + * @deprecated Use CLOUD_PLATFORM_VALUE_AZURE_APP_SERVICE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_AZURE_APP_SERVICE = TMP_CLOUDPLATFORMVALUES_AZURE_APP_SERVICE; @@ -1508,7 +1508,7 @@ export const CLOUDPLATFORMVALUES_AZURE_APP_SERVICE = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_COMPUTE_ENGINE. + * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_COMPUTE_ENGINE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE = TMP_CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE; @@ -1518,7 +1518,7 @@ export const CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_CLOUD_RUN. + * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_CLOUD_RUN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_GCP_CLOUD_RUN = TMP_CLOUDPLATFORMVALUES_GCP_CLOUD_RUN; @@ -1528,7 +1528,7 @@ export const CLOUDPLATFORMVALUES_GCP_CLOUD_RUN = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_KUBERNETES_ENGINE. + * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_KUBERNETES_ENGINE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_GCP_KUBERNETES_ENGINE = TMP_CLOUDPLATFORMVALUES_GCP_KUBERNETES_ENGINE; @@ -1538,7 +1538,7 @@ export const CLOUDPLATFORMVALUES_GCP_KUBERNETES_ENGINE = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_CLOUD_FUNCTIONS. + * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_CLOUD_FUNCTIONS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_GCP_CLOUD_FUNCTIONS = TMP_CLOUDPLATFORMVALUES_GCP_CLOUD_FUNCTIONS; @@ -1548,7 +1548,7 @@ export const CLOUDPLATFORMVALUES_GCP_CLOUD_FUNCTIONS = * * Note: The prefix of the service SHOULD match the one specified in `cloud.provider`. * - * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_APP_ENGINE. + * @deprecated Use CLOUD_PLATFORM_VALUE_GCP_APP_ENGINE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const CLOUDPLATFORMVALUES_GCP_APP_ENGINE = TMP_CLOUDPLATFORMVALUES_GCP_APP_ENGINE; @@ -1653,14 +1653,14 @@ const TMP_AWSECSLAUNCHTYPEVALUES_FARGATE = 'fargate'; /** * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. * - * @deprecated Use AWS_ECS_LAUNCHTYPE_VALUE_EC2. + * @deprecated Use AWS_ECS_LAUNCHTYPE_VALUE_EC2 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const AWSECSLAUNCHTYPEVALUES_EC2 = TMP_AWSECSLAUNCHTYPEVALUES_EC2; /** * The [launch type](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) for an ECS task. * - * @deprecated Use AWS_ECS_LAUNCHTYPE_VALUE_FARGATE. + * @deprecated Use AWS_ECS_LAUNCHTYPE_VALUE_FARGATE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const AWSECSLAUNCHTYPEVALUES_FARGATE = TMP_AWSECSLAUNCHTYPEVALUES_FARGATE; @@ -1708,49 +1708,49 @@ const TMP_HOSTARCHVALUES_X86 = 'x86'; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_AMD64. + * @deprecated Use HOST_ARCH_VALUE_AMD64 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_AMD64 = TMP_HOSTARCHVALUES_AMD64; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_ARM32. + * @deprecated Use HOST_ARCH_VALUE_ARM32 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_ARM32 = TMP_HOSTARCHVALUES_ARM32; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_ARM64. + * @deprecated Use HOST_ARCH_VALUE_ARM64 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_ARM64 = TMP_HOSTARCHVALUES_ARM64; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_IA64. + * @deprecated Use HOST_ARCH_VALUE_IA64 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_IA64 = TMP_HOSTARCHVALUES_IA64; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_PPC32. + * @deprecated Use HOST_ARCH_VALUE_PPC32 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_PPC32 = TMP_HOSTARCHVALUES_PPC32; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_PPC64. + * @deprecated Use HOST_ARCH_VALUE_PPC64 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_PPC64 = TMP_HOSTARCHVALUES_PPC64; /** * The CPU architecture the host system is running on. * - * @deprecated Use HOST_ARCH_VALUE_X86. + * @deprecated Use HOST_ARCH_VALUE_X86 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HOSTARCHVALUES_X86 = TMP_HOSTARCHVALUES_X86; @@ -1821,77 +1821,77 @@ const TMP_OSTYPEVALUES_Z_OS = 'z_os'; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_WINDOWS. + * @deprecated Use OS_TYPE_VALUE_WINDOWS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_WINDOWS = TMP_OSTYPEVALUES_WINDOWS; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_LINUX. + * @deprecated Use OS_TYPE_VALUE_LINUX in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_LINUX = TMP_OSTYPEVALUES_LINUX; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_DARWIN. + * @deprecated Use OS_TYPE_VALUE_DARWIN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_DARWIN = TMP_OSTYPEVALUES_DARWIN; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_FREEBSD. + * @deprecated Use OS_TYPE_VALUE_FREEBSD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_FREEBSD = TMP_OSTYPEVALUES_FREEBSD; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_NETBSD. + * @deprecated Use OS_TYPE_VALUE_NETBSD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_NETBSD = TMP_OSTYPEVALUES_NETBSD; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_OPENBSD. + * @deprecated Use OS_TYPE_VALUE_OPENBSD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_OPENBSD = TMP_OSTYPEVALUES_OPENBSD; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_DRAGONFLYBSD. + * @deprecated Use OS_TYPE_VALUE_DRAGONFLYBSD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_DRAGONFLYBSD = TMP_OSTYPEVALUES_DRAGONFLYBSD; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_HPUX. + * @deprecated Use OS_TYPE_VALUE_HPUX in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_HPUX = TMP_OSTYPEVALUES_HPUX; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_AIX. + * @deprecated Use OS_TYPE_VALUE_AIX in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_AIX = TMP_OSTYPEVALUES_AIX; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_SOLARIS. + * @deprecated Use OS_TYPE_VALUE_SOLARIS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_SOLARIS = TMP_OSTYPEVALUES_SOLARIS; /** * The operating system type. * - * @deprecated Use OS_TYPE_VALUE_Z_OS. + * @deprecated Use OS_TYPE_VALUE_Z_OS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const OSTYPEVALUES_Z_OS = TMP_OSTYPEVALUES_Z_OS; diff --git a/semantic-conventions/src/stable_attributes.ts b/semantic-conventions/src/stable_attributes.ts index e502129e2bb..459bda87351 100644 --- a/semantic-conventions/src/stable_attributes.ts +++ b/semantic-conventions/src/stable_attributes.ts @@ -20,9 +20,8 @@ /** * Rate-limiting result, shows whether the lease was acquired or contains a rejection reason - * + * * @example acquired - * * @example request_canceled */ export const ATTR_ASPNETCORE_RATE_LIMITING_RESULT = 'aspnetcore.rate_limiting.result' as const; @@ -114,37 +113,36 @@ export const TELEMETRY_SDK_LANGUAGE_VALUE_WEBJS = "webjs" as const; /** * The name of the telemetry SDK as defined above. - * + * * @example opentelemetry - * + * * @note The OpenTelemetry SDK **MUST** set the `telemetry.sdk.name` attribute to `opentelemetry`. * If another SDK, like a fork or a vendor-provided implementation, is used, this SDK **MUST** set the * `telemetry.sdk.name` attribute to the fully-qualified class or module name of this SDK's main entry point * or another suitable identifier depending on the language. - * The identifier `opentelemetry` is reserved and **MUST** **NOT** be used in this case. + * The identifier `opentelemetry` is reserved and **MUST NOT** be used in this case. * All custom identifiers **SHOULD** be stable across different versions of an implementation. */ export const ATTR_TELEMETRY_SDK_NAME = 'telemetry.sdk.name' as const; /** * The version string of the telemetry SDK. - * + * * @example 1.2.3 */ export const ATTR_TELEMETRY_SDK_VERSION = 'telemetry.sdk.version' as const; /** * Full type name of the [`IExceptionHandler`](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler) implementation that handled the exception. - * + * * @example Contoso.MyHandler */ export const ATTR_ASPNETCORE_DIAGNOSTICS_HANDLER_TYPE = 'aspnetcore.diagnostics.handler.type' as const; /** * ASP.NET Core exception middleware handling result - * + * * @example handled - * * @example unhandled */ export const ATTR_ASPNETCORE_DIAGNOSTICS_EXCEPTION_RESULT = 'aspnetcore.diagnostics.exception.result' as const; @@ -171,34 +169,31 @@ export const ASPNETCORE_DIAGNOSTICS_EXCEPTION_RESULT_VALUE_UNHANDLED = "unhandle /** * Rate limiting policy name. - * + * * @example fixed - * * @example sliding - * * @example token */ export const ATTR_ASPNETCORE_RATE_LIMITING_POLICY = 'aspnetcore.rate_limiting.policy' as const; /** * Flag indicating if request was handled by the application pipeline. - * + * * @example true */ export const ATTR_ASPNETCORE_REQUEST_IS_UNHANDLED = 'aspnetcore.request.is_unhandled' as const; /** * A value that indicates whether the matched route is a fallback route. - * + * * @example true */ export const ATTR_ASPNETCORE_ROUTING_IS_FALLBACK = 'aspnetcore.routing.is_fallback' as const; /** * Match result - success or failure - * + * * @example success - * * @example failure */ export const ATTR_ASPNETCORE_ROUTING_MATCH_STATUS = 'aspnetcore.routing.match_status' as const; @@ -215,37 +210,32 @@ export const ASPNETCORE_ROUTING_MATCH_STATUS_VALUE_SUCCESS = "success" as const; /** * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name. - * + * * @example client.example.com - * * @example 10.1.2.80 - * * @example /tmp/my.sock - * + * * @note When observed from the server side, and when communicating through an intermediary, `client.address` **SHOULD** represent the client address behind any intermediaries, for example proxies, if it's available. */ export const ATTR_CLIENT_ADDRESS = 'client.address' as const; /** * Client port number. - * + * * @example 65123 - * + * * @note When observed from the server side, and when communicating through an intermediary, `client.port` **SHOULD** represent the client port behind any intermediaries, for example proxies, if it's available. */ export const ATTR_CLIENT_PORT = 'client.port' as const; /** * Describes a class of error the operation ended with. - * + * * @example timeout - * * @example java.net.UnknownHostException - * * @example server_certificate_invalid - * * @example 500 - * + * * @note The `error.type` **SHOULD** be predictable, and **SHOULD** have low cardinality. * * When `error.type` is set to a type (e.g., an exception type), its @@ -258,13 +248,13 @@ export const ATTR_CLIENT_PORT = 'client.port' as const; * should be prepared for `error.type` to have high cardinality at query time when no * additional filters are applied. * - * If the operation has completed successfully, instrumentations **SHOULD** **NOT** set `error.type`. + * If the operation has completed successfully, instrumentations **SHOULD NOT** set `error.type`. * * If a specific domain defines its own set of error identifiers (such as HTTP or gRPC status codes), - * it's RECOMMENDED to: + * it's **RECOMMENDED** to: * - * * Use a domain-specific attribute - * * Set `error.type` to capture all errors, regardless of whether they are defined within the domain-specific set or not. + * - Use a domain-specific attribute + * - Set `error.type` to capture all errors, regardless of whether they are defined within the domain-specific set or not. */ export const ATTR_ERROR_TYPE = 'error.type' as const; @@ -275,7 +265,7 @@ export const ERROR_TYPE_VALUE_OTHER = "_OTHER" as const; /** * **SHOULD** be set to true if the exception event is recorded at a point where it is known that the exception is escaping the scope of the span. - * + * * @note An exception is considered to have escaped (or left) the scope of a span, * if that span is ended while the exception is still logically "in flight". * This may be actually "in flight" in some languages (e.g. if the exception @@ -297,36 +287,33 @@ export const ATTR_EXCEPTION_ESCAPED = 'exception.escaped' as const; /** * The exception message. - * + * * @example Division by zero - * * @example Can't convert 'int' object to str implicitly */ export const ATTR_EXCEPTION_MESSAGE = 'exception.message' as const; /** * A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. - * - * @example "Exception in thread \"main\" java.lang.RuntimeException: Test exception\\n at com.example.GenerateTrace.methodB(GenerateTrace.java:13)\\n at com.example.GenerateTrace.methodA(GenerateTrace.java:9)\\n at com.example.GenerateTrace.main(GenerateTrace.java:5)" + * + * @example "Exception in thread "main" java.lang.RuntimeException: Test exception\\n at com.example.GenerateTrace.methodB(GenerateTrace.java:13)\\n at com.example.GenerateTrace.methodA(GenerateTrace.java:9)\\n at com.example.GenerateTrace.main(GenerateTrace.java:5)\\n" */ export const ATTR_EXCEPTION_STACKTRACE = 'exception.stacktrace' as const; /** * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the exception should be preferred over the static type in languages that support it. - * + * * @example java.net.ConnectException - * * @example OSError */ export const ATTR_EXCEPTION_TYPE = 'exception.type' as const; /** * HTTP request headers, `` being the normalized HTTP Header name (lowercase), the value being the header values. - * + * * @example http.request.header.content-type=["application/json"] - * * @example http.request.header.x-forwarded-for=["1.2.3.4", "1.2.3.5"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which headers are to be captured. Including all request headers can be a security risk - explicit configuration helps avoid leaking sensitive information. * The `User-Agent` header is already captured in the `user_agent.original` attribute. Users **MAY** explicitly configure instrumentations to capture them even though it is not recommended. * The attribute value **MUST** consist of either multiple header values as an array of strings or a single-item array containing a possibly comma-concatenated string, depending on the way the HTTP library provides access to headers. @@ -335,13 +322,11 @@ export const ATTR_HTTP_REQUEST_HEADER = (key: string) => `http.request.header.${ /** * HTTP request method. - * + * * @example GET - * * @example POST - * * @example HEAD - * + * * @note HTTP request method value **SHOULD** be "known" to the instrumentation. * By default, this convention defines "known" methods as the ones listed in [RFC9110](https://www.rfc-editor.org/rfc/rfc9110.html#name-methods) * and the PATCH method defined in [RFC5789](https://www.rfc-editor.org/rfc/rfc5789.html). @@ -411,31 +396,28 @@ export const HTTP_REQUEST_METHOD_VALUE_TRACE = "TRACE" as const; /** * Original HTTP method sent by the client in the request line. - * + * * @example GeT - * * @example ACL - * * @example foo */ export const ATTR_HTTP_REQUEST_METHOD_ORIGINAL = 'http.request.method_original' as const; /** * The ordinal number of request resending attempt (for any reason, including redirects). - * + * * @example 3 - * + * * @note The resend count **SHOULD** be updated each time an HTTP request gets resent by the client, regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503 Server Unavailable, network issues, or any other). */ export const ATTR_HTTP_REQUEST_RESEND_COUNT = 'http.request.resend_count' as const; /** * HTTP response headers, `` being the normalized HTTP Header name (lowercase), the value being the header values. - * + * * @example http.response.header.content-type=["application/json"] - * * @example http.response.header.my-custom-header=["abc", "def"] - * + * * @note Instrumentations **SHOULD** require an explicit configuration of which headers are to be captured. Including all response headers can be a security risk - explicit configuration helps avoid leaking sensitive information. * Users **MAY** explicitly configure instrumentations to capture them even though it is not recommended. * The attribute value **MUST** consist of either multiple header values as an array of strings or a single-item array containing a possibly comma-concatenated string, depending on the way the HTTP library provides access to headers. @@ -444,63 +426,57 @@ export const ATTR_HTTP_RESPONSE_HEADER = (key: string) => `http.response.header. /** * [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). - * + * * @example 200 */ export const ATTR_HTTP_RESPONSE_STATUS_CODE = 'http.response.status_code' as const; /** * The matched route, that is, the path template in the format used by the respective server framework. - * + * * @example /users/:userID? - * * @example {controller}/{action}/{id?} - * - * @note MUST **NOT** be populated when this is not supported by the HTTP server framework as the route attribute should have low-cardinality and the URI path can **NOT** substitute it. - * SHOULD include the [application root](/docs/http/http-spans.md#http-server-definitions) if there is one. + * + * @note **MUST NOT** be populated when this is not supported by the HTTP server framework as the route attribute should have low-cardinality and the URI path can NOT substitute it. + * **SHOULD** include the [application root](/docs/http/http-spans.md#http-server-definitions) if there is one. */ export const ATTR_HTTP_ROUTE = 'http.route' as const; /** * Name of the garbage collector action. - * + * * @example end of minor GC - * * @example end of major GC - * + * * @note Garbage collector action is generally obtained via [GarbageCollectionNotificationInfo#getGcAction()](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcAction()). */ export const ATTR_JVM_GC_ACTION = 'jvm.gc.action' as const; /** * Name of the garbage collector. - * + * * @example G1 Young Generation - * * @example G1 Old Generation - * + * * @note Garbage collector name is generally obtained via [GarbageCollectionNotificationInfo#getGcName()](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcName()). */ export const ATTR_JVM_GC_NAME = 'jvm.gc.name' as const; /** * Name of the memory pool. - * + * * @example G1 Old Gen - * * @example G1 Eden space - * * @example G1 Survivor Space - * + * * @note Pool names are generally obtained via [MemoryPoolMXBean#getName()](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()). */ export const ATTR_JVM_MEMORY_POOL_NAME = 'jvm.memory.pool.name' as const; /** * The type of memory. - * + * * @example heap - * * @example non_heap */ export const ATTR_JVM_MEMORY_TYPE = 'jvm.memory.type' as const; @@ -522,9 +498,8 @@ export const ATTR_JVM_THREAD_DAEMON = 'jvm.thread.daemon' as const; /** * State of the thread. - * + * * @example runnable - * * @example blocked */ export const ATTR_JVM_THREAD_STATE = 'jvm.thread.state' as const; @@ -561,67 +536,61 @@ export const JVM_THREAD_STATE_VALUE_WAITING = "waiting" as const; /** * Local address of the network connection - IP address or Unix domain socket name. - * + * * @example 10.1.2.80 - * * @example /tmp/my.sock */ export const ATTR_NETWORK_LOCAL_ADDRESS = 'network.local.address' as const; /** * Local port number of the network connection. - * + * * @example 65123 */ export const ATTR_NETWORK_LOCAL_PORT = 'network.local.port' as const; /** * Peer address of the network connection - IP address or Unix domain socket name. - * + * * @example 10.1.2.80 - * * @example /tmp/my.sock */ export const ATTR_NETWORK_PEER_ADDRESS = 'network.peer.address' as const; /** * Peer port number of the network connection. - * + * * @example 65123 */ export const ATTR_NETWORK_PEER_PORT = 'network.peer.port' as const; /** * [OSI application layer](https://osi-model.com/application-layer/) or non-OSI equivalent. - * + * * @example amqp - * * @example http - * * @example mqtt - * + * * @note The value **SHOULD** be normalized to lowercase. */ export const ATTR_NETWORK_PROTOCOL_NAME = 'network.protocol.name' as const; /** * The actual version of the protocol used for network communication. - * + * * @example 1.1 - * * @example 2 - * - * @note If protocol version is subject to negotiation (for example using [ALPN](https://www.rfc-editor.org/rfc/rfc7301.html)), this attribute **SHOULD** be set to the negotiated version. If the actual protocol version is not known, this attribute **SHOULD** **NOT** be set. + * + * @note If protocol version is subject to negotiation (for example using [ALPN](https://www.rfc-editor.org/rfc/rfc7301.html)), this attribute **SHOULD** be set to the negotiated version. If the actual protocol version is not known, this attribute **SHOULD NOT** be set. */ export const ATTR_NETWORK_PROTOCOL_VERSION = 'network.protocol.version' as const; /** * [OSI transport layer](https://osi-model.com/transport-layer/) or [inter-process communication method](https://wikipedia.org/wiki/Inter-process_communication). - * + * * @example tcp - * * @example udp - * + * * @note The value **SHOULD** be normalized to lowercase. * * Consider always setting the transport when setting a port number, since @@ -657,11 +626,10 @@ export const NETWORK_TRANSPORT_VALUE_UNIX = "unix" as const; /** * [OSI network layer](https://osi-model.com/network-layer/) or non-OSI equivalent. - * + * * @example ipv4 - * * @example ipv6 - * + * * @note The value **SHOULD** be normalized to lowercase. */ export const ATTR_NETWORK_TYPE = 'network.type' as const; @@ -678,20 +646,20 @@ export const NETWORK_TYPE_VALUE_IPV6 = "ipv6" as const; /** * The name of the instrumentation scope - (`InstrumentationScope.Name` in OTLP). - * + * * @example io.opentelemetry.contrib.mongodb */ export const ATTR_OTEL_SCOPE_NAME = 'otel.scope.name' as const; /** * The version of the instrumentation scope - (`InstrumentationScope.Version` in OTLP). - * + * * @example 1.0.0 */ export const ATTR_OTEL_SCOPE_VERSION = 'otel.scope.version' as const; /** - * Name of the code, either "OK" or "ERROR". **MUST** **NOT** be set if the status code is UNSET. + * Name of the code, either "OK" or "ERROR". **MUST NOT** be set if the status code is UNSET. */ export const ATTR_OTEL_STATUS_CODE = 'otel.status_code' as const; @@ -707,60 +675,54 @@ export const OTEL_STATUS_CODE_VALUE_OK = "OK" as const; /** * Description of the Status if it has a value, otherwise not set. - * + * * @example resource not found */ export const ATTR_OTEL_STATUS_DESCRIPTION = 'otel.status_description' as const; /** * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name. - * + * * @example example.com - * * @example 10.1.2.80 - * * @example /tmp/my.sock - * + * * @note When observed from the client side, and when communicating through an intermediary, `server.address` **SHOULD** represent the server address behind any intermediaries, for example proxies, if it's available. */ export const ATTR_SERVER_ADDRESS = 'server.address' as const; /** * Server port number. - * + * * @example 80 - * * @example 8080 - * * @example 443 - * + * * @note When observed from the client side, and when communicating through an intermediary, `server.port` **SHOULD** represent the server port behind any intermediaries, for example proxies, if it's available. */ export const ATTR_SERVER_PORT = 'server.port' as const; /** * Logical name of the service. - * + * * @example shoppingcart - * - * @note MUST be the same for all instances of horizontally scaled services. If the value was not specified, SDKs **MUST** fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value **MUST** be set to `unknown_service`. + * + * @note **MUST** be the same for all instances of horizontally scaled services. If the value was not specified, SDKs **MUST** fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value **MUST** be set to `unknown_service`. */ export const ATTR_SERVICE_NAME = 'service.name' as const; /** * The version string of the service API or implementation. The format is not defined by these conventions. - * + * * @example 2.0.0 - * * @example a01dbef8a */ export const ATTR_SERVICE_VERSION = 'service.version' as const; /** * SignalR HTTP connection closure status. - * + * * @example app_shutdown - * * @example timeout */ export const ATTR_SIGNALR_CONNECTION_STATUS = 'signalr.connection.status' as const; @@ -782,9 +744,8 @@ export const SIGNALR_CONNECTION_STATUS_VALUE_TIMEOUT = "timeout" as const; /** * [SignalR transport type](https://github.com/dotnet/aspnetcore/blob/main/src/SignalR/docs/specs/TransportProtocols.md) - * + * * @example web_sockets - * * @example long_polling */ export const ATTR_SIGNALR_TRANSPORT = 'signalr.transport' as const; @@ -806,60 +767,55 @@ export const SIGNALR_TRANSPORT_VALUE_WEB_SOCKETS = "web_sockets" as const; /** * The [URI fragment](https://www.rfc-editor.org/rfc/rfc3986#section-3.5) component - * + * * @example SemConv */ export const ATTR_URL_FRAGMENT = 'url.fragment' as const; /** * Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986) - * + * * @example https://www.foo.bar/search?q=OpenTelemetry#SemConv - * * @example //localhost - * + * * @note For network calls, URL usually has `scheme://host[:port][path][?query][#fragment]` format, where the fragment is not transmitted over HTTP, but if it is known, it **SHOULD** be included nevertheless. - * `url.full` **MUST** **NOT** contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case username and password **SHOULD** be redacted and attribute's value **SHOULD** be `https://REDACTED:REDACTED@www.example.com/`. + * `url.full` **MUST NOT** contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case username and password **SHOULD** be redacted and attribute's value **SHOULD** be `https://REDACTED:REDACTED@www.example.com/`. * `url.full` **SHOULD** capture the absolute URL when it is available (or can be reconstructed). Sensitive content provided in `url.full` **SHOULD** be scrubbed when instrumentations can identify it. */ export const ATTR_URL_FULL = 'url.full' as const; /** * The [URI path](https://www.rfc-editor.org/rfc/rfc3986#section-3.3) component - * + * * @example /search - * + * * @note Sensitive content provided in `url.path` **SHOULD** be scrubbed when instrumentations can identify it. */ export const ATTR_URL_PATH = 'url.path' as const; /** * The [URI query](https://www.rfc-editor.org/rfc/rfc3986#section-3.4) component - * + * * @example q=OpenTelemetry - * + * * @note Sensitive content provided in `url.query` **SHOULD** be scrubbed when instrumentations can identify it. */ export const ATTR_URL_QUERY = 'url.query' as const; /** * The [URI scheme](https://www.rfc-editor.org/rfc/rfc3986#section-3.1) component identifying the used protocol. - * + * * @example https - * * @example ftp - * * @example telnet */ export const ATTR_URL_SCHEME = 'url.scheme' as const; /** * Value of the [HTTP User-Agent](https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent) header sent by the client. - * + * * @example CERN-LineMode/2.15 libwww/2.17b3 - * * @example Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1 - * * @example YourApp/1.0.0 grpc-java-okhttp/1.27.2 */ export const ATTR_USER_AGENT_ORIGINAL = 'user_agent.original' as const; diff --git a/semantic-conventions/src/stable_metrics.ts b/semantic-conventions/src/stable_metrics.ts index 0d9983d20b4..a5b98f16bd0 100644 --- a/semantic-conventions/src/stable_metrics.ts +++ b/semantic-conventions/src/stable_metrics.ts @@ -20,46 +20,46 @@ /** * Number of exceptions caught by exception handling middleware. - * + * * @note Meter name: `Microsoft.AspNetCore.Diagnostics`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_DIAGNOSTICS_EXCEPTIONS = 'aspnetcore.diagnostics.exceptions' as const; /** * Number of requests that are currently active on the server that hold a rate limiting lease. - * + * * @note Meter name: `Microsoft.AspNetCore.RateLimiting`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_RATE_LIMITING_ACTIVE_REQUEST_LEASES = 'aspnetcore.rate_limiting.active_request_leases' as const; /** * Number of requests that are currently queued, waiting to acquire a rate limiting lease. - * + * * @note Meter name: `Microsoft.AspNetCore.RateLimiting`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_RATE_LIMITING_QUEUED_REQUESTS = 'aspnetcore.rate_limiting.queued_requests' as const; /** * The time the request spent in a queue waiting to acquire a rate limiting lease. - * + * * @note Meter name: `Microsoft.AspNetCore.RateLimiting`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_RATE_LIMITING_REQUEST_TIME_IN_QUEUE = 'aspnetcore.rate_limiting.request.time_in_queue' as const; /** * The duration of rate limiting lease held by requests on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.RateLimiting`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_RATE_LIMITING_REQUEST_LEASE_DURATION = 'aspnetcore.rate_limiting.request_lease.duration' as const; /** * Number of requests that tried to acquire a rate limiting lease. - * + * * @note Requests could be: * - * * Rejected by global or endpoint rate limiting policies - * * Canceled while waiting for the lease. + * - Rejected by global or endpoint rate limiting policies + * - Canceled while waiting for the lease. * * Meter name: `Microsoft.AspNetCore.RateLimiting`; Added in: ASP.NET Core 8.0 */ @@ -67,7 +67,7 @@ export const METRIC_ASPNETCORE_RATE_LIMITING_REQUESTS = 'aspnetcore.rate_limitin /** * Number of requests that were attempted to be matched to an endpoint. - * + * * @note Meter name: `Microsoft.AspNetCore.Routing`; Added in: ASP.NET Core 8.0 */ export const METRIC_ASPNETCORE_ROUTING_MATCH_ATTEMPTS = 'aspnetcore.routing.match_attempts' as const; @@ -104,7 +104,7 @@ export const METRIC_JVM_CPU_COUNT = 'jvm.cpu.count' as const; /** * Recent CPU utilization for the process as reported by the JVM. - * + * * @note The value range is [0.0,1.0]. This utilization is not defined as being for the specific interval since last measurement (unlike `system.cpu.utilization`). [Reference](https://docs.oracle.com/en/java/javase/17/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getProcessCpuLoad()). */ export const METRIC_JVM_CPU_RECENT_UTILIZATION = 'jvm.cpu.recent_utilization' as const; @@ -146,42 +146,42 @@ export const METRIC_JVM_THREAD_COUNT = 'jvm.thread.count' as const; /** * Number of connections that are currently active on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_ACTIVE_CONNECTIONS = 'kestrel.active_connections' as const; /** * Number of TLS handshakes that are currently in progress on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_ACTIVE_TLS_HANDSHAKES = 'kestrel.active_tls_handshakes' as const; /** * The duration of connections on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_CONNECTION_DURATION = 'kestrel.connection.duration' as const; /** * Number of connections that are currently queued and are waiting to start. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_QUEUED_CONNECTIONS = 'kestrel.queued_connections' as const; /** * Number of HTTP requests on multiplexed connections (HTTP/2 and HTTP/3) that are currently queued and are waiting to start. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_QUEUED_REQUESTS = 'kestrel.queued_requests' as const; /** * Number of connections rejected by the server. - * + * * @note Connections are rejected when the currently active count exceeds the value configured with `MaxConcurrentConnections`. * Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ @@ -189,14 +189,14 @@ export const METRIC_KESTREL_REJECTED_CONNECTIONS = 'kestrel.rejected_connections /** * The duration of TLS handshakes on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 */ export const METRIC_KESTREL_TLS_HANDSHAKE_DURATION = 'kestrel.tls_handshake.duration' as const; /** * Number of connections that are currently upgraded (WebSockets). . - * + * * @note The counter only tracks HTTP/1.1 connections. * * Meter name: `Microsoft.AspNetCore.Server.Kestrel`; Added in: ASP.NET Core 8.0 @@ -205,14 +205,14 @@ export const METRIC_KESTREL_UPGRADED_CONNECTIONS = 'kestrel.upgraded_connections /** * Number of connections that are currently active on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Http.Connections`; Added in: ASP.NET Core 8.0 */ export const METRIC_SIGNALR_SERVER_ACTIVE_CONNECTIONS = 'signalr.server.active_connections' as const; /** * The duration of connections on the server. - * + * * @note Meter name: `Microsoft.AspNetCore.Http.Connections`; Added in: ASP.NET Core 8.0 */ export const METRIC_SIGNALR_SERVER_CONNECTION_DURATION = 'signalr.server.connection.duration' as const; diff --git a/semantic-conventions/src/trace/SemanticAttributes.ts b/semantic-conventions/src/trace/SemanticAttributes.ts index 2b81c6fb4de..80466262ce4 100644 --- a/semantic-conventions/src/trace/SemanticAttributes.ts +++ b/semantic-conventions/src/trace/SemanticAttributes.ts @@ -173,35 +173,35 @@ const TMP_MESSAGE_UNCOMPRESSED_SIZE = 'message.uncompressed_size'; * * Note: This may be different from `faas.id` if an alias is involved. * - * @deprecated use ATTR_AWS_LAMBDA_INVOKED_ARN + * @deprecated Use ATTR_AWS_LAMBDA_INVOKED_ARN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_LAMBDA_INVOKED_ARN = TMP_AWS_LAMBDA_INVOKED_ARN; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated use ATTR_DB_SYSTEM + * @deprecated Use ATTR_DB_SYSTEM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_SYSTEM = TMP_DB_SYSTEM; /** * The connection string used to connect to the database. It is recommended to remove embedded credentials. * - * @deprecated use ATTR_DB_CONNECTION_STRING + * @deprecated Use ATTR_DB_CONNECTION_STRING in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CONNECTION_STRING = TMP_DB_CONNECTION_STRING; /** * Username for accessing the database. * - * @deprecated use ATTR_DB_USER + * @deprecated Use ATTR_DB_USER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_USER = TMP_DB_USER; /** * The fully-qualified class name of the [Java Database Connectivity (JDBC)](https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) driver used to connect. * - * @deprecated use ATTR_DB_JDBC_DRIVER_CLASSNAME + * @deprecated Use ATTR_DB_JDBC_DRIVER_CLASSNAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_JDBC_DRIVER_CLASSNAME = TMP_DB_JDBC_DRIVER_CLASSNAME; @@ -210,7 +210,7 @@ export const SEMATTRS_DB_JDBC_DRIVER_CLASSNAME = TMP_DB_JDBC_DRIVER_CLASSNAME; * * Note: In some SQL databases, the database name to be used is called "schema name". * - * @deprecated use ATTR_DB_NAME + * @deprecated Use ATTR_DB_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_NAME = TMP_DB_NAME; @@ -219,7 +219,7 @@ export const SEMATTRS_DB_NAME = TMP_DB_NAME; * * Note: The value may be sanitized to exclude sensitive information. * - * @deprecated use ATTR_DB_STATEMENT + * @deprecated Use ATTR_DB_STATEMENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_STATEMENT = TMP_DB_STATEMENT; @@ -228,7 +228,7 @@ export const SEMATTRS_DB_STATEMENT = TMP_DB_STATEMENT; * * Note: When setting this to an SQL keyword, it is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if the operation name is provided by the library being instrumented. If the SQL statement has an ambiguous operation, or performs more than one operation, this value may be omitted. * - * @deprecated use ATTR_DB_OPERATION + * @deprecated Use ATTR_DB_OPERATION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_OPERATION = TMP_DB_OPERATION; @@ -237,28 +237,28 @@ export const SEMATTRS_DB_OPERATION = TMP_DB_OPERATION; * * Note: If setting a `db.mssql.instance_name`, `net.peer.port` is no longer required (but still recommended if non-standard). * - * @deprecated use ATTR_DB_MSSQL_INSTANCE_NAME + * @deprecated Use ATTR_DB_MSSQL_INSTANCE_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_MSSQL_INSTANCE_NAME = TMP_DB_MSSQL_INSTANCE_NAME; /** * The name of the keyspace being accessed. To be used instead of the generic `db.name` attribute. * - * @deprecated use ATTR_DB_CASSANDRA_KEYSPACE + * @deprecated Use ATTR_DB_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_KEYSPACE = TMP_DB_CASSANDRA_KEYSPACE; /** * The fetch size used for paging, i.e. how many rows will be returned at once. * - * @deprecated use ATTR_DB_CASSANDRA_PAGE_SIZE + * @deprecated Use ATTR_DB_CASSANDRA_PAGE_SIZE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_PAGE_SIZE = TMP_DB_CASSANDRA_PAGE_SIZE; /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated use ATTR_DB_CASSANDRA_CONSISTENCY_LEVEL + * @deprecated Use ATTR_DB_CASSANDRA_CONSISTENCY_LEVEL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_CONSISTENCY_LEVEL = TMP_DB_CASSANDRA_CONSISTENCY_LEVEL; @@ -268,21 +268,21 @@ export const SEMATTRS_DB_CASSANDRA_CONSISTENCY_LEVEL = * * Note: This mirrors the db.sql.table attribute but references cassandra rather than sql. It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. * - * @deprecated use ATTR_DB_CASSANDRA_TABLE + * @deprecated Use ATTR_DB_CASSANDRA_TABLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_TABLE = TMP_DB_CASSANDRA_TABLE; /** * Whether or not the query is idempotent. * - * @deprecated use ATTR_DB_CASSANDRA_IDEMPOTENCE + * @deprecated Use ATTR_DB_CASSANDRA_IDEMPOTENCE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_IDEMPOTENCE = TMP_DB_CASSANDRA_IDEMPOTENCE; /** * The number of times a query was speculatively executed. Not set or `0` if the query was not executed speculatively. * - * @deprecated use ATTR_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT + * @deprecated Use ATTR_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = TMP_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; @@ -290,7 +290,7 @@ export const SEMATTRS_DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = /** * The ID of the coordinating node for a query. * - * @deprecated use ATTR_DB_CASSANDRA_COORDINATOR_ID + * @deprecated Use ATTR_DB_CASSANDRA_COORDINATOR_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_COORDINATOR_ID = TMP_DB_CASSANDRA_COORDINATOR_ID; @@ -298,7 +298,7 @@ export const SEMATTRS_DB_CASSANDRA_COORDINATOR_ID = /** * The data center of the coordinating node for a query. * - * @deprecated use ATTR_DB_CASSANDRA_COORDINATOR_DC + * @deprecated Use ATTR_DB_CASSANDRA_COORDINATOR_DC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_CASSANDRA_COORDINATOR_DC = TMP_DB_CASSANDRA_COORDINATOR_DC; @@ -306,21 +306,21 @@ export const SEMATTRS_DB_CASSANDRA_COORDINATOR_DC = /** * The [HBase namespace](https://hbase.apache.org/book.html#_namespace) being accessed. To be used instead of the generic `db.name` attribute. * - * @deprecated use ATTR_DB_HBASE_NAMESPACE + * @deprecated Use ATTR_DB_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_HBASE_NAMESPACE = TMP_DB_HBASE_NAMESPACE; /** * The index of the database being accessed as used in the [`SELECT` command](https://redis.io/commands/select), provided as an integer. To be used instead of the generic `db.name` attribute. * - * @deprecated use ATTR_DB_REDIS_DATABASE_INDEX + * @deprecated Use ATTR_DB_REDIS_DATABASE_INDEX in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_REDIS_DATABASE_INDEX = TMP_DB_REDIS_DATABASE_INDEX; /** * The collection being accessed within the database stated in `db.name`. * - * @deprecated use ATTR_DB_MONGODB_COLLECTION + * @deprecated Use ATTR_DB_MONGODB_COLLECTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_MONGODB_COLLECTION = TMP_DB_MONGODB_COLLECTION; @@ -329,28 +329,28 @@ export const SEMATTRS_DB_MONGODB_COLLECTION = TMP_DB_MONGODB_COLLECTION; * * Note: It is not recommended to attempt any client-side parsing of `db.statement` just to get this property, but it should be set if it is provided by the library being instrumented. If the operation is acting upon an anonymous table, or more than one table, this value MUST NOT be set. * - * @deprecated use ATTR_DB_SQL_TABLE + * @deprecated Use ATTR_DB_SQL_TABLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_DB_SQL_TABLE = TMP_DB_SQL_TABLE; /** * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the exception should be preferred over the static type in languages that support it. * - * @deprecated use ATTR_EXCEPTION_TYPE + * @deprecated Use ATTR_EXCEPTION_TYPE. */ export const SEMATTRS_EXCEPTION_TYPE = TMP_EXCEPTION_TYPE; /** * The exception message. * - * @deprecated use ATTR_EXCEPTION_MESSAGE + * @deprecated Use ATTR_EXCEPTION_MESSAGE. */ export const SEMATTRS_EXCEPTION_MESSAGE = TMP_EXCEPTION_MESSAGE; /** * A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. * - * @deprecated use ATTR_EXCEPTION_STACKTRACE + * @deprecated Use ATTR_EXCEPTION_STACKTRACE. */ export const SEMATTRS_EXCEPTION_STACKTRACE = TMP_EXCEPTION_STACKTRACE; @@ -374,70 +374,70 @@ even if the `exception.escaped` attribute was not set or set to false, since the event might have been recorded at a time where it was not clear whether the exception will escape. * -* @deprecated use ATTR_EXCEPTION_ESCAPED +* @deprecated Use ATTR_EXCEPTION_ESCAPED. */ export const SEMATTRS_EXCEPTION_ESCAPED = TMP_EXCEPTION_ESCAPED; /** * Type of the trigger on which the function is executed. * - * @deprecated use ATTR_FAAS_TRIGGER + * @deprecated Use ATTR_FAAS_TRIGGER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_TRIGGER = TMP_FAAS_TRIGGER; /** * The execution ID of the current function execution. * - * @deprecated use ATTR_FAAS_EXECUTION + * @deprecated Use ATTR_FAAS_INVOCATION_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_EXECUTION = TMP_FAAS_EXECUTION; /** * The name of the source on which the triggering operation was performed. For example, in Cloud Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name. * - * @deprecated use ATTR_FAAS_DOCUMENT_COLLECTION + * @deprecated Use ATTR_FAAS_DOCUMENT_COLLECTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_DOCUMENT_COLLECTION = TMP_FAAS_DOCUMENT_COLLECTION; /** * Describes the type of the operation that was performed on the data. * - * @deprecated use ATTR_FAAS_DOCUMENT_OPERATION + * @deprecated Use ATTR_FAAS_DOCUMENT_OPERATION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_DOCUMENT_OPERATION = TMP_FAAS_DOCUMENT_OPERATION; /** * A string containing the time when the data was accessed in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). * - * @deprecated use ATTR_FAAS_DOCUMENT_TIME + * @deprecated Use ATTR_FAAS_DOCUMENT_TIME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_DOCUMENT_TIME = TMP_FAAS_DOCUMENT_TIME; /** * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the name of the file, and in Cosmos DB the table name. * - * @deprecated use ATTR_FAAS_DOCUMENT_NAME + * @deprecated Use ATTR_FAAS_DOCUMENT_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_DOCUMENT_NAME = TMP_FAAS_DOCUMENT_NAME; /** * A string containing the function invocation time in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format expressed in [UTC](https://www.w3.org/TR/NOTE-datetime). * - * @deprecated use ATTR_FAAS_TIME + * @deprecated Use ATTR_FAAS_TIME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_TIME = TMP_FAAS_TIME; /** * A string containing the schedule period as [Cron Expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm). * - * @deprecated use ATTR_FAAS_CRON + * @deprecated Use ATTR_FAAS_CRON in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_CRON = TMP_FAAS_CRON; /** * A boolean that is true if the serverless function is executed for the first time (aka cold-start). * - * @deprecated use ATTR_FAAS_COLDSTART + * @deprecated Use ATTR_FAAS_COLDSTART in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_COLDSTART = TMP_FAAS_COLDSTART; @@ -446,7 +446,7 @@ export const SEMATTRS_FAAS_COLDSTART = TMP_FAAS_COLDSTART; * * Note: SHOULD be equal to the `faas.name` resource attribute of the invoked function. * - * @deprecated use ATTR_FAAS_INVOKED_NAME + * @deprecated Use ATTR_FAAS_INVOKED_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_INVOKED_NAME = TMP_FAAS_INVOKED_NAME; @@ -455,7 +455,7 @@ export const SEMATTRS_FAAS_INVOKED_NAME = TMP_FAAS_INVOKED_NAME; * * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. * - * @deprecated use ATTR_FAAS_INVOKED_PROVIDER + * @deprecated Use ATTR_FAAS_INVOKED_PROVIDER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_INVOKED_PROVIDER = TMP_FAAS_INVOKED_PROVIDER; @@ -464,70 +464,70 @@ export const SEMATTRS_FAAS_INVOKED_PROVIDER = TMP_FAAS_INVOKED_PROVIDER; * * Note: SHOULD be equal to the `cloud.region` resource attribute of the invoked function. * - * @deprecated use ATTR_FAAS_INVOKED_REGION + * @deprecated Use ATTR_FAAS_INVOKED_REGION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_FAAS_INVOKED_REGION = TMP_FAAS_INVOKED_REGION; /** * Transport protocol used. See note below. * - * @deprecated use ATTR_NET_TRANSPORT + * @deprecated Use ATTR_NET_TRANSPORT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_TRANSPORT = TMP_NET_TRANSPORT; /** * Remote address of the peer (dotted decimal for IPv4 or [RFC5952](https://tools.ietf.org/html/rfc5952) for IPv6). * - * @deprecated use ATTR_NET_PEER_IP + * @deprecated Use ATTR_NET_PEER_IP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_PEER_IP = TMP_NET_PEER_IP; /** * Remote port number. * - * @deprecated use ATTR_NET_PEER_PORT + * @deprecated Use ATTR_NET_PEER_PORT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_PEER_PORT = TMP_NET_PEER_PORT; /** * Remote hostname or similar, see note below. * - * @deprecated use ATTR_NET_PEER_NAME + * @deprecated Use ATTR_NET_PEER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_PEER_NAME = TMP_NET_PEER_NAME; /** * Like `net.peer.ip` but for the host IP. Useful in case of a multi-IP host. * - * @deprecated use ATTR_NET_HOST_IP + * @deprecated Use ATTR_NET_HOST_IP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_IP = TMP_NET_HOST_IP; /** * Like `net.peer.port` but for the host port. * - * @deprecated use ATTR_NET_HOST_PORT + * @deprecated Use ATTR_NET_HOST_PORT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_PORT = TMP_NET_HOST_PORT; /** * Local hostname or similar, see note below. * - * @deprecated use ATTR_NET_HOST_NAME + * @deprecated Use ATTR_NET_HOST_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_NAME = TMP_NET_HOST_NAME; /** * The internet connection type currently being used by the host. * - * @deprecated use ATTR_NET_HOST_CONNECTION_TYPE + * @deprecated Use ATTR_NETWORK_CONNECTION_TYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CONNECTION_TYPE = TMP_NET_HOST_CONNECTION_TYPE; /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated use ATTR_NET_HOST_CONNECTION_SUBTYPE + * @deprecated Use ATTR_NETWORK_CONNECTION_SUBTYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CONNECTION_SUBTYPE = TMP_NET_HOST_CONNECTION_SUBTYPE; @@ -535,105 +535,105 @@ export const SEMATTRS_NET_HOST_CONNECTION_SUBTYPE = /** * The name of the mobile carrier. * - * @deprecated use ATTR_NET_HOST_CARRIER_NAME + * @deprecated Use ATTR_NETWORK_CARRIER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CARRIER_NAME = TMP_NET_HOST_CARRIER_NAME; /** * The mobile carrier country code. * - * @deprecated use ATTR_NET_HOST_CARRIER_MCC + * @deprecated Use ATTR_NETWORK_CARRIER_MCC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CARRIER_MCC = TMP_NET_HOST_CARRIER_MCC; /** * The mobile carrier network code. * - * @deprecated use ATTR_NET_HOST_CARRIER_MNC + * @deprecated Use ATTR_NETWORK_CARRIER_MNC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CARRIER_MNC = TMP_NET_HOST_CARRIER_MNC; /** * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network. * - * @deprecated use ATTR_NET_HOST_CARRIER_ICC + * @deprecated Use ATTR_NETWORK_CARRIER_ICC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_NET_HOST_CARRIER_ICC = TMP_NET_HOST_CARRIER_ICC; /** * The [`service.name`](../../resource/semantic_conventions/README.md#service) of the remote service. SHOULD be equal to the actual `service.name` resource attribute of the remote service if any. * - * @deprecated use ATTR_PEER_SERVICE + * @deprecated Use ATTR_PEER_SERVICE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_PEER_SERVICE = TMP_PEER_SERVICE; /** * Username or client_id extracted from the access token or [Authorization](https://tools.ietf.org/html/rfc7235#section-4.2) header in the inbound request from outside the system. * - * @deprecated use ATTR_ENDUSER_ID + * @deprecated Use ATTR_ENDUSER_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_ENDUSER_ID = TMP_ENDUSER_ID; /** * Actual/assumed role the client is making the request under extracted from token or application security context. * - * @deprecated use ATTR_ENDUSER_ROLE + * @deprecated Use ATTR_ENDUSER_ROLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_ENDUSER_ROLE = TMP_ENDUSER_ROLE; /** * Scopes or granted authorities the client currently possesses extracted from token or application security context. The value would come from the scope associated with an [OAuth 2.0 Access Token](https://tools.ietf.org/html/rfc6749#section-3.3) or an attribute value in a [SAML 2.0 Assertion](http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html). * - * @deprecated use ATTR_ENDUSER_SCOPE + * @deprecated Use ATTR_ENDUSER_SCOPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_ENDUSER_SCOPE = TMP_ENDUSER_SCOPE; /** * Current "managed" thread ID (as opposed to OS thread ID). * - * @deprecated use ATTR_THREAD_ID + * @deprecated Use ATTR_THREAD_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_THREAD_ID = TMP_THREAD_ID; /** * Current thread name. * - * @deprecated use ATTR_THREAD_NAME + * @deprecated Use ATTR_THREAD_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_THREAD_NAME = TMP_THREAD_NAME; /** * The method or function name, or equivalent (usually rightmost part of the code unit's name). * - * @deprecated use ATTR_CODE_FUNCTION + * @deprecated Use ATTR_CODE_FUNCTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_CODE_FUNCTION = TMP_CODE_FUNCTION; /** * The "namespace" within which `code.function` is defined. Usually the qualified class or module name, such that `code.namespace` + some separator + `code.function` form a unique identifier for the code unit. * - * @deprecated use ATTR_CODE_NAMESPACE + * @deprecated Use ATTR_CODE_NAMESPACE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_CODE_NAMESPACE = TMP_CODE_NAMESPACE; /** * The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path). * - * @deprecated use ATTR_CODE_FILEPATH + * @deprecated Use ATTR_CODE_FILEPATH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_CODE_FILEPATH = TMP_CODE_FILEPATH; /** * The line number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`. * - * @deprecated use ATTR_CODE_LINENO + * @deprecated Use ATTR_CODE_LINENO in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_CODE_LINENO = TMP_CODE_LINENO; /** * HTTP request method. * - * @deprecated use ATTR_HTTP_METHOD + * @deprecated Use ATTR_HTTP_METHOD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_METHOD = TMP_HTTP_METHOD; @@ -642,14 +642,14 @@ export const SEMATTRS_HTTP_METHOD = TMP_HTTP_METHOD; * * Note: `http.url` MUST NOT contain credentials passed via URL in form of `https://username:password@www.example.com/`. In such case the attribute's value should be `https://www.example.com/`. * - * @deprecated use ATTR_HTTP_URL + * @deprecated Use ATTR_HTTP_URL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_URL = TMP_HTTP_URL; /** * The full request target as passed in a HTTP request line or equivalent. * - * @deprecated use ATTR_HTTP_TARGET + * @deprecated Use ATTR_HTTP_TARGET in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_TARGET = TMP_HTTP_TARGET; @@ -658,21 +658,21 @@ export const SEMATTRS_HTTP_TARGET = TMP_HTTP_TARGET; * * Note: When the header is present but empty the attribute SHOULD be set to the empty string. Note that this is a valid situation that is expected in certain cases, according the aforementioned [section of RFC 7230](https://tools.ietf.org/html/rfc7230#section-5.4). When the header is not set the attribute MUST NOT be set. * - * @deprecated use ATTR_HTTP_HOST + * @deprecated Use ATTR_HTTP_HOST in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_HOST = TMP_HTTP_HOST; /** * The URI scheme identifying the used protocol. * - * @deprecated use ATTR_HTTP_SCHEME + * @deprecated Use ATTR_HTTP_SCHEME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_SCHEME = TMP_HTTP_SCHEME; /** * [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). * - * @deprecated use ATTR_HTTP_STATUS_CODE + * @deprecated Use ATTR_HTTP_STATUS_CODE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_STATUS_CODE = TMP_HTTP_STATUS_CODE; @@ -681,21 +681,21 @@ export const SEMATTRS_HTTP_STATUS_CODE = TMP_HTTP_STATUS_CODE; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated use ATTR_HTTP_FLAVOR + * @deprecated Use ATTR_HTTP_FLAVOR in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_FLAVOR = TMP_HTTP_FLAVOR; /** * Value of the [HTTP User-Agent](https://tools.ietf.org/html/rfc7231#section-5.5.3) header sent by the client. * - * @deprecated use ATTR_HTTP_USER_AGENT + * @deprecated Use ATTR_HTTP_USER_AGENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_USER_AGENT = TMP_HTTP_USER_AGENT; /** * The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. * - * @deprecated use ATTR_HTTP_REQUEST_CONTENT_LENGTH + * @deprecated Use ATTR_HTTP_REQUEST_CONTENT_LENGTH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH = TMP_HTTP_REQUEST_CONTENT_LENGTH; @@ -703,7 +703,7 @@ export const SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH = /** * The size of the uncompressed request payload body after transport decoding. Not set if transport encoding not used. * - * @deprecated use ATTR_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED + * @deprecated Use ATTR_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED = TMP_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED; @@ -711,7 +711,7 @@ export const SEMATTRS_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED = /** * The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://tools.ietf.org/html/rfc7230#section-3.3.2) header. For requests using transport encoding, this should be the compressed size. * - * @deprecated use ATTR_HTTP_RESPONSE_CONTENT_LENGTH + * @deprecated Use ATTR_HTTP_RESPONSE_CONTENT_LENGTH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH = TMP_HTTP_RESPONSE_CONTENT_LENGTH; @@ -719,7 +719,7 @@ export const SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH = /** * The size of the uncompressed response payload body after transport decoding. Not set if transport encoding not used. * - * @deprecated use ATTR_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED + * @deprecated Use ATTR_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED = TMP_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED; @@ -729,14 +729,14 @@ export const SEMATTRS_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED = * * Note: `http.url` is usually not readily available on the server side but would have to be assembled in a cumbersome and sometimes lossy process from other information (see e.g. open-telemetry/opentelemetry-python/pull/148). It is thus preferred to supply the raw data that is available. * - * @deprecated use ATTR_HTTP_SERVER_NAME + * @deprecated Use ATTR_HTTP_SERVER_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_SERVER_NAME = TMP_HTTP_SERVER_NAME; /** * The matched route (path template). * - * @deprecated use ATTR_HTTP_ROUTE + * @deprecated Use ATTR_HTTP_ROUTE. */ export const SEMATTRS_HTTP_ROUTE = TMP_HTTP_ROUTE; @@ -755,21 +755,21 @@ comes from a proxy, reverse proxy, or the actual client. Setting one is at least somewhat confident that the address is not that of the closest proxy. * -* @deprecated use ATTR_HTTP_CLIENT_IP +* @deprecated Use ATTR_HTTP_CLIENT_IP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_HTTP_CLIENT_IP = TMP_HTTP_CLIENT_IP; /** * The keys in the `RequestItems` object field. * - * @deprecated use ATTR_AWS_DYNAMODB_TABLE_NAMES + * @deprecated Use ATTR_AWS_DYNAMODB_TABLE_NAMES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_TABLE_NAMES = TMP_AWS_DYNAMODB_TABLE_NAMES; /** * The JSON-serialized value of each item in the `ConsumedCapacity` response field. * - * @deprecated use ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY + * @deprecated Use ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_CONSUMED_CAPACITY = TMP_AWS_DYNAMODB_CONSUMED_CAPACITY; @@ -777,7 +777,7 @@ export const SEMATTRS_AWS_DYNAMODB_CONSUMED_CAPACITY = /** * The JSON-serialized value of the `ItemCollectionMetrics` response field. * - * @deprecated use ATTR_AWS_DYNAMODB_ITEM_COLLECTION_METRICS + * @deprecated Use ATTR_AWS_DYNAMODB_ITEM_COLLECTION_METRICS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_ITEM_COLLECTION_METRICS = TMP_AWS_DYNAMODB_ITEM_COLLECTION_METRICS; @@ -785,7 +785,7 @@ export const SEMATTRS_AWS_DYNAMODB_ITEM_COLLECTION_METRICS = /** * The value of the `ProvisionedThroughput.ReadCapacityUnits` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY + * @deprecated Use ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY = TMP_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY; @@ -793,7 +793,7 @@ export const SEMATTRS_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY = /** * The value of the `ProvisionedThroughput.WriteCapacityUnits` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY + * @deprecated Use ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY = TMP_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY; @@ -801,7 +801,7 @@ export const SEMATTRS_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY = /** * The value of the `ConsistentRead` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_CONSISTENT_READ + * @deprecated Use ATTR_AWS_DYNAMODB_CONSISTENT_READ in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_CONSISTENT_READ = TMP_AWS_DYNAMODB_CONSISTENT_READ; @@ -809,21 +809,21 @@ export const SEMATTRS_AWS_DYNAMODB_CONSISTENT_READ = /** * The value of the `ProjectionExpression` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_PROJECTION + * @deprecated Use ATTR_AWS_DYNAMODB_PROJECTION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_PROJECTION = TMP_AWS_DYNAMODB_PROJECTION; /** * The value of the `Limit` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_LIMIT + * @deprecated Use ATTR_AWS_DYNAMODB_LIMIT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_LIMIT = TMP_AWS_DYNAMODB_LIMIT; /** * The value of the `AttributesToGet` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_ATTRIBUTES_TO_GET + * @deprecated Use ATTR_AWS_DYNAMODB_ATTRIBUTES_TO_GET in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_ATTRIBUTES_TO_GET = TMP_AWS_DYNAMODB_ATTRIBUTES_TO_GET; @@ -831,21 +831,21 @@ export const SEMATTRS_AWS_DYNAMODB_ATTRIBUTES_TO_GET = /** * The value of the `IndexName` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_INDEX_NAME + * @deprecated Use ATTR_AWS_DYNAMODB_INDEX_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_INDEX_NAME = TMP_AWS_DYNAMODB_INDEX_NAME; /** * The value of the `Select` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_SELECT + * @deprecated Use ATTR_AWS_DYNAMODB_SELECT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_SELECT = TMP_AWS_DYNAMODB_SELECT; /** * The JSON-serialized value of each item of the `GlobalSecondaryIndexes` request field. * - * @deprecated use ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES + * @deprecated Use ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES = TMP_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES; @@ -853,7 +853,7 @@ export const SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES = /** * The JSON-serialized value of each item of the `LocalSecondaryIndexes` request field. * - * @deprecated use ATTR_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES + * @deprecated Use ATTR_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES = TMP_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES; @@ -861,7 +861,7 @@ export const SEMATTRS_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES = /** * The value of the `ExclusiveStartTableName` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE + * @deprecated Use ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_EXCLUSIVE_START_TABLE = TMP_AWS_DYNAMODB_EXCLUSIVE_START_TABLE; @@ -869,28 +869,28 @@ export const SEMATTRS_AWS_DYNAMODB_EXCLUSIVE_START_TABLE = /** * The the number of items in the `TableNames` response parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_TABLE_COUNT + * @deprecated Use ATTR_AWS_DYNAMODB_TABLE_COUNT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_TABLE_COUNT = TMP_AWS_DYNAMODB_TABLE_COUNT; /** * The value of the `ScanIndexForward` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_SCAN_FORWARD + * @deprecated Use ATTR_AWS_DYNAMODB_SCAN_FORWARD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_SCAN_FORWARD = TMP_AWS_DYNAMODB_SCAN_FORWARD; /** * The value of the `Segment` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_SEGMENT + * @deprecated Use ATTR_AWS_DYNAMODB_SEGMENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_SEGMENT = TMP_AWS_DYNAMODB_SEGMENT; /** * The value of the `TotalSegments` request parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS + * @deprecated Use ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_TOTAL_SEGMENTS = TMP_AWS_DYNAMODB_TOTAL_SEGMENTS; @@ -898,14 +898,14 @@ export const SEMATTRS_AWS_DYNAMODB_TOTAL_SEGMENTS = /** * The value of the `Count` response parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_COUNT + * @deprecated Use ATTR_AWS_DYNAMODB_COUNT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_COUNT = TMP_AWS_DYNAMODB_COUNT; /** * The value of the `ScannedCount` response parameter. * - * @deprecated use ATTR_AWS_DYNAMODB_SCANNED_COUNT + * @deprecated Use ATTR_AWS_DYNAMODB_SCANNED_COUNT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_SCANNED_COUNT = TMP_AWS_DYNAMODB_SCANNED_COUNT; @@ -913,7 +913,7 @@ export const SEMATTRS_AWS_DYNAMODB_SCANNED_COUNT = /** * The JSON-serialized value of each item in the `AttributeDefinitions` request field. * - * @deprecated use ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS + * @deprecated Use ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS = TMP_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS; @@ -921,7 +921,7 @@ export const SEMATTRS_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS = /** * The JSON-serialized value of each item in the the `GlobalSecondaryIndexUpdates` request field. * - * @deprecated use ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES + * @deprecated Use ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES = TMP_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES; @@ -929,21 +929,21 @@ export const SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES = /** * A string identifying the messaging system. * - * @deprecated use ATTR_MESSAGING_SYSTEM + * @deprecated Use ATTR_MESSAGING_SYSTEM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_SYSTEM = TMP_MESSAGING_SYSTEM; /** * The message destination name. This might be equal to the span name but is required nevertheless. * - * @deprecated use ATTR_MESSAGING_DESTINATION + * @deprecated Use ATTR_MESSAGING_DESTINATION_NAME in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_DESTINATION = TMP_MESSAGING_DESTINATION; /** * The kind of message destination. * - * @deprecated use ATTR_MESSAGING_DESTINATION_KIND + * @deprecated Removed in semconv v1.20.0. */ export const SEMATTRS_MESSAGING_DESTINATION_KIND = TMP_MESSAGING_DESTINATION_KIND; @@ -951,7 +951,7 @@ export const SEMATTRS_MESSAGING_DESTINATION_KIND = /** * A boolean that is true if the message destination is temporary. * - * @deprecated use ATTR_MESSAGING_TEMP_DESTINATION + * @deprecated Use ATTR_MESSAGING_DESTINATION_TEMPORARY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_TEMP_DESTINATION = TMP_MESSAGING_TEMP_DESTINATION; @@ -959,14 +959,14 @@ export const SEMATTRS_MESSAGING_TEMP_DESTINATION = /** * The name of the transport protocol. * - * @deprecated use ATTR_MESSAGING_PROTOCOL + * @deprecated Use ATTR_NETWORK_PROTOCOL_NAME. */ export const SEMATTRS_MESSAGING_PROTOCOL = TMP_MESSAGING_PROTOCOL; /** * The version of the transport protocol. * - * @deprecated use ATTR_MESSAGING_PROTOCOL_VERSION + * @deprecated Use ATTR_NETWORK_PROTOCOL_VERSION. */ export const SEMATTRS_MESSAGING_PROTOCOL_VERSION = TMP_MESSAGING_PROTOCOL_VERSION; @@ -974,28 +974,28 @@ export const SEMATTRS_MESSAGING_PROTOCOL_VERSION = /** * Connection string. * - * @deprecated use ATTR_MESSAGING_URL + * @deprecated Removed in semconv v1.17.0. */ export const SEMATTRS_MESSAGING_URL = TMP_MESSAGING_URL; /** * A value used by the messaging system as an identifier for the message, represented as a string. * - * @deprecated use ATTR_MESSAGING_MESSAGE_ID + * @deprecated Use ATTR_MESSAGING_MESSAGE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_MESSAGE_ID = TMP_MESSAGING_MESSAGE_ID; /** * The [conversation ID](#conversations) identifying the conversation to which the message belongs, represented as a string. Sometimes called "Correlation ID". * - * @deprecated use ATTR_MESSAGING_CONVERSATION_ID + * @deprecated Use ATTR_MESSAGING_MESSAGE_CONVERSATION_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_CONVERSATION_ID = TMP_MESSAGING_CONVERSATION_ID; /** * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is unknown whether the compressed or uncompressed payload size is reported. * - * @deprecated use ATTR_MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES + * @deprecated Use ATTR_MESSAGING_MESSAGE_BODY_SIZE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES = TMP_MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES; @@ -1003,7 +1003,7 @@ export const SEMATTRS_MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES = /** * The compressed size of the message payload in bytes. * - * @deprecated use ATTR_MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES + * @deprecated Removed in semconv v1.22.0. */ export const SEMATTRS_MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES = TMP_MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES; @@ -1011,21 +1011,21 @@ export const SEMATTRS_MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES = /** * A string identifying the kind of message consumption as defined in the [Operation names](#operation-names) section above. If the operation is "send", this attribute MUST NOT be set, since the operation can be inferred from the span kind in that case. * - * @deprecated use ATTR_MESSAGING_OPERATION + * @deprecated Use ATTR_MESSAGING_OPERATION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_OPERATION = TMP_MESSAGING_OPERATION; /** * The identifier for the consumer receiving a message. For Kafka, set it to `{messaging.kafka.consumer_group} - {messaging.kafka.client_id}`, if both are present, or only `messaging.kafka.consumer_group`. For brokers, such as RabbitMQ and Artemis, set it to the `client_id` of the client consuming the message. * - * @deprecated use ATTR_MESSAGING_CONSUMER_ID + * @deprecated Removed in semconv v1.21.0. */ export const SEMATTRS_MESSAGING_CONSUMER_ID = TMP_MESSAGING_CONSUMER_ID; /** * RabbitMQ message routing key. * - * @deprecated use ATTR_MESSAGING_RABBITMQ_ROUTING_KEY + * @deprecated Use ATTR_MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_RABBITMQ_ROUTING_KEY = TMP_MESSAGING_RABBITMQ_ROUTING_KEY; @@ -1035,7 +1035,7 @@ export const SEMATTRS_MESSAGING_RABBITMQ_ROUTING_KEY = * * Note: If the key type is not string, it's string representation has to be supplied for the attribute. If the key has no unambiguous, canonical string form, don't include its value. * - * @deprecated use ATTR_MESSAGING_KAFKA_MESSAGE_KEY + * @deprecated Use ATTR_MESSAGING_KAFKA_MESSAGE_KEY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_KAFKA_MESSAGE_KEY = TMP_MESSAGING_KAFKA_MESSAGE_KEY; @@ -1043,7 +1043,7 @@ export const SEMATTRS_MESSAGING_KAFKA_MESSAGE_KEY = /** * Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not producers. * - * @deprecated use ATTR_MESSAGING_KAFKA_CONSUMER_GROUP + * @deprecated Use ATTR_MESSAGING_KAFKA_CONSUMER_GROUP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_KAFKA_CONSUMER_GROUP = TMP_MESSAGING_KAFKA_CONSUMER_GROUP; @@ -1051,28 +1051,28 @@ export const SEMATTRS_MESSAGING_KAFKA_CONSUMER_GROUP = /** * Client Id for the Consumer or Producer that is handling the message. * - * @deprecated use ATTR_MESSAGING_KAFKA_CLIENT_ID + * @deprecated Use ATTR_MESSAGING_CLIENT_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_KAFKA_CLIENT_ID = TMP_MESSAGING_KAFKA_CLIENT_ID; /** * Partition the message is sent to. * - * @deprecated use ATTR_MESSAGING_KAFKA_PARTITION + * @deprecated Use ATTR_MESSAGING_KAFKA_DESTINATION_PARTITION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_KAFKA_PARTITION = TMP_MESSAGING_KAFKA_PARTITION; /** * A boolean that is true if the message is a tombstone. * - * @deprecated use ATTR_MESSAGING_KAFKA_TOMBSTONE + * @deprecated Use ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGING_KAFKA_TOMBSTONE = TMP_MESSAGING_KAFKA_TOMBSTONE; /** * A string identifying the remoting system. * - * @deprecated use ATTR_RPC_SYSTEM + * @deprecated Use ATTR_RPC_SYSTEM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_SYSTEM = TMP_RPC_SYSTEM; @@ -1081,7 +1081,7 @@ export const SEMATTRS_RPC_SYSTEM = TMP_RPC_SYSTEM; * * Note: This is the logical name of the service from the RPC interface perspective, which can be different from the name of any implementing class. The `code.namespace` attribute may be used to store the latter (despite the attribute name, it may include a class name; e.g., class with method actually executing the call on the server side, RPC client stub class on the client side). * - * @deprecated use ATTR_RPC_SERVICE + * @deprecated Use ATTR_RPC_SERVICE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_SERVICE = TMP_RPC_SERVICE; @@ -1090,49 +1090,49 @@ export const SEMATTRS_RPC_SERVICE = TMP_RPC_SERVICE; * * Note: This is the logical name of the method from the RPC interface perspective, which can be different from the name of any implementing method/function. The `code.function` attribute may be used to store the latter (e.g., method actually executing the call on the server side, RPC client stub method on the client side). * - * @deprecated use ATTR_RPC_METHOD + * @deprecated Use ATTR_RPC_METHOD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_METHOD = TMP_RPC_METHOD; /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated use ATTR_RPC_GRPC_STATUS_CODE + * @deprecated Use ATTR_RPC_GRPC_STATUS_CODE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_GRPC_STATUS_CODE = TMP_RPC_GRPC_STATUS_CODE; /** * Protocol version as in `jsonrpc` property of request/response. Since JSON-RPC 1.0 does not specify this, the value can be omitted. * - * @deprecated use ATTR_RPC_JSONRPC_VERSION + * @deprecated Use ATTR_RPC_JSONRPC_VERSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_JSONRPC_VERSION = TMP_RPC_JSONRPC_VERSION; /** * `id` property of request or response. Since protocol allows id to be int, string, `null` or missing (for notifications), value is expected to be cast to string for simplicity. Use empty string in case of `null` value. Omit entirely if this is a notification. * - * @deprecated use ATTR_RPC_JSONRPC_REQUEST_ID + * @deprecated Use ATTR_RPC_JSONRPC_REQUEST_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_JSONRPC_REQUEST_ID = TMP_RPC_JSONRPC_REQUEST_ID; /** * `error.code` property of response if it is an error response. * - * @deprecated use ATTR_RPC_JSONRPC_ERROR_CODE + * @deprecated Use ATTR_RPC_JSONRPC_ERROR_CODE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_JSONRPC_ERROR_CODE = TMP_RPC_JSONRPC_ERROR_CODE; /** * `error.message` property of response if it is an error response. * - * @deprecated use ATTR_RPC_JSONRPC_ERROR_MESSAGE + * @deprecated Use ATTR_RPC_JSONRPC_ERROR_MESSAGE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_RPC_JSONRPC_ERROR_MESSAGE = TMP_RPC_JSONRPC_ERROR_MESSAGE; /** * Whether this is a received or sent message. * - * @deprecated use ATTR_MESSAGE_TYPE + * @deprecated Use ATTR_MESSAGE_TYPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGE_TYPE = TMP_MESSAGE_TYPE; @@ -1141,21 +1141,21 @@ export const SEMATTRS_MESSAGE_TYPE = TMP_MESSAGE_TYPE; * * Note: This way we guarantee that the values will be consistent between different implementations. * - * @deprecated use ATTR_MESSAGE_ID + * @deprecated Use ATTR_MESSAGE_ID in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGE_ID = TMP_MESSAGE_ID; /** * Compressed size of the message in bytes. * - * @deprecated use ATTR_MESSAGE_COMPRESSED_SIZE + * @deprecated Use ATTR_MESSAGE_COMPRESSED_SIZE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGE_COMPRESSED_SIZE = TMP_MESSAGE_COMPRESSED_SIZE; /** * Uncompressed size of the message in bytes. * - * @deprecated use ATTR_MESSAGE_UNCOMPRESSED_SIZE + * @deprecated Use ATTR_MESSAGE_UNCOMPRESSED_SIZE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const SEMATTRS_MESSAGE_UNCOMPRESSED_SIZE = TMP_MESSAGE_UNCOMPRESSED_SIZE; @@ -2068,329 +2068,329 @@ const TMP_DBSYSTEMVALUES_COCKROACHDB = 'cockroachdb'; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_OTHER_SQL. + * @deprecated Use DB_SYSTEM_VALUE_OTHER_SQL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_OTHER_SQL = TMP_DBSYSTEMVALUES_OTHER_SQL; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MSSQL. + * @deprecated Use DB_SYSTEM_VALUE_MSSQL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MSSQL = TMP_DBSYSTEMVALUES_MSSQL; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MYSQL. + * @deprecated Use DB_SYSTEM_VALUE_MYSQL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MYSQL = TMP_DBSYSTEMVALUES_MYSQL; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_ORACLE. + * @deprecated Use DB_SYSTEM_VALUE_ORACLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_ORACLE = TMP_DBSYSTEMVALUES_ORACLE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_DB2. + * @deprecated Use DB_SYSTEM_VALUE_DB2 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_DB2 = TMP_DBSYSTEMVALUES_DB2; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_POSTGRESQL. + * @deprecated Use DB_SYSTEM_VALUE_POSTGRESQL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_POSTGRESQL = TMP_DBSYSTEMVALUES_POSTGRESQL; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_REDSHIFT. + * @deprecated Use DB_SYSTEM_VALUE_REDSHIFT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_REDSHIFT = TMP_DBSYSTEMVALUES_REDSHIFT; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_HIVE. + * @deprecated Use DB_SYSTEM_VALUE_HIVE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_HIVE = TMP_DBSYSTEMVALUES_HIVE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_CLOUDSCAPE. + * @deprecated Use DB_SYSTEM_VALUE_CLOUDSCAPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_CLOUDSCAPE = TMP_DBSYSTEMVALUES_CLOUDSCAPE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_HSQLDB. + * @deprecated Use DB_SYSTEM_VALUE_HSQLDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_HSQLDB = TMP_DBSYSTEMVALUES_HSQLDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_PROGRESS. + * @deprecated Use DB_SYSTEM_VALUE_PROGRESS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_PROGRESS = TMP_DBSYSTEMVALUES_PROGRESS; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MAXDB. + * @deprecated Use DB_SYSTEM_VALUE_MAXDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MAXDB = TMP_DBSYSTEMVALUES_MAXDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_HANADB. + * @deprecated Use DB_SYSTEM_VALUE_HANADB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_HANADB = TMP_DBSYSTEMVALUES_HANADB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_INGRES. + * @deprecated Use DB_SYSTEM_VALUE_INGRES in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_INGRES = TMP_DBSYSTEMVALUES_INGRES; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_FIRSTSQL. + * @deprecated Use DB_SYSTEM_VALUE_FIRSTSQL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_FIRSTSQL = TMP_DBSYSTEMVALUES_FIRSTSQL; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_EDB. + * @deprecated Use DB_SYSTEM_VALUE_EDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_EDB = TMP_DBSYSTEMVALUES_EDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_CACHE. + * @deprecated Use DB_SYSTEM_VALUE_CACHE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_CACHE = TMP_DBSYSTEMVALUES_CACHE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_ADABAS. + * @deprecated Use DB_SYSTEM_VALUE_ADABAS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_ADABAS = TMP_DBSYSTEMVALUES_ADABAS; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_FIREBIRD. + * @deprecated Use DB_SYSTEM_VALUE_FIREBIRD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_FIREBIRD = TMP_DBSYSTEMVALUES_FIREBIRD; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_DERBY. + * @deprecated Use DB_SYSTEM_VALUE_DERBY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_DERBY = TMP_DBSYSTEMVALUES_DERBY; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_FILEMAKER. + * @deprecated Use DB_SYSTEM_VALUE_FILEMAKER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_FILEMAKER = TMP_DBSYSTEMVALUES_FILEMAKER; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_INFORMIX. + * @deprecated Use DB_SYSTEM_VALUE_INFORMIX in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_INFORMIX = TMP_DBSYSTEMVALUES_INFORMIX; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_INSTANTDB. + * @deprecated Use DB_SYSTEM_VALUE_INSTANTDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_INSTANTDB = TMP_DBSYSTEMVALUES_INSTANTDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_INTERBASE. + * @deprecated Use DB_SYSTEM_VALUE_INTERBASE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_INTERBASE = TMP_DBSYSTEMVALUES_INTERBASE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MARIADB. + * @deprecated Use DB_SYSTEM_VALUE_MARIADB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MARIADB = TMP_DBSYSTEMVALUES_MARIADB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_NETEZZA. + * @deprecated Use DB_SYSTEM_VALUE_NETEZZA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_NETEZZA = TMP_DBSYSTEMVALUES_NETEZZA; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_PERVASIVE. + * @deprecated Use DB_SYSTEM_VALUE_PERVASIVE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_PERVASIVE = TMP_DBSYSTEMVALUES_PERVASIVE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_POINTBASE. + * @deprecated Use DB_SYSTEM_VALUE_POINTBASE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_POINTBASE = TMP_DBSYSTEMVALUES_POINTBASE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_SQLITE. + * @deprecated Use DB_SYSTEM_VALUE_SQLITE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_SQLITE = TMP_DBSYSTEMVALUES_SQLITE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_SYBASE. + * @deprecated Use DB_SYSTEM_VALUE_SYBASE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_SYBASE = TMP_DBSYSTEMVALUES_SYBASE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_TERADATA. + * @deprecated Use DB_SYSTEM_VALUE_TERADATA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_TERADATA = TMP_DBSYSTEMVALUES_TERADATA; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_VERTICA. + * @deprecated Use DB_SYSTEM_VALUE_VERTICA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_VERTICA = TMP_DBSYSTEMVALUES_VERTICA; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_H2. + * @deprecated Use DB_SYSTEM_VALUE_H2 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_H2 = TMP_DBSYSTEMVALUES_H2; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_COLDFUSION. + * @deprecated Use DB_SYSTEM_VALUE_COLDFUSION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_COLDFUSION = TMP_DBSYSTEMVALUES_COLDFUSION; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_CASSANDRA. + * @deprecated Use DB_SYSTEM_VALUE_CASSANDRA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_CASSANDRA = TMP_DBSYSTEMVALUES_CASSANDRA; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_HBASE. + * @deprecated Use DB_SYSTEM_VALUE_HBASE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_HBASE = TMP_DBSYSTEMVALUES_HBASE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MONGODB. + * @deprecated Use DB_SYSTEM_VALUE_MONGODB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MONGODB = TMP_DBSYSTEMVALUES_MONGODB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_REDIS. + * @deprecated Use DB_SYSTEM_VALUE_REDIS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_REDIS = TMP_DBSYSTEMVALUES_REDIS; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_COUCHBASE. + * @deprecated Use DB_SYSTEM_VALUE_COUCHBASE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_COUCHBASE = TMP_DBSYSTEMVALUES_COUCHBASE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_COUCHDB. + * @deprecated Use DB_SYSTEM_VALUE_COUCHDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_COUCHDB = TMP_DBSYSTEMVALUES_COUCHDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_COSMOSDB. + * @deprecated Use DB_SYSTEM_VALUE_COSMOSDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_COSMOSDB = TMP_DBSYSTEMVALUES_COSMOSDB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_DYNAMODB. + * @deprecated Use DB_SYSTEM_VALUE_DYNAMODB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_DYNAMODB = TMP_DBSYSTEMVALUES_DYNAMODB; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_NEO4J. + * @deprecated Use DB_SYSTEM_VALUE_NEO4J in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_NEO4J = TMP_DBSYSTEMVALUES_NEO4J; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_GEODE. + * @deprecated Use DB_SYSTEM_VALUE_GEODE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_GEODE = TMP_DBSYSTEMVALUES_GEODE; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_ELASTICSEARCH. + * @deprecated Use DB_SYSTEM_VALUE_ELASTICSEARCH in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_ELASTICSEARCH = TMP_DBSYSTEMVALUES_ELASTICSEARCH; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_MEMCACHED. + * @deprecated Use DB_SYSTEM_VALUE_MEMCACHED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_MEMCACHED = TMP_DBSYSTEMVALUES_MEMCACHED; /** * An identifier for the database management system (DBMS) product being used. See below for a list of well-known identifiers. * - * @deprecated Use DB_SYSTEM_VALUE_COCKROACHDB. + * @deprecated Use DB_SYSTEM_VALUE_COCKROACHDB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBSYSTEMVALUES_COCKROACHDB = TMP_DBSYSTEMVALUES_COCKROACHDB; @@ -2621,7 +2621,7 @@ const TMP_DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_SERIAL = 'local_serial'; /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ALL. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ALL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_ALL = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_ALL; @@ -2629,7 +2629,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_ALL = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_EACH_QUORUM. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_EACH_QUORUM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_EACH_QUORUM = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_EACH_QUORUM; @@ -2637,7 +2637,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_EACH_QUORUM = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_QUORUM. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_QUORUM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_QUORUM = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_QUORUM; @@ -2645,7 +2645,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_QUORUM = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_QUORUM. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_QUORUM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_QUORUM = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_QUORUM; @@ -2653,7 +2653,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_QUORUM = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ONE. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ONE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_ONE = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_ONE; @@ -2661,7 +2661,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_ONE = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_TWO. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_TWO in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_TWO = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_TWO; @@ -2669,7 +2669,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_TWO = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_THREE. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_THREE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_THREE = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_THREE; @@ -2677,7 +2677,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_THREE = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_ONE. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_ONE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_ONE = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_ONE; @@ -2685,7 +2685,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_ONE = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ANY. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_ANY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_ANY = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_ANY; @@ -2693,7 +2693,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_ANY = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_SERIAL. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_SERIAL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_SERIAL = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_SERIAL; @@ -2701,7 +2701,7 @@ export const DBCASSANDRACONSISTENCYLEVELVALUES_SERIAL = /** * The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). * - * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_SERIAL. + * @deprecated Use DB_CASSANDRA_CONSISTENCY_LEVEL_VALUE_LOCAL_SERIAL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_SERIAL = TMP_DBCASSANDRACONSISTENCYLEVELVALUES_LOCAL_SERIAL; @@ -2783,35 +2783,35 @@ const TMP_FAASTRIGGERVALUES_OTHER = 'other'; /** * Type of the trigger on which the function is executed. * - * @deprecated Use FAAS_TRIGGER_VALUE_DATASOURCE. + * @deprecated Use FAAS_TRIGGER_VALUE_DATASOURCE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASTRIGGERVALUES_DATASOURCE = TMP_FAASTRIGGERVALUES_DATASOURCE; /** * Type of the trigger on which the function is executed. * - * @deprecated Use FAAS_TRIGGER_VALUE_HTTP. + * @deprecated Use FAAS_TRIGGER_VALUE_HTTP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASTRIGGERVALUES_HTTP = TMP_FAASTRIGGERVALUES_HTTP; /** * Type of the trigger on which the function is executed. * - * @deprecated Use FAAS_TRIGGER_VALUE_PUBSUB. + * @deprecated Use FAAS_TRIGGER_VALUE_PUBSUB in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASTRIGGERVALUES_PUBSUB = TMP_FAASTRIGGERVALUES_PUBSUB; /** * Type of the trigger on which the function is executed. * - * @deprecated Use FAAS_TRIGGER_VALUE_TIMER. + * @deprecated Use FAAS_TRIGGER_VALUE_TIMER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASTRIGGERVALUES_TIMER = TMP_FAASTRIGGERVALUES_TIMER; /** * Type of the trigger on which the function is executed. * - * @deprecated Use FAAS_TRIGGER_VALUE_OTHER. + * @deprecated Use FAAS_TRIGGER_VALUE_OTHER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASTRIGGERVALUES_OTHER = TMP_FAASTRIGGERVALUES_OTHER; @@ -2866,7 +2866,7 @@ const TMP_FAASDOCUMENTOPERATIONVALUES_DELETE = 'delete'; /** * Describes the type of the operation that was performed on the data. * - * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_INSERT. + * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_INSERT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASDOCUMENTOPERATIONVALUES_INSERT = TMP_FAASDOCUMENTOPERATIONVALUES_INSERT; @@ -2874,7 +2874,7 @@ export const FAASDOCUMENTOPERATIONVALUES_INSERT = /** * Describes the type of the operation that was performed on the data. * - * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_EDIT. + * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_EDIT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASDOCUMENTOPERATIONVALUES_EDIT = TMP_FAASDOCUMENTOPERATIONVALUES_EDIT; @@ -2882,7 +2882,7 @@ export const FAASDOCUMENTOPERATIONVALUES_EDIT = /** * Describes the type of the operation that was performed on the data. * - * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_DELETE. + * @deprecated Use FAAS_DOCUMENT_OPERATION_VALUE_DELETE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASDOCUMENTOPERATIONVALUES_DELETE = TMP_FAASDOCUMENTOPERATIONVALUES_DELETE; @@ -2935,7 +2935,7 @@ const TMP_FAASINVOKEDPROVIDERVALUES_GCP = 'gcp'; * * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. * - * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_ALIBABA_CLOUD. + * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_ALIBABA_CLOUD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASINVOKEDPROVIDERVALUES_ALIBABA_CLOUD = TMP_FAASINVOKEDPROVIDERVALUES_ALIBABA_CLOUD; @@ -2945,7 +2945,7 @@ export const FAASINVOKEDPROVIDERVALUES_ALIBABA_CLOUD = * * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. * - * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_AWS. + * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_AWS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASINVOKEDPROVIDERVALUES_AWS = TMP_FAASINVOKEDPROVIDERVALUES_AWS; @@ -2954,7 +2954,7 @@ export const FAASINVOKEDPROVIDERVALUES_AWS = TMP_FAASINVOKEDPROVIDERVALUES_AWS; * * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. * - * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_AZURE. + * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_AZURE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASINVOKEDPROVIDERVALUES_AZURE = TMP_FAASINVOKEDPROVIDERVALUES_AZURE; @@ -2964,7 +2964,7 @@ export const FAASINVOKEDPROVIDERVALUES_AZURE = * * Note: SHOULD be equal to the `cloud.provider` resource attribute of the invoked function. * - * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_GCP. + * @deprecated Use FAAS_INVOKED_PROVIDER_VALUE_GCP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const FAASINVOKEDPROVIDERVALUES_GCP = TMP_FAASINVOKEDPROVIDERVALUES_GCP; @@ -3021,49 +3021,49 @@ const TMP_NETTRANSPORTVALUES_OTHER = 'other'; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_IP_TCP. + * @deprecated Use NET_TRANSPORT_VALUE_IP_TCP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETTRANSPORTVALUES_IP_TCP = TMP_NETTRANSPORTVALUES_IP_TCP; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_IP_UDP. + * @deprecated Use NET_TRANSPORT_VALUE_IP_UDP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETTRANSPORTVALUES_IP_UDP = TMP_NETTRANSPORTVALUES_IP_UDP; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_IP. + * @deprecated Removed in v1.21.0. */ export const NETTRANSPORTVALUES_IP = TMP_NETTRANSPORTVALUES_IP; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_UNIX. + * @deprecated Removed in v1.21.0. */ export const NETTRANSPORTVALUES_UNIX = TMP_NETTRANSPORTVALUES_UNIX; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_PIPE. + * @deprecated Use NET_TRANSPORT_VALUE_PIPE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETTRANSPORTVALUES_PIPE = TMP_NETTRANSPORTVALUES_PIPE; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_INPROC. + * @deprecated Use NET_TRANSPORT_VALUE_INPROC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETTRANSPORTVALUES_INPROC = TMP_NETTRANSPORTVALUES_INPROC; /** * Transport protocol used. See note below. * - * @deprecated Use NET_TRANSPORT_VALUE_OTHER. + * @deprecated Use NET_TRANSPORT_VALUE_OTHER in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETTRANSPORTVALUES_OTHER = TMP_NETTRANSPORTVALUES_OTHER; @@ -3128,7 +3128,7 @@ const TMP_NETHOSTCONNECTIONTYPEVALUES_UNKNOWN = 'unknown'; /** * The internet connection type currently being used by the host. * - * @deprecated Use NET_HOST_CONNECTION_TYPE_VALUE_WIFI. + * @deprecated Use NETWORK_CONNECTION_TYPE_VALUE_WIFI in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONTYPEVALUES_WIFI = TMP_NETHOSTCONNECTIONTYPEVALUES_WIFI; @@ -3136,7 +3136,7 @@ export const NETHOSTCONNECTIONTYPEVALUES_WIFI = /** * The internet connection type currently being used by the host. * - * @deprecated Use NET_HOST_CONNECTION_TYPE_VALUE_WIRED. + * @deprecated Use NETWORK_CONNECTION_TYPE_VALUE_WIRED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONTYPEVALUES_WIRED = TMP_NETHOSTCONNECTIONTYPEVALUES_WIRED; @@ -3144,7 +3144,7 @@ export const NETHOSTCONNECTIONTYPEVALUES_WIRED = /** * The internet connection type currently being used by the host. * - * @deprecated Use NET_HOST_CONNECTION_TYPE_VALUE_CELL. + * @deprecated Use NETWORK_CONNECTION_TYPE_VALUE_CELL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONTYPEVALUES_CELL = TMP_NETHOSTCONNECTIONTYPEVALUES_CELL; @@ -3152,7 +3152,7 @@ export const NETHOSTCONNECTIONTYPEVALUES_CELL = /** * The internet connection type currently being used by the host. * - * @deprecated Use NET_HOST_CONNECTION_TYPE_VALUE_UNAVAILABLE. + * @deprecated Use NETWORK_CONNECTION_TYPE_VALUE_UNAVAILABLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONTYPEVALUES_UNAVAILABLE = TMP_NETHOSTCONNECTIONTYPEVALUES_UNAVAILABLE; @@ -3160,7 +3160,7 @@ export const NETHOSTCONNECTIONTYPEVALUES_UNAVAILABLE = /** * The internet connection type currently being used by the host. * - * @deprecated Use NET_HOST_CONNECTION_TYPE_VALUE_UNKNOWN. + * @deprecated Use NETWORK_CONNECTION_TYPE_VALUE_UNKNOWN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONTYPEVALUES_UNKNOWN = TMP_NETHOSTCONNECTIONTYPEVALUES_UNKNOWN; @@ -3234,7 +3234,7 @@ const TMP_NETHOSTCONNECTIONSUBTYPEVALUES_LTE_CA = 'lte_ca'; /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_GPRS. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_GPRS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_GPRS = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_GPRS; @@ -3242,7 +3242,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_GPRS = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_EDGE. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_EDGE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_EDGE = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_EDGE; @@ -3250,7 +3250,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_EDGE = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_UMTS. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_UMTS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_UMTS = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_UMTS; @@ -3258,7 +3258,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_UMTS = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_CDMA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_CDMA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_CDMA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_CDMA; @@ -3266,7 +3266,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_CDMA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_EVDO_0. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_EVDO_0 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_0 = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_0; @@ -3274,7 +3274,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_0 = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_EVDO_A. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_EVDO_A in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_A = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_A; @@ -3282,7 +3282,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_A = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_CDMA2000_1XRTT. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_CDMA2000_1XRTT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_CDMA2000_1XRTT = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_CDMA2000_1XRTT; @@ -3290,7 +3290,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_CDMA2000_1XRTT = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_HSDPA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_HSDPA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSDPA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_HSDPA; @@ -3298,7 +3298,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSDPA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_HSUPA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_HSUPA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSUPA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_HSUPA; @@ -3306,7 +3306,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSUPA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_HSPA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_HSPA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSPA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_HSPA; @@ -3314,7 +3314,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSPA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_IDEN. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_IDEN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_IDEN = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_IDEN; @@ -3322,7 +3322,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_IDEN = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_EVDO_B. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_EVDO_B in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_B = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_B; @@ -3330,7 +3330,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_EVDO_B = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_LTE. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_LTE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_LTE = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_LTE; @@ -3338,7 +3338,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_LTE = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_EHRPD. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_EHRPD in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_EHRPD = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_EHRPD; @@ -3346,7 +3346,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_EHRPD = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_HSPAP. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_HSPAP in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSPAP = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_HSPAP; @@ -3354,7 +3354,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_HSPAP = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_GSM. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_GSM in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_GSM = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_GSM; @@ -3362,7 +3362,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_GSM = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_TD_SCDMA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_TD_SCDMA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_TD_SCDMA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_TD_SCDMA; @@ -3370,7 +3370,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_TD_SCDMA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_IWLAN. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_IWLAN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_IWLAN = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_IWLAN; @@ -3378,7 +3378,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_IWLAN = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_NR. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_NR in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_NR = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_NR; @@ -3386,7 +3386,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_NR = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_NRNSA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_NRNSA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_NRNSA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_NRNSA; @@ -3394,7 +3394,7 @@ export const NETHOSTCONNECTIONSUBTYPEVALUES_NRNSA = /** * This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection. * - * @deprecated Use NET_HOST_CONNECTION_SUBTYPE_VALUE_LTE_CA. + * @deprecated Use NETWORK_CONNECTION_SUBTYPE_VALUE_LTE_CA in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const NETHOSTCONNECTIONSUBTYPEVALUES_LTE_CA = TMP_NETHOSTCONNECTIONSUBTYPEVALUES_LTE_CA; @@ -3520,7 +3520,7 @@ const TMP_HTTPFLAVORVALUES_QUIC = 'QUIC'; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_1_0. + * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_1_0 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HTTPFLAVORVALUES_HTTP_1_0 = TMP_HTTPFLAVORVALUES_HTTP_1_0; @@ -3529,7 +3529,7 @@ export const HTTPFLAVORVALUES_HTTP_1_0 = TMP_HTTPFLAVORVALUES_HTTP_1_0; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_1_1. + * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_1_1 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HTTPFLAVORVALUES_HTTP_1_1 = TMP_HTTPFLAVORVALUES_HTTP_1_1; @@ -3538,7 +3538,7 @@ export const HTTPFLAVORVALUES_HTTP_1_1 = TMP_HTTPFLAVORVALUES_HTTP_1_1; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_2_0. + * @deprecated Use HTTP_FLAVOR_VALUE_HTTP_2_0 in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HTTPFLAVORVALUES_HTTP_2_0 = TMP_HTTPFLAVORVALUES_HTTP_2_0; @@ -3547,7 +3547,7 @@ export const HTTPFLAVORVALUES_HTTP_2_0 = TMP_HTTPFLAVORVALUES_HTTP_2_0; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated Use HTTP_FLAVOR_VALUE_SPDY. + * @deprecated Use HTTP_FLAVOR_VALUE_SPDY in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HTTPFLAVORVALUES_SPDY = TMP_HTTPFLAVORVALUES_SPDY; @@ -3556,7 +3556,7 @@ export const HTTPFLAVORVALUES_SPDY = TMP_HTTPFLAVORVALUES_SPDY; * * Note: If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. * - * @deprecated Use HTTP_FLAVOR_VALUE_QUIC. + * @deprecated Use HTTP_FLAVOR_VALUE_QUIC in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const HTTPFLAVORVALUES_QUIC = TMP_HTTPFLAVORVALUES_QUIC; @@ -3611,7 +3611,7 @@ const TMP_MESSAGINGDESTINATIONKINDVALUES_TOPIC = 'topic'; /** * The kind of message destination. * - * @deprecated Use MESSAGING_DESTINATION_KIND_VALUE_QUEUE. + * @deprecated Removed in semconv v1.20.0. */ export const MESSAGINGDESTINATIONKINDVALUES_QUEUE = TMP_MESSAGINGDESTINATIONKINDVALUES_QUEUE; @@ -3619,7 +3619,7 @@ export const MESSAGINGDESTINATIONKINDVALUES_QUEUE = /** * The kind of message destination. * - * @deprecated Use MESSAGING_DESTINATION_KIND_VALUE_TOPIC. + * @deprecated Removed in semconv v1.20.0. */ export const MESSAGINGDESTINATIONKINDVALUES_TOPIC = TMP_MESSAGINGDESTINATIONKINDVALUES_TOPIC; @@ -3662,7 +3662,7 @@ const TMP_MESSAGINGOPERATIONVALUES_PROCESS = 'process'; /** * A string identifying the kind of message consumption as defined in the [Operation names](#operation-names) section above. If the operation is "send", this attribute MUST NOT be set, since the operation can be inferred from the span kind in that case. * - * @deprecated Use MESSAGING_OPERATION_VALUE_RECEIVE. + * @deprecated Use MESSAGING_OPERATION_TYPE_VALUE_RECEIVE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const MESSAGINGOPERATIONVALUES_RECEIVE = TMP_MESSAGINGOPERATIONVALUES_RECEIVE; @@ -3670,7 +3670,7 @@ export const MESSAGINGOPERATIONVALUES_RECEIVE = /** * A string identifying the kind of message consumption as defined in the [Operation names](#operation-names) section above. If the operation is "send", this attribute MUST NOT be set, since the operation can be inferred from the span kind in that case. * - * @deprecated Use MESSAGING_OPERATION_VALUE_PROCESS. + * @deprecated Use MESSAGING_OPERATION_TYPE_VALUE_PROCESS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const MESSAGINGOPERATIONVALUES_PROCESS = TMP_MESSAGINGOPERATIONVALUES_PROCESS; @@ -3728,14 +3728,14 @@ const TMP_RPCGRPCSTATUSCODEVALUES_UNAUTHENTICATED = 16; /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_OK. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_OK in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_OK = TMP_RPCGRPCSTATUSCODEVALUES_OK; /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_CANCELLED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_CANCELLED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_CANCELLED = TMP_RPCGRPCSTATUSCODEVALUES_CANCELLED; @@ -3743,7 +3743,7 @@ export const RPCGRPCSTATUSCODEVALUES_CANCELLED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNKNOWN. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNKNOWN in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_UNKNOWN = TMP_RPCGRPCSTATUSCODEVALUES_UNKNOWN; @@ -3751,7 +3751,7 @@ export const RPCGRPCSTATUSCODEVALUES_UNKNOWN = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_INVALID_ARGUMENT. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_INVALID_ARGUMENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_INVALID_ARGUMENT = TMP_RPCGRPCSTATUSCODEVALUES_INVALID_ARGUMENT; @@ -3759,7 +3759,7 @@ export const RPCGRPCSTATUSCODEVALUES_INVALID_ARGUMENT = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_DEADLINE_EXCEEDED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_DEADLINE_EXCEEDED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_DEADLINE_EXCEEDED = TMP_RPCGRPCSTATUSCODEVALUES_DEADLINE_EXCEEDED; @@ -3767,7 +3767,7 @@ export const RPCGRPCSTATUSCODEVALUES_DEADLINE_EXCEEDED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_NOT_FOUND. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_NOT_FOUND in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_NOT_FOUND = TMP_RPCGRPCSTATUSCODEVALUES_NOT_FOUND; @@ -3775,7 +3775,7 @@ export const RPCGRPCSTATUSCODEVALUES_NOT_FOUND = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_ALREADY_EXISTS. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_ALREADY_EXISTS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_ALREADY_EXISTS = TMP_RPCGRPCSTATUSCODEVALUES_ALREADY_EXISTS; @@ -3783,7 +3783,7 @@ export const RPCGRPCSTATUSCODEVALUES_ALREADY_EXISTS = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_PERMISSION_DENIED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_PERMISSION_DENIED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_PERMISSION_DENIED = TMP_RPCGRPCSTATUSCODEVALUES_PERMISSION_DENIED; @@ -3791,7 +3791,7 @@ export const RPCGRPCSTATUSCODEVALUES_PERMISSION_DENIED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_RESOURCE_EXHAUSTED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_RESOURCE_EXHAUSTED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_RESOURCE_EXHAUSTED = TMP_RPCGRPCSTATUSCODEVALUES_RESOURCE_EXHAUSTED; @@ -3799,7 +3799,7 @@ export const RPCGRPCSTATUSCODEVALUES_RESOURCE_EXHAUSTED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_FAILED_PRECONDITION. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_FAILED_PRECONDITION in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_FAILED_PRECONDITION = TMP_RPCGRPCSTATUSCODEVALUES_FAILED_PRECONDITION; @@ -3807,7 +3807,7 @@ export const RPCGRPCSTATUSCODEVALUES_FAILED_PRECONDITION = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_ABORTED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_ABORTED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_ABORTED = TMP_RPCGRPCSTATUSCODEVALUES_ABORTED; @@ -3815,7 +3815,7 @@ export const RPCGRPCSTATUSCODEVALUES_ABORTED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_OUT_OF_RANGE. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_OUT_OF_RANGE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_OUT_OF_RANGE = TMP_RPCGRPCSTATUSCODEVALUES_OUT_OF_RANGE; @@ -3823,7 +3823,7 @@ export const RPCGRPCSTATUSCODEVALUES_OUT_OF_RANGE = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNIMPLEMENTED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNIMPLEMENTED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_UNIMPLEMENTED = TMP_RPCGRPCSTATUSCODEVALUES_UNIMPLEMENTED; @@ -3831,7 +3831,7 @@ export const RPCGRPCSTATUSCODEVALUES_UNIMPLEMENTED = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_INTERNAL. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_INTERNAL in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_INTERNAL = TMP_RPCGRPCSTATUSCODEVALUES_INTERNAL; @@ -3839,7 +3839,7 @@ export const RPCGRPCSTATUSCODEVALUES_INTERNAL = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNAVAILABLE. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNAVAILABLE in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_UNAVAILABLE = TMP_RPCGRPCSTATUSCODEVALUES_UNAVAILABLE; @@ -3847,7 +3847,7 @@ export const RPCGRPCSTATUSCODEVALUES_UNAVAILABLE = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_DATA_LOSS. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_DATA_LOSS in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_DATA_LOSS = TMP_RPCGRPCSTATUSCODEVALUES_DATA_LOSS; @@ -3855,7 +3855,7 @@ export const RPCGRPCSTATUSCODEVALUES_DATA_LOSS = /** * The [numeric status code](https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md) of the gRPC request. * - * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNAUTHENTICATED. + * @deprecated Use RPC_GRPC_STATUS_CODE_VALUE_UNAUTHENTICATED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const RPCGRPCSTATUSCODEVALUES_UNAUTHENTICATED = TMP_RPCGRPCSTATUSCODEVALUES_UNAUTHENTICATED; @@ -3957,14 +3957,14 @@ const TMP_MESSAGETYPEVALUES_RECEIVED = 'RECEIVED'; /** * Whether this is a received or sent message. * - * @deprecated Use MESSAGE_TYPE_VALUE_SENT. + * @deprecated Use MESSAGE_TYPE_VALUE_SENT in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const MESSAGETYPEVALUES_SENT = TMP_MESSAGETYPEVALUES_SENT; /** * Whether this is a received or sent message. * - * @deprecated Use MESSAGE_TYPE_VALUE_RECEIVED. + * @deprecated Use MESSAGE_TYPE_VALUE_RECEIVED in [incubating entry-point]({@link https://github.com/open-telemetry/opentelemetry-js/blob/main/semantic-conventions/README.md#unstable-semconv}). */ export const MESSAGETYPEVALUES_RECEIVED = TMP_MESSAGETYPEVALUES_RECEIVED; diff --git a/tsconfig.base.json b/tsconfig.base.json index cbafb67678a..e48dfc46a1f 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -21,7 +21,12 @@ "strict": true, "strictNullChecks": true, "target": "es2017", - "useUnknownInCatchVariables": false + "useUnknownInCatchVariables": false, + "lib": [ + "es2017", + "dom", + "dom.iterable" + ] }, "exclude": [ "node_modules" diff --git a/tsconfig.esm.json b/tsconfig.esm.json index 149b8f83947..1a99e986fd2 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -47,9 +47,6 @@ { "path": "experimental/packages/otlp-transformer/tsconfig.esm.json" }, - { - "path": "experimental/packages/propagator-aws-xray-lambda/tsconfig.esm.json" - }, { "path": "experimental/packages/sdk-events/tsconfig.esm.json" }, @@ -86,9 +83,6 @@ { "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esm.json" }, - { - "path": "packages/propagator-aws-xray/tsconfig.esm.json" - }, { "path": "packages/sdk-metrics/tsconfig.esm.json" }, diff --git a/tsconfig.esnext.json b/tsconfig.esnext.json index 5f071fd2246..1ed2cfadb57 100644 --- a/tsconfig.esnext.json +++ b/tsconfig.esnext.json @@ -47,9 +47,6 @@ { "path": "experimental/packages/otlp-transformer/tsconfig.esnext.json" }, - { - "path": "experimental/packages/propagator-aws-xray-lambda/tsconfig.esnext.json" - }, { "path": "experimental/packages/sdk-events/tsconfig.esnext.json" }, @@ -86,9 +83,6 @@ { "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json" }, - { - "path": "packages/propagator-aws-xray/tsconfig.esnext.json" - }, { "path": "packages/sdk-metrics/tsconfig.esnext.json" }, diff --git a/tsconfig.json b/tsconfig.json index 0069ce530a5..20d0a5a10df 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,7 +27,6 @@ "experimental/packages/otlp-exporter-base", "experimental/packages/otlp-grpc-exporter-base", "experimental/packages/otlp-transformer", - "experimental/packages/propagator-aws-xray-lambda", "experimental/packages/sampler-jaeger-remote", "experimental/packages/sdk-events", "experimental/packages/sdk-logs", @@ -46,7 +45,6 @@ "packages/opentelemetry-sdk-trace-node", "packages/opentelemetry-sdk-trace-web", "packages/opentelemetry-shim-opentracing", - "packages/propagator-aws-xray", "packages/sdk-metrics", "semantic-conventions" ], @@ -130,9 +128,6 @@ { "path": "experimental/packages/otlp-transformer" }, - { - "path": "experimental/packages/propagator-aws-xray-lambda" - }, { "path": "experimental/packages/sampler-jaeger-remote" }, @@ -187,9 +182,6 @@ { "path": "packages/opentelemetry-shim-opentracing" }, - { - "path": "packages/propagator-aws-xray" - }, { "path": "packages/sdk-metrics" },