[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #230
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
* refactor: reduce and simplify usage of getEnv() * docs: update CHANGELOG * fixup! docs: update CHANGELOG --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* chore: add @maryliag to triagers * chore: alphabetically order approvers * chore: it's grafana labs, not grafana
* docs: impose feature-freeze on unmtainainted components * fixup! docs: impose feature-freeze on unmtainainted components * docs: add exemption for semconv updates * docs: clarify that bugs are exempt from auto-close * fixup! docs: clarify that bugs are exempt from auto-close * fixup! docs: impose feature-freeze on unmtainainted components
* fixexport instrumentations only as named export * fix(undici): remove un-needed exports from index.ts
…300) Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* fix!(instrumentation-koa): use feneric config hook types and move dep to dev * chore: lint fix --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* feat(instrumentation-pino): add log sending to Logs Bridge API * refactor tests (mostly from separate #2247 PR); lint:fix; some in-progress changes * remove some old dev/debug code * feat!: make it so re-enabled instr after creating a logger will NOT change behaviour for that logger This removes functionality that was there before, so technically could be breaking. The motivation is to have the contract of pino instrumentation be cleaner. With this change a pino Logger instance will not be touched if the PinoInstrumentation is disabled. I.e. we are hands-off as much as possible when disabled. Before this change, even when disabled, the instrumentation would tweak the pino Logger config to have a no-op mixin. If the instrumentation was later enabled, then the mixin would become active (adding trace_id et al fields in a span context). The coming "log sending" to the Logs Bridge API will *not* support this "work if instrumentation is re-enabled later", so I think it is clearer if neither "log sending" nor "log correlation" support this. We can back this out if we think it is important to support a possible future feature of the SDK doing live enabling/disabling of individual instrumentations. * impl disableLogCorrelation config; undo the previous commit so that log-correlation *will* follow the live instr enable/disable state * log sending: first tests; change impl to use pino.multistream * edge case tests; almost complete * more tests and a fix for 'useOnlyCustomLevels: true' usage * lint:fix * refactor some code out to utils file * add some internal docs * update readme * fix lint * avoid a possible flaky error if using pino 'unixTime' and logging in the first half-second since process start Effectively the issue is that this sometimes returns true: node -e 'console.log(Math.round(Date.now() / 1e3) * 1e3 < performance.timeOrigin)' * limit log-sending to pino@7 and later because that's when pino.multistream was added * lint:fix * discuss pino-opentelemetry-transport alternative * fix a mis-merge * update changed deps to their new latest * typo in README Co-authored-by: Hector Hernandez <39923391+hectorhdzg@users.noreply.github.com> --------- Co-authored-by: Hector Hernandez <39923391+hectorhdzg@users.noreply.github.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…ction (#2285) * chore: permanently deprecate opentelemetry-browser-extension-autoinjection Signed-off-by: svrnm <neumanns@cisco.com> * Update README.md --------- Signed-off-by: svrnm <neumanns@cisco.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…hen @opentelemetry/winston-transport is not available (#2301) * Removing error details in diag warning * Lint fix --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* chore: update all otel deps * chore: update missing deps
* chore: mark @rauno56 components as unmaintained * chore: add newly unmaintained components to unmaintained-list
… @opentelemetry/winston-transport scenarios (#2302)
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…autoclose (#2304)
* chore: drop ts-mocha for mocha and ts-node * fixup! chore: drop ts-mocha for mocha and ts-node
…d in v6.8.0 (#2314) Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
…ce (#4847) * fix(instrumentation):remove unused description property from instrumentation ifc * chore: changelog
…ants for semconv in Readme (#4768) * docs(opentelemetry-browser-detector): Use tree-shakeable string constants for semconv in Readme * Update changelog * Uninstall unused semantic-conventions package from browser-detector package * Move changelog entry to Unreleased section * rm changelog entry, I don't think it is necessary for a small docs update --------- Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> Co-authored-by: Trent Mick <trentm@gmail.com>
Signed-off-by: Oliver Sand <oliver@plancraft.de>
…#2294) * fix(instr-express): fix handler patching for already patched router --------- Co-authored-by: Abhijeet Prasad <devabhiprasad@gmail.com> Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com>
… plugin (#1972) A config option was added that when set to true, it follows the spec behavior to link to the produce context instead of continuing the context. The default behavior will be as it is today, so one has to opt-in to this change via the config setting. * Add the ability to use span links in AMQP plugin * add default behavior * Add in tests for useLinks option * Updating tests to correct Semantic attributes --------- Co-authored-by: Jamie Danielson <jamiedanielson@honeycomb.io>
looks like this was renamed from test-utils to contrib-test-utils a few years back but the readme still uses the old name.
…metry-js@54b14fb) - commit 54b14fb - Author: Oliver Sand <oliver@plancraft.de> - Date: Tue Jul 9 23:16:23 2024 +0200 - docs(opentelemtry-instrumentation): fix reversed jsdoc comment (#4855) - ...
…opentelemetry-js-contrib@afccd0d) - commit afccd0d - Author: Jamie Danielson <jamiedanielson@honeycomb.io> - Date: Mon Jul 15 10:20:59 2024 -0400 - docs(test-utils): fix package name in readme (#2338) - ... ### Auto resolving 1 conflict to select the master repo version Summary of changes by file state UA (Updated <=> Added): 1 - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/src/log-sending-utils.ts - Unmerged, added by them => checkout theirs
Processing otel-js - (xM) /auto-merge/js/.mocharc.yml - Re-Copying master file - (*E) /.mocharc.yml - Removing extra file 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 @ 54b14fb...
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ afccd0d...
Auto resolving 1 conflict to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 1