[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #207
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
Types are included in 'mysql2' now (as of some 2.x release). The github:types/mysql2 dependency is problematic for dependabot version updates. See: open-telemetry/opentelemetry-js-contrib#1806 (comment) Co-authored-by: Marc Pichler <[email protected]>
…s (#1817) * fix(ci): use opentelemetrybot to sync package-lock.json on release PRs * fix: comment typo * fix: token is named RELEASE_PR_TOKEN
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <[email protected]>
…4270) Closes: #4242
* fix(instrumentation-net): Don't operate on closed span * Fix lint
* feat(instrumentation-bunyan): add log sending to Logs Bridge API This extends the Bunyan instrumentation to automatically add a Bunyan stream to created loggers that will send log records to the Logs Bridge API: https://opentelemetry.io/docs/specs/otel/logs/bridge-api/ Now that the instrumentation supports separate "injection" of fields and "bridging" of log records functionality, this also adds two boolean options to disable those independently: `enableInjection` and `enableLogsBridge`. This also updates the instrumentation to work with ES module usage. Closes: #1559 * markdown lint fixes * markdown lint fixes * catch up with recent core-deps update * some type tweaks suggested by David * more specific type Co-authored-by: Amir Blum <[email protected]> * use more self-explanatory code for mapping Bunyan level to OTel severity, from blumamir * export OpenTelemetryBunyanStream for direct usage in Bunyan loggers without the instrumentation * .apply over .call suggestion * consistency suggestion * suggestion to use the longer (perhaps clearer) logger var name * switch to false-by-default config vars to avoid surprises with undefined values See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#boolean-value Suggestion from blumamir. * document using OpenTelemetryBunyanStream without the instrumentation * fix https://eslint.org/docs/latest/rules/prefer-spread lint error * drop options to OpenTelemetryBunyanStream constructor because YAGNI * temporarily drop CI caching to test theory on unit-test (18) CI failure * more CI debugging: restore cache, add some 'npm ls -a' to look into NoopContextManager being used * elide Bunyan 'pid' and 'hostname' fields in OTel log record attributes Because they are redundant with 'process.pid' and 'host.name' resource attributes. Add some docs on how to use resource detectors to the example, because the HostDetector is not on by default in the NodeSDK. * update test for having elided 'pid' and 'hostname' fields * CI debugging: ignore the 'npm ls -a' exit status, they shouldn't break the build * fix lint and compile errors * CI debugging: turn on diag DEBUG to test a theory * turn off diag in this example * undo CI debugging changes * update deps to current releases and sync package-lock.json * disableInjection -> disableLogCorrelation * disableLogsBridge -> disableLogSending Avoid using 'bridge' terminology at suggestion from specs that the Bridge API is an internal detail. * correct the default instrumentation scope name (as discussed earlier) * tests: fix test for intrumentationScope.name change in previous commit * fix lint --------- Co-authored-by: Amir Blum <[email protected]> Co-authored-by: Hector Hernandez <[email protected]>
…s (#1832) Closes: #1823 Co-authored-by: Marc Pichler <[email protected]>
* feat: add support for mongodb v6 * chore: lint fix * chore: revert bump of mongodb * chore: revert test script * chore: revert changelog * chore: filter node versions in TAV * chore: fix .tav.yml --------- Co-authored-by: Daniel Dyla <[email protected]>
… FastifyDeprecation warning for 404 request (#1763) For a 404 `request.routeOptions.url` is undefined. Since [email protected] when routeOptions was added, we shouldn't fallback to the deprecated request.routerPath. This also corrects the assumption that the handler name is "bound ..." in all cases. E.g. for a 404 it is Fastify's core "basic404" internal function. Also add a test that Fastify instrumentation works for ESM usage. Fixes: open-telemetry/opentelemetry-js-contrib#1757 Co-authored-by: Marc Pichler <[email protected]>
… listener Fixes a memory leak where unhandled response bodies pile up in node 20
* 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
Co-authored-by: Daniel Dyla <[email protected]>
…te to diag.debug (#1836) Co-authored-by: Trent Mick <[email protected]>
…ions (#1840) * docs(user-interaction): update docs to include examples of config options * add example to prevent span creation * fix lint * address PR comments * update link to list of events * syntax updates Co-authored-by: Martin Kuba <[email protected]> --------- Co-authored-by: Martin Kuba <[email protected]>
… (#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]>
* fix: allow passing in TimeInput for LogRecord * chore: update changelog
…… (#4334) * fix: programmatic url and headers take precedence in metric exporters (#2370) * chore: adjust grpc exporter metrics test * chore(changelog): update changelog
…going http requests (#4346) Fixes: open-telemetry/opentelemetry-js-contrib#1609
…ient-sqs versions using the AWS JSON 1.0 protocol (#1844) Versions 3.446.0 and later switched to a new JSON protocol. https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sqs/CHANGELOG.md#34460-2023-11-08 Refs: open-telemetry/opentelemetry-js-contrib#1838 (comment)
…metry-js@5b0fb7b) - commit 5b0fb7b - Author: Trent Mick <[email protected]> - Date: Wed Dec 6 08:08:18 2023 -0800 - fix(instrumentation-http): do not mutate given headers object for outgoing http requests (#4346) - ... ### Auto resolving 8 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 3 AU (Added <=> Updated): 2 UD (Updated <=> Deleted): 1 DD (Deleted <=> Deleted): 2 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts - Added in ours => checkout ours - (AU) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts - Added in ours => checkout ours - (UD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/types.ts - Unmerged, deleted by them => remove - (UA) auto-merge/js/scripts/update-changelog.js - Unmerged, added by them => checkout theirs - (DD) experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts - Removed from both - (DD) experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts - Removed from both
…opentelemetry-js-contrib@094fd6f) - commit 094fd6f - Author: Trent Mick <[email protected]> - Date: Wed Dec 6 08:27:17 2023 -0800 - test(instrumentation-aws-sdk): fix SQS mock responses for @aws-sdk/client-sqs versions using the AWS JSON 1.0 protocol (#1844) - ... ### Auto resolving 11 conflicts to select the master repo version Summary of changes by file state UD (Updated <=> Deleted): 1 UA (Updated <=> Added): 6 AU (Added <=> Updated): 2 DD (Deleted <=> Deleted): 2 - (UD) auto-merge/contrib/.commitlintrc.yml - Unmerged, deleted by them => remove - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-receive.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/src/OpenTelemetryBunyanStream.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5-v6.metrics.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts - Added in ours => checkout ours - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5-v6.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts - Added in ours => checkout ours - (DD) plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts - Removed from both - (DD) plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts - Removed from both
Processing otel-js - (xS) /auto-merge/js/experimental/packages/api-events/src/platform/index.ts - Re-Copying master file as size mismatch 653 !== 631 - (xS) /auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts - Re-Copying master file as size mismatch 631 !== 653 - (*E) /auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts - Removing extra file - (*E) /auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts - Removing extra file - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/README.md - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/app.js - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/app.mjs - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/telemetry.js - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/test/fixtures/use-fastify.mjs - Re-Copying master file - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts - Removing extra file - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts - Removing extra file
MSNev
approved these changes
Dec 6, 2023
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 @ 5b0fb7b...
Auto resolving 8 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 3
AU (Added <=> Updated): 2
UD (Updated <=> Deleted): 1
DD (Deleted <=> Deleted): 2
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ 094fd6f...
Auto resolving 11 conflicts to select the master repo version
Summary of changes by file state
UD (Updated <=> Deleted): 1
UA (Updated <=> Added): 6
AU (Added <=> Updated): 2
DD (Deleted <=> Deleted): 2