[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib; #217
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
…n 'npm install' (#1955) Having a prepare script in the monorepo means that it runs during 'npm ci' which, I think, can break if some needed deps for that script haven't yet been installed.
This is to give more detail if those asserts fail. I suspect the 'val < 1' test is flaky. Refs: open-telemetry/opentelemetry-js-contrib#1960
* chore: remove the non-publishing packages from the npm workspace Because they cause difficulties with updating `@opentelemetry/*` dependencies. This is "Option 3" from #1917 Refs: #1917 * undo #1917 option 1 work (adding non-publishing packages to release-please config) from #1928 * move express example (haven't adjusted build / docs yet) * express example updates to get it working * remove non-publishing packages from release-please manifest * move koa example * fix up the koa-example-related files * move the mongodb/examples files to the top-level * fixup the mongodb-example files * move mysql-example files * fixup the mysql-example files * move redis-example files to top level examples/ dir * fixup redis-example files * update examples README to no longer suggest moving to instruemtnation package dirs * regenerate package-lock.json to rm the '.../examples' dir entries 'npm install --package-lock-only' did not accomplish this. This regen was necessary because those vestigial entries caused surprising breakage in some 'npm install --no-save ...' commands such as TAV is doing. It broke TAV tests with [email protected]. * compile:examples is no longer a thing * fix for 'npm ci' failures imported from PR #1955 * regenerate package-lock.json 'undici-types', required by the version of @types/node used by the new instrumentation-perf-hooks, was lost in the merge from main. * add some more test output information to try to help debug flaky test * fix tweaks to the test * undo the instr-perf-hooks test assert tweaks, leaving that to a separate PR
Co-authored-by: Trent Mick <[email protected]>
* chore(instr-express): add semconv to readme * use actual attribute field in readme * specify the semantic-conventions package --------- Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…504) * chore: prepare release 1.22.0/0.49.0 * chore: prepare release API 1.8.0
…me-node (#1970) * refactor(instrumentation-perf-hooks): rename to instrumentation-runtime-node * docs(instrumentaiton-runtime-node): clarify that the package only emits metrics
…gs (#4515) * fix(instrumentation): remove peer-dependency on @opentelemetry/api-logs as it's an experimental package * docs: changelog * fix: sync package-lock.json
…-detector-azure (#1979)
…o match package name (#1989) * fix(instrumentaiton-runtime-node): rename exported instrumentation * fix: lint
* chore(deps): update deps matching "@opentelemetry/*"
0.48.0 -> 0.49.1 @opentelemetry/api-logs (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/instrumentation (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/instrumentation-fetch (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/instrumentation-grpc (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/instrumentation-http (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/instrumentation-xml-http-request (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/sdk-logs (range-bump)
0.48.0 -> 0.49.1 @opentelemetry/sdk-node (range-bump)
0.49.0 -> 0.49.1 @opentelemetry/instrumentation (range-bump)
0.49.0 -> 0.49.1 @opentelemetry/sdk-node (range-bump)
1.7.0 -> 1.8.0 @opentelemetry/api
1.21.0 -> 1.22.0 @opentelemetry/context-async-hooks
1.21.0 -> 1.22.0 @opentelemetry/context-zone
1.21.0 -> 1.22.0 @opentelemetry/context-zone-peer-dep
1.21.0 -> 1.22.0 @opentelemetry/core
1.21.0 -> 1.22.0 @opentelemetry/exporter-jaeger
1.21.0 -> 1.22.0 @opentelemetry/propagator-b3
1.21.0 -> 1.22.0 @opentelemetry/resources
1.21.0 -> 1.22.0 @opentelemetry/sdk-metrics
1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-base
1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-node
1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-web
1.21.0 -> 1.22.0 @opentelemetry/semantic-conventions
* fix(test-utils): update SDK_INFO use
* fix: properly type attributes
* fix: lint
Co-authored-by: Marc Pichler <[email protected]>
* maint(instr-express): add test for ESM * dont use router in express test
… contrib packages (#1994) - reduce 'mocha' dep to v7 used by all other packages - bump /api peer dep to 1.3.0 (the version when api-metrics was merged into api) Co-authored-by: Marc Pichler <[email protected]>
* fix: (ConsoleMetricExporter): Increase console log depth to get useful information from metrics. * update: add contribution to changelog. * Update CHANGELOG.md
* fix(exporter-*-otlp-grpc)!: lazy load gRPC
…mongodb <6.4 (#1984)
…(#1965) * fix(instrumentation-perf-hooks): use TestMetricReader, unref timer * fixup! fix(instrumentation-perf-hooks): use TestMetricReader, unref timer
Since the move to npm workspaces in #1771 this pretest step is no longer needed for TAV test runs. Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
* fix(instr-express): normalize paths with double slashes * remove unnecessary listener count from test --------- Co-authored-by: Marc Pichler <[email protected]>
…us SQS.sendMessageBatch input (#1999) * fix(instr-aws-sdk): ensure that instrumentation does not crash on bogus SQS.sendMessageBatch input Fixes: #1975 * force intentionally bogus sendMessageBatch params to pass type check --------- Co-authored-by: Marc Pichler <[email protected]>
* chore: use `@web/test-runner` instead of `karma` * remove karma config file * prettier * ts * more ts * remove one more dep * maybe run browser test with node 18 * we need 16 * is json output enough? * Revert "is json output enough?" This reverts commit af20f6c3914379777908c9bcce3867187027bd51. * Revert "Revert "is json output enough?"" This reverts commit 6e3b6fe679557214d4642bb41d4ee847775a46b6. * Revert "Revert "Revert "is json output enough?""" This reverts commit 11100a87bf5f3c53105864df5637297247a9b040. * trigger ci * chore: sync package-lock.json * remove two unused deps --------- Co-authored-by: Marc Pichler <[email protected]>
…#1953) * refactor: extract `checkManuallyProvidedInstrumentationNames` method #1672 * feat: allow enabling instrumentations selected via environment variable Closes #1672 --------- Co-authored-by: Marc Pichler <[email protected]>
Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9. - [Commits](indutny/node-ip@v1.1.8...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(instrumentation-pg): prevent net.peer.port from being NaN * fix: lint * fix: test name * Update plugins/node/opentelemetry-instrumentation-pg/src/utils.ts
…metry-js@7fa2c84) - commit 7fa2c84 - Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - Date: Fri Mar 8 16:58:44 2024 +0100 - chore(deps-dev): bump ip from 1.1.8 to 1.1.9 (#4495) - ... ### Auto resolving 9 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 6 UD (Updated <=> Deleted): 3 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/test/grpc-exporter-transport.test.ts - Unmerged, added by them => checkout theirs - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts - Unmerged, deleted by them => remove - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts - Unmerged, deleted by them => remove - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts - Unmerged, deleted by them => remove - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/create-service-client-constructor.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/export-response.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/exporter-transport.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/serializers.ts - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@3b2090b) - commit 3b2090b - Author: Marc Pichler <[email protected]> - Date: Fri Mar 8 19:35:04 2024 +0100 - fix(instrumentation-pg): prevent net.peer.port from being NaN (#1982) - ... ### Auto resolving 226 conflicts to select the master repo version Summary of changes by file state UD (Updated <=> Deleted): 3 AU (Added <=> Updated): 74 UA (Updated <=> Added): 75 DD (Deleted <=> Deleted): 74 - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts - Unmerged, deleted by them => remove - (AU) auto-merge/contrib/packages/opentelemetry-host-metrics/LICENSE - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/tsconfig.json - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-propagation-utils/tsconfig.esm.json - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/.eslintignore - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/.eslintrc.js - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/README.md - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/index.ts - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/remote-sampler.ts - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/types.ts - Added in ours => checkout ours - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/test/remote-sampler.test.ts - Added in ours => checkout ours - (AU) auto-merge/contrib/plugins/node/instrumentation-amqplib/LICENSE - Added in ours => checkout ours - (AU) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Added in ours => checkout ours - (AU) auto-merge/contrib/plugins/node/instrumentation-fs/tsconfig.json - Added in ours => checkout ours - (AU) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintrc.js - Added in ours => checkout ours - (AU) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/README.md - Added in ours => checkout ours ...truncated... - (UA) examples/bunyan/README.md - Unmerged, added by them => checkout theirs
Processing otel-js - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/test/grpc-exporter-transport.test.ts - Removing extra file - (xM) /auto-merge/js/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts - Re-Copying master file - (*F) /examples - Removing extra folder examples - (*F) /incubator - Removing extra folder incubator - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/examples/bunyan/.npmrc - Re-Copying master file - (xM) /auto-merge/contrib/examples/bunyan/README.md - Re-Copying master file - (xM) /auto-merge/contrib/examples/bunyan/app.js - Re-Copying master file - (xM) /auto-merge/contrib/examples/bunyan/app.mjs - Re-Copying master file - (xM) /auto-merge/contrib/examples/bunyan/package.json - Re-Copying master file - (xM) /auto-merge/contrib/examples/bunyan/telemetry.js - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/.npmrc - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/README.md - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/images/jaeger.jpg - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/images/zipkin.jpg - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/package.json - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/src/client.ts - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/src/server.ts - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/src/tracer.ts - Re-Copying master file - (xM) /auto-merge/contrib/examples/express/tsconfig.json - Re-Copying master file - (xM) /auto-merge/contrib/examples/koa/.npmrc - Re-Copying master file - (xM) /auto-merge/contrib/examples/koa/README.md - Re-Copying master file - (xM) /auto-merge/contrib/examples/koa/images/jaeger.jpg - Re-Copying master file ...truncated...
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 @ 7fa2c84...
Auto resolving 9 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 6
UD (Updated <=> Deleted): 3
Changes from otel-js-contrib@main (https://github.com/open-telemetry/opentelemetry-js-contrib)
Merging otel-js-contrib @ 3b2090b...
Auto resolving 226 conflicts to select the master repo version
Summary of changes by file state
UD (Updated <=> Deleted): 3
AU (Added <=> Updated): 74
UA (Updated <=> Added): 75
DD (Deleted <=> Deleted): 74
...truncated...