[next] merge changes from main
#4471
Merged
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
… listener Fixes a memory leak where unhandled response bodies pile up in node 20
…lemetry#4315) * feat: add script to update changelogs on releases * fix: address comments * Apply suggestions from code review Co-authored-by: Trent Mick <[email protected]> * fix: apply suggestions from code review * fix: use packageJson.version instead of version --------- Co-authored-by: Trent Mick <[email protected]>
fix(instrumentation-http): resume responses when there is no response…
test: make rawRequest HTTP-compliant
Add node 20 to test matrix
…open-telemetry#4289) * feat(sdk-logs): add droppedAttributesCount field to ReadableLogRecord * chore: check droppedAttributesCount value in test case * feat(otlp-transformer): make toLogRecord() use ReadableLogRecord.droppedAttributesCount --------- Co-authored-by: Marc Pichler <[email protected]>
…ry#4345) * fix: allow passing in TimeInput for LogRecord * chore: update changelog
open-telemetry#4334) * fix: programmatic url and headers take precedence in metric exporters (open-telemetry#2370) * chore: adjust grpc exporter metrics test * chore(changelog): update changelog
… of 'readers' constructor option (open-telemetry#4427) * feat(sdk-metrics): add 'readers' constructor option, deprecate MeterProvider.addMetricReader() * fix(changelog): update changelog entry, fix format
…en-telemetry#4287) * fix(sdk-trace-base): Export processed spans while exporter failed While the exporter deals with a batch of spans, new spans may come in and wait to be exported. As previously implemented, a successful export would notice these waiting spans, triggering a renewed timer check, but not so for an unsuccessful export. The result was that, prior to this commit, a failing export may end up in a situation where no further spans will be exported. This is due to the behaviour of `_addToBuffer` when the queue is full: Imagine an export which fails after a long timeout (because of, for instance, network troubles). While the connection waits to be timed out, the span queue fills up. Once completely full, no new calls to recheck the timer will be done. On its own, this behaviour is fine. When combined with the patched bug, this leads to a rather confusing case where the exporter never tries exporting. * fix(changelog): add entry --------- Co-authored-by: Marc Pichler <[email protected]>
…#4441) * fix(instrumentation): pin [email protected] * fix(changelog): add changlog entry * Update experimental/CHANGELOG.md Co-authored-by: Trent Mick <[email protected]> * fix(changelog): additional details * fix(changelog): formatting * fix(changelog): lint --------- Co-authored-by: Trent Mick <[email protected]>
* fix(exporter-logs-otlp-grpc): set User-Agent header * fix(exporter-logs-otlp-http): set User-Agent header * fix(exporter-logs-otlp-proto): set User-Agent header * chore(changelog): update changelog --------- Co-authored-by: Marc Pichler <[email protected]>
…etry#4431) * refactor(exporter-prometheus): promisify prometheus tests * fix: lint --------- Co-authored-by: Marc Pichler <[email protected]>
…n-telemetry#4267) * docs: add observableGauge to the prometheus experimental example Signed-off-by: Francois LP <[email protected]> * docs: add gauge image to README Signed-off-by: Francois LP <[email protected]> * refactor: change comment wording from @pichlermarc Co-authored-by: Marc Pichler <[email protected]> --------- Signed-off-by: Francois LP <[email protected]> Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Daniel Dyla <[email protected]>
… headers with fetch (open-telemetry#4348) * fix(@opentelemetry-instrumentation-fetch): compatibility with Map inputs for request headers with fetch * Update experimental/CHANGELOG.md Co-authored-by: Marc Pichler <[email protected]> * adding description for ts-ignore * fix(changlog): move entry to unreleased * fix: add lint ignore --------- Co-authored-by: Marc Pichler <[email protected]>
* chore: prepare release 1.21.0/0.48.0 * chore: sync package-lock.json
…metry#4394) * fix(sdk-node): Allow tracerProvider to be created when exporter is defined in the env. * fix(node-sdk): Update to not accept when exporter is set to none. * fix(sdk-node): Update Changelog. * fix(sdk-node): Fix Changelog. * fix(sdk-node): cleanup changelog. * fix(sdk-node): lint fix * fix(sdk-node): Fix logic for creating tracerProviders. * Fix lint. * Update experimental/CHANGELOG.md Co-authored-by: Marc Pichler <[email protected]> * Fix manual sampler and environment exporter case. * Update logic to check for a defined traceExporter on the config before using the NodeTracerProvider. * Fix equality check. * Update env exporter configuration logic and add tests. * Update experimental/CHANGELOG.md Co-authored-by: Marc Pichler <[email protected]> * Fix changelog issues. * Clean up tracerProvider logic. * Update sdk.ts * Update sdk.ts * Update experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts Co-authored-by: Marc Pichler <[email protected]> * Update experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts Co-authored-by: Marc Pichler <[email protected]> * Update experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts Co-authored-by: Marc Pichler <[email protected]> --------- Co-authored-by: Marc Pichler <[email protected]>
…nstrumentation (open-telemetry#4420) * refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation * fix(changelog): add changelog entry
…-telemetry#4418) * Make InstrumentationAbstract.init public * Update changelog * Update JSDoc --------- Co-authored-by: Marc Pichler <[email protected]>
…try#4314) * Allow LoggerProvider to be specified in Instrumentations * Update * Lint * Add test * npm i * Update changelog * npm i * marking setLoggerProvider as optional * Add check for possible undefined method * npm i
…elemetry#4459) Co-authored-by: Marc Pichler <[email protected]>
…lemetry#4455) * fix(sdk-metrics): ignore NaN value recordings * fix(changelog): add changelog entry * test(exporter-prometheus): adapt tests * fix(sdk-metrics): ignore in accumulation instead * fix(changelog): update changelog
* fix(sdk-metrics): allow single bucket histograms * test(sdk-metrics): undefined and null inputs for bucket boundaries * fixup! test(sdk-metrics): undefined and null inputs for bucket boundaries
Co-authored-by: Marc Pichler <[email protected]>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## next #4471 +/- ##
==========================================
+ Coverage 92.24% 92.47% +0.23%
==========================================
Files 332 330 -2
Lines 9437 9505 +68
Branches 1999 2023 +24
==========================================
+ Hits 8705 8790 +85
+ Misses 732 715 -17
|
|
There is just no possible way to review these merges back into next. I'm not sure what to do. Should we rubber-stamp because all the code has already been reviewed once already? The biggest risk is that maybe one of the merge conflicts would be incorrectly resolved. I think it's ok though. If the tests pass I have reasonably high confidence that at least nothing huge is broken. |
dyladan
approved these changes
Feb 9, 2024
There was a problem hiding this comment.
I looked at all .ts files (skipping tests) at least. I don't see any glaring issues
link for those that want to do the same: https://github.com/open-telemetry/opentelemetry-js/pull/4471/files?file-filters%5B%5D=.ts&show-deleted-files=false&show-viewed-files=false
|
IMPORTANT: do not "squash and merge" you must create a merge commit or the next merge will be even more difficult |
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.
Updates
nextwith the latest changes frommain.All changes here are pre-reviewed already.
See #4308