[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #215
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
* Make InstrumentationAbstract.init public * Update changelog * Update JSDoc --------- Co-authored-by: Marc Pichler <[email protected]>
…dk-v3 instrumentation (#1913) As of smithy-lang/smithy-typescript#1146 (details at smithy-lang/smithy-typescript#1113) the CommonJS export for many (all?) `@smithy/*` packages is now an esbuild bundle -- all in `dist-cjs/index.js`. That means that subfile patching like this no longer works: ```js const v3SmithyMiddlewareStackFile = new InstrumentationNodeModuleFile( '@smithy/middleware-stack/dist-cjs/MiddlewareStack.js', ['>=1.0.1'], this.patchV3ConstructStack.bind(this), this.unpatchV3ConstructStack.bind(this) ); ``` In our case this breaks as of `@smithy/[email protected]` released 2024-01-17T22:26:42.432Z. This is considered a non-breaking change, so the dependency ranges for earlier released versions of `@smithy/smithy-client` will pick this up. A fix is to change the `@smithy/middleware-stack` patching to be on the top-level module exports. Because the `constructStack` field is only available as a getter we cannot use shimmer (InstrumentationBase._wrap). Instead this returns a new `moduleExports` object with a new getter that shims the call This PR also updates .tav.yml to reduce the number of aws-sdk package versions tested.
* 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
Co-authored-by: Marc Pichler <[email protected]>
* 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
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <[email protected]>
* 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]>
* feat(context-zone*): support zone.js 0.13.x, 0.14.x * fix(changelog): add changelog entry * fix(changelog): formatting
…ckages (#4467) * fix(instrumentation): normalize paths for internal files in scoped packages * fix(instrumentation): normalize name passed to onRequire in RequireInTheMiddleSingleton * fix(instrumentation): apply normalization during filtering internal files * fix(changelog): add changelog entry * fix: normalize before filtering * fix: lint
docs: Update getting started link in README
…ocal deps get bumped (#1928) * chore: add unreleasing packages to release-please config so their local deps get bumped This is option 1 from #1917. Refs: open-telemetry/opentelemetry-js-contrib#1917 * drop commented out debug output
… `init()` public (#4475) * feat(instrumentation): add getModuleDefinitions() instead of making init() public * test(instrumetation): add tests for getModuleDefinitions() * chore: changelog
* fix(otlp-transformer): only use BigInt inside hrTimeToNanos() * fix: changelog
…in release-please release PRs (#1939) This continues on from #1928. The non-releasing packages are being added to the release-please manifest in the hope that this prevents them from being listed in the set of released packages in a release-please PR. This is effectively Option 1b from #1917. Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
* Add the ability for the implementation to provide the binding event for shutdown. * fix: whoops totally missed the linting formatting fix step * Remove any concept of a shutdown event * add change log and obey interface * no longer need globalthis * modify the correct changelog and identify this as a breaking change under the scenario in comments * markdown lint * Update experimental/CHANGELOG.md Co-authored-by: Marc Pichler <[email protected]> --------- Co-authored-by: Marc Pichler <[email protected]>
…#1916) Signed-off-by: esara <[email protected]>
KnexInstrumentationConfig is just a type
…r is for web fetch only (#4498) * fix(instr-fetch): do not enable in Node.js; clarify in docs this instr is for web fetch only * add a changelog entry * add a diagnostic warning if attempting to use instr-fetch in Node.js * fixup! add a diagnostic warning if attempting to use instr-fetch in Node.js --------- Co-authored-by: Marc Pichler <[email protected]>
* chore: Semantic Conventions export individual strings * Reduce to just emit full strings and add size-limit test output to review the results * Update generation to use createConstMap for enums where possible * Move changelog back to Unreleased -- merge shifted it --------- Co-authored-by: Marc Pichler <[email protected]>
…IgnoreMatcher (#1929) Co-authored-by: Marc Pichler <[email protected]>
* feat(perf_hooks): add node instrumentation perf_hooks * chore(perf_hooks): rename to instrumentation-perf-hooks * test(perf_hooks): decrease wait time for tests * fix(perf_hooks): don't export when disabled * chore(perf_hooks): add empty CHANGELOG * refactor(perf_hooks): use import type over import * chore(perf_hooks): add @opentelemetry/instrumentation dependency * fix(perf_hooks): sync package-lock.json * fix(perf_hooks): Markdown lint errors * chore: remove 'performance' from gauge name * fix: update release-please-config * fix(perf_hooks): peer-api-check * chore(perf_hooks): update devDependencies * test(perf_hooks): fix flakey tests --------- Co-authored-by: Marc Pichler <[email protected]>
…metry-js@5637e2a) - commit 5637e2a - Author: Nev <[email protected]> - Date: Fri Feb 23 04:00:58 2024 -0800 - chore: Semantic Conventions export individual strings (#4298) - ... ### Auto resolving 18 conflicts to select the master repo version Summary of changes by file state AU (Added <=> Updated): 4 UA (Updated <=> Added): 10 DD (Deleted <=> Deleted): 4 - (AU) auto-merge/js/doc/GUIDELINES.md - Added in ours => checkout ours - (UA) auto-merge/js/doc/contributing/bug_triage.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/doc/contributing/dependencies.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/doc/contributing/npm_workspaces.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/doc/contributing/releasing.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/doc/upgrade-guide.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/package.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/src/index.js - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/src/internal.js - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/js/maintenance/bug_triage.md - Added in ours => checkout ours - (AU) auto-merge/js/maintenance/npm_workspaces.md - Added in ours => checkout ours - (AU) auto-merge/js/maintenance/releasing.md - Added in ours => checkout ours - (UA) auto-merge/js/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts - Unmerged, added by them => checkout theirs - (DD) doc/GUIDELINES.md - Removed from both - (DD) maintenance/bug_triage.md - Removed from both - (DD) maintenance/npm_workspaces.md - Removed from both - (DD) maintenance/releasing.md - Removed from both
…opentelemetry-js-contrib@882fb4b) - commit 882fb4b - Author: Daniel Li <[email protected]> - Date: Fri Feb 23 13:10:23 2024 +0000 - feat(perf_hooks): add node instrumentation perf_hooks (#1902) - ... ### 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-aws-sdk/src/propwrap.ts - Unmerged, added by them => checkout theirs
Processing otel-js - (*E) /auto-merge/js/doc/GUIDELINES.md - Removing extra file - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/src/internal/utils.ts - Re-Copying master file - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/test/helpers/autoImports.ts - Re-Copying master file - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/test/sizeLimit.test.ts - Re-Copying master file - (*F) /auto-merge/js/maintenance - Removing extra folder maintenance - (*F) /packages - Removing extra folder packages - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintignore - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintrc.js - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/CHANGELOG.md - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/LICENSE - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/README.md - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/package.json - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/index.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/instrumentation.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/types.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/test/event_loop_utilization.test.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/tsconfig.json - Re-Copying master file
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 @ 5637e2a...
Auto resolving 18 conflicts to select the master repo version
Summary of changes by file state
AU (Added <=> Updated): 4
UA (Updated <=> Added): 10
DD (Deleted <=> Deleted): 4
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ 882fb4b...
Auto resolving 1 conflict to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 1