[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #211
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
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…es (#1895) Was introduced in commit `a0003e76fc46afbbee2558a7d21906be7c9cb1d1` but all usages seem to have been removed. By having this in the dependencies, we were getting peer-dep warnings on install as this version of core seems to be outdated. Co-authored-by: Amir Blum <[email protected]>
… no propagation fields (#1889) * fix(instrumentation-aws-sdk): make empty context when SQS message has no propagation fields * style: lint fix --------- Co-authored-by: Amir Blum <[email protected]>
…client is import (#1851) I wasn't getting any MongoDB info, turned on diag logging and it warned the client was being imported before instrumentation was setup...reordered the imports and started to get spans! Co-authored-by: Amir Blum <[email protected]>
* chore: prepare release 1.20.0/0.47.0 * Update experimental/CHANGELOG.md Co-authored-by: Jamie Danielson <[email protected]> * fix(readme): add entry to compatibility matrix --------- Co-authored-by: Jamie Danielson <[email protected]>
…1858) Co-authored-by: Amir Blum <[email protected]>
…on span creation (#4417) * fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation * fix(changelog): add changelog entry
* feat(api): add experimental package and SugaredTracer * tests(api/experimental): add tests * fix: packages.json exports * move export into experimental package * add additional tests * fix: do not use catch and finally for compatibility with Node 8 --------- Co-authored-by: Chengzhong Wu <[email protected]>
…(#4320) * chore(opentelemetry-context-zone-peer-dep): update deps to support angular 16 closes issue #4245 Signed-off-by: rbrennan <[email protected]> * update packages * Revert "update packages" This reverts commit 624df4ea2e3dcd235f0dfd72da66cbf427aaccd2. * chore: sync package-lock.json * chore: sync package-lock.json * chore: sync package-lock.json * Update ZoneContextManager.test to use ES5 UMD bundle * add changelog * remove trailing space from changelog --------- Signed-off-by: rbrennan <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
…metry-js@bf8714e) - commit bf8714e - Author: Rodger Brennan <[email protected]> - Date: Tue Jan 16 22:45:56 2024 -0500 - chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 (#4320) - ...
…opentelemetry-js-contrib@c8bebc7) - commit c8bebc7 - Author: Marc Pichler <[email protected]> - Date: Wed Jan 17 15:56:30 2024 +0100 - chore(renovate): use full list of experimental packages (#1897) - ... ### Auto resolving 1 conflict to select the master repo version Summary of changes by file state UA (Updated <=> Added): 1 - (UA) auto-merge/contrib/packages/opentelemetry-host-metrics/test/mocks/process.json - Unmerged, added by them => checkout theirs
Processing otel-js - (xM) /auto-merge/js/api/src/experimental/index.ts - Re-Copying master file - (xM) /auto-merge/js/api/src/experimental/trace/SugaredOptions.ts - Re-Copying master file - (xM) /auto-merge/js/api/src/experimental/trace/SugaredTracer.ts - Re-Copying master file - (xM) /auto-merge/js/api/test/common/experimental/trace/SugaredTracer.test.ts - Re-Copying master file - (*F) /api - Removing extra folder api Processing otel-js-contrib
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 @ bf8714e...
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ c8bebc7...
Auto resolving 1 conflict to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 1