This repository was archived by the owner on Nov 17, 2025. It is now read-only.
[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #253
Merged
MSNev merged 7 commits intoopen-telemetry:auto-merge/repo-stagingfrom Mar 17, 2025
Conversation
…lush into debug-logs (#2753)
…rce detectors (#5535)
…strumented packages (#2723) This flips the usage of 'npm test' and 'npm run test-all-versions' so that the former uses recent versions of the instrumented packages. This allows updating devDeps to the latest. 'npm test' will skip tests for older versions of node that aren't supported by the latest version of the instrumented packages. Testing all the old versions (of node and instrumented packages) is left to 'npm run test-all-versions' (TAV). Refs: #2722
…metry-js@7fde940) - commit 7fde940 - Author: Marc Pichler <marc.pichler@dynatrace.com> - Date: Mon Mar 17 16:40:53 2025 +0100 - chore: prepare release 2.0.0/0.200.0 (#5521) - ...
…opentelemetry-js-contrib@8e08755) - commit 8e08755 - Author: Trent Mick <trentm@gmail.com> - Date: Fri Mar 14 11:27:57 2025 -0700 - test(instrumentation-aws-sdk): update devDeps to modern version of instrumented packages (#2723) - ... ### Auto resolving 5 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 3 AU (Added <=> Updated): 1 DD (Deleted <=> Deleted): 1 - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-s3.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-sqs.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts - Added in ours => checkout ours - (UA) auto-merge/contrib/scripts/skip-test-if.js - Unmerged, added by them => checkout theirs - (DD) plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts - Removed from both
Processing otel-js Processing otel-js-contrib - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts - Removing extra file
MSNev
approved these changes
Mar 17, 2025
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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 @ 7fde940...
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ 8e08755...
Auto resolving 5 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 3
AU (Added <=> Updated): 1
DD (Deleted <=> Deleted): 1