[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ONS_EXTENSION_VERSION is defined (#1846)
Co-authored-by: Trent Mick <[email protected]>
This also reduces the number of pino versions tested with test-all-versions test (from 42 to 13, currently).
…ion scope name, to align with instrumentations (#1822) Closes: #1782
…ies (#1804) Closes: #1787
…ttribute from DynamoDB spans (#1748) * feat: add configuration to customise dynamodb statement serialization * fix: format readme * chore: pass DiagLogger to DynamoDB instrumentation * chore: omit db statement when serializer is not configured or when it returned undefined Allow for passing operation to serializer * chore: run lint:fix --------- Co-authored-by: Amir Blum <[email protected]>
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <[email protected]>
…ines from >=14.0 to >=14 (#1843) This bump means that the minimum supported Node.js version is vague about the minor. '>=14' is used in all other instrumentations. CI only tests with the current latest Node.js v14.x.
* feat: add esnext target for auto-instr-web package * remove unnecessary jsx line from tsconfig * add skipLibCheck to match tsconfig.esm
…838) * test: fix TAV tests for @cucumber/cucumber and @aws-sdk/client-s3 - Switch to 'npm run --ws test-all-versions ...' for running TAV tests, instead of 'lerna run test-all-versions ...' because nx sets 'npm_config_legacy_peer_deps=true' which breaks '@cucumber/[email protected]' install and could break other installs by ignoring 'peerDependencies'. - Skip the bad '@aws-sdk/[email protected]' release in TAV tests. Also: - Reduce the number of versions of 'aws-sdk' and '@aws-sdk/*' packages test in TAV tests from 249, 143, and 132 versions currently, to 7 each. - Add a top-level `npm run test-all-versions` script to run that script in all packages that have one. This is the equivalent of the "test-all-versions.yml" CI workflow. Fixes: #1828
…sqs ReceiveMessage context handling (#1847) In `@aws-sdk/client-sqs` v3.316 the SQS client methods became async. This breaks the `utils.bindPromise` usage that attempts to propagate the SQS ReceiveMessage span context to the user's handler for the method's returned promise. Fixing that propagation is for #707 or another issue. This change is a workaround that skips the testing of that span context propagation feature. Fixes: #1477 Refs: #707 Co-authored-by: Marc Pichler <[email protected]>
… release with needed feature (#1854) Closes: #1783
…211) * fix(otlp-exporter-base): decrease concurrency limit to 30 * fix(changelog): add changelog entry
* Update webpack to latest * Skip tree shake test on node 8 * Update webpack utility modules * lint * Apply review comments * Invert test skip * Use process.versions.node * Remove approval requirement for webpack
[email protected] was a bad release that accidentally broken v14 support. This updates the versions test to skip that release, and also reduces the number of versions tested from 27 to 8 by selecting just the current latest minor releases. Also, drop the pretest config that (a) was never used because of the wrong indentation and (b) is no longer valid since the move to npm workspaces. Refs: #1860
The beforeEach() hook was not awaited, so afterEach() could run before it completed, resulting in a client.disconnect() that rejects, and a mocha hook that calls done() twice. Refs: #1860 Co-authored-by: Marc Pichler <[email protected]>
This tests just the latest in each minor version. Refs: #1860 Co-authored-by: Marc Pichler <[email protected]>
* chore: prepare release 1.19.0/0.46.0 * fix(changelog): move entry
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v0.21.4...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…(security) (#1868) * chore: bump system info version to address arbitrary command injection vulnerability in systeminformation Signed-off-by: yyomba <[email protected]> * chore: sync package-lock.json --------- Signed-off-by: yyomba <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
* fix: remove unnecessary base64 encoding for span contexts * chore: add changelog --------- Co-authored-by: Daniel Dyla <[email protected]>
* fix(instrumentation): use caret on import-in-the-middle * fix: add chanelog entry --------- Co-authored-by: Daniel Dyla <[email protected]>
we may want information but still never stale it so set exempt label first for early return. any-of-label is comma-separated allowlist. remove instr-request and bug to avoid needing to remove labels. Co-authored-by: Marc Pichler <[email protected]>
This is as a workaround for ESM testing failing with v18.19.0 due to node's off-thread ESM loading and import-in-the-middle's limitation with reexports. Refs: open-telemetry/opentelemetry-js-contrib#1872
* fix(deps): update opentelemetry-js monorepo * fix(deps): update otel core experimental to ^0.46.0 * fix: re-generate package-lock.json * fix: test with updated import-in-the-middle hook * fix: use type-compatible versions of rxjs * fix(mongodb-example): remove unneeded useUnifiedTopology parameter * fix: remove iitm 1.7.2 again, use otel hook (iitm 1.7.1) --------- Co-authored-by: Mend Renovate <[email protected]>
* added maintainer for the react plugin * Update .github/component_owners.yml --------- Co-authored-by: Marc Pichler <[email protected]>
Also, fix error in test-all-versions@6 with not liking socket.io@^3.1.3 being an empty range I also reduced the number of socket.io@4 versions tested (4.4.1 is over 2y old) Co-authored-by: Trent Mick <[email protected]>
* fix(instrumentation): do not import 'path' in browser runtimes * fix(changelog): clean up and add entry * fix(instrumentation): add missing license header * fix(changelog): formatting * fix(instrumentation): do not throw
…… (#4351) * fix(exporter-logs-otlp-proto): programatic headers take precedence over environment variables * chore: update PR url in changelog * chore: fix deletion of env var * fix(exporter-logs-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-proto): programatic headers take precedence over environment variable * chore: update CHANGELOG --------- Co-authored-by: Marc Pichler <[email protected]>
…1884) * fix(azure-resource-detector): Ensure that resources aren't classified as app service when they're using functions and both detectors are imported. * Fix lint. * Clean up and unify tests.
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <[email protected]>
* ci: automatically map component labels to PRs * feat: ensure labels are applied when dependencies are updated * fix: faulty paths
* Allow configuring pino to log with different keys * Update README and add jsdoc * Still have 2 failing tests * Break tests out * Return test context * Simplify --------- Co-authored-by: Amir Blum <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
…metry-js@ae0a3c5) - commit ae0a3c5 - Author: Vladimir Adamić <[email protected]> - Date: Wed Jan 3 17:42:17 2024 +0100 - fix(exporter-logs-otlp-proto): programatic headers take precedence ov… (#4351) - ... ### Auto resolving 5 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 5 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/packages/opentelemetry-core/src/common/hex-to-binary.ts - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@33b31d0) - commit 33b31d0 - Author: drewcorlin1 <[email protected]> - Date: Sun Jan 7 01:30:28 2024 -0500 - feat: Allow configuring pino to log with different keys (#1867) - ... ### Auto resolving 18 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 9 UD (Updated <=> Deleted): 7 AU (Added <=> Updated): 1 DD (Deleted <=> Deleted): 1 - (UA) auto-merge/contrib/.github/component-label-map.yml - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/.github/workflows/label-prs.yml - Unmerged, added by them => checkout theirs - (UD) auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/README.md - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_client.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_server.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/package.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/tracer.js - Unmerged, deleted by them => remove - (UA) auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/common.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-default-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-named-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-disabled.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-enabled.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Added in ours => checkout ours - (UD) auto-merge/contrib/scripts/parse-lerna-scopes.mjs - Unmerged, deleted by them => remove ...truncated...
Processing otel-js - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Re-Copying master file - (*F) /auto-merge/contrib/examples/grpc_dynamic_codegen - Removing extra folder grpc_dynamic_codegen - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/fixtures/use-koa.mjs - Re-Copying master file - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Removing extra file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes from otel-js@main (https://github.com/open-telemetry/opentelemetry-js)
Merging otel-js @ ae0a3c5...
Auto resolving 5 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 5
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ 33b31d0...
Auto resolving 18 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 9
UD (Updated <=> Deleted): 7
AU (Added <=> Updated): 1
DD (Deleted <=> Deleted): 1
...truncated...