[AutoMerge][Main] Merging staged change(s) to main #206
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
…rs (#1740) * Implement app service detector. * Finish vm detector. * feat(azure-resource-detector): Fix Azure VM detector. * feat(azure-resource-detector) Add readme. * Add changelog entry. * feat(azure-resource-detector): Add azure functions detector. * fix(azure-resource-detectors): Clean up typos, deps and lint. * fix(azure-resource-detector): Add types file. * update(azure-resource-detectors): Update component owners. * Update release-please config. * Update release-please manifest. * Fix lint errors.
* chore: track package-lock.json * Pin to old versions for node 14 * Use version range * Remove unused cached directories * Temporarily disable other tests * Temporarily enable only api test * Enable only some packages * Test only api packages * Test trace exporters * Fix line ordering * Test all packages except otlp exporters * Add trace http exporter * Add trace proto exporter * Test all but grpc exporters * chore: use npm workspaces and degrade lerna to v6 * chore: get rid of lerna bootstrap * chore: use npx * chore: allow install scripts to setup buf * chore: fix w3c-integration-test cache key * chore: fix cache key * chore: disable resource compat test * chore: fix node_modules assumptions * chore: fix hoisted karma issue * chore: fix markdown linter complaints * chore: lock @grpc/grpc-js to v1.8.21 * Break caches * chore: remove cache * chore: fixup inline commands --------- Co-authored-by: Daniel Dyla <[email protected]>
Co-authored-by: Chengzhong Wu <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…metry-js@d434f84) - commit d434f84 - Author: Dinko Osrecki <[email protected]> - Date: Mon Nov 6 16:13:09 2023 +0100 - docs: fix sdk-node config instructions (#4249) - ... ### Auto resolving 2 conflicts to select the master repo version Summary of changes by file state UD (Updated <=> Deleted): 1 UA (Updated <=> Added): 1 - (UD) auto-merge/js/experimental/packages/otlp-transformer/src/common/unsigned_long.ts - Unmerged, deleted by them => remove - (UA) auto-merge/js/maintenance/npm_workspaces.md - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@de6156a) - commit de6156a - Author: Trent Mick <[email protected]> - Date: Mon Nov 6 00:56:47 2023 -0800 - fix(instrumentation-fastify): do not wrap preClose and onRequestAbort hooks (#1764) - ...
Processing otel-js - (xM) /auto-merge/js/package-lock.json - Re-Copying master file - (*F) /detectors - Removing extra folder detectors - (*E) /package-lock.json - Removing extra file Processing otel-js-contrib - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/.eslintignore - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/.eslintrc.js - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/.npmignore - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/LICENSE - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/README.md - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/package.json - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureAppServiceDetector.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureFunctionsDetector.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureVmDetector.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/detectors/index.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/types.ts - Re-Copying master file - (xM) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts - Re-Copying master file ...truncated...
* tests: tune the fake clock for testing * tests: tune the values to expect * chore: lint autofix * chore: improve os.cpus mock * chore: revert implementation for process CPU usage * chore: rename var * chore: avoid having useless data upon 1st collection * chore: remove comments * chore: change system.cpu attribute names to match semantic conventions * chore: update test * chore: lint fix
* fix: use context API to bind connection checkOut callback * chore: fix lint --------- Co-authored-by: Amir Blum <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
* feat: additional instrumentation diagnostics * fix: use componentlogger --------- Co-authored-by: Amir Blum <[email protected]>
…o not include it (#4260)
…#1772)
* feat(auto-instrumentations-node): Expose getting resource detectors
The auto instrumentation package provides users with a very easy way to
instrument their application, either from the commandline or
programatically. Users wishing the configure these instrumentations can also
call `getNodeAutoInstrumentations`.
This commit also exposes `getResourceDetectorsFromEnv`, so that users
configuring or somehow wishing to change the easy to use autoinstrumentation
entrypoint can also use the preconfigured resource detectors. Since the
autoinstrumentation package sets its exports, this function was previously
inaccessible.
Usage can look like this:
```js
const { getNodeAutoInstrumentations, getResourceDetectorsFromEnv } = require('@opentelemetry/auto-instrumentations-node');
const opentelemetry = require('@opentelemetry/sdk-node');
const sdk = new opentelemetry.NodeSDK({
instrumentations: getNodeAutoInstrumentations({
'@opentelemetry/instrumentation-fs': { enabled: false },
}),
resourceDetectors: getResourceDetectorsFromEnv(),
});
// use the sdk
```
Workarounds can be found [elsewhere in the opentelemetry repos](https://github.com/open-telemetry/opentelemetry-demo/blob/855bde3588b0fe85e500bec185dc2f311b15f98a/src/paymentservice/opentelemetry.js#L28-L38).
These can be fixed once a release is made.
Resolves #1531.
* style: Align indentation
---------
Co-authored-by: Amir Blum <[email protected]>
* chore: Add zone.js as a peerDep of auto-instrumentations-web * chore: Empty commit to re-run CI --------- Co-authored-by: Amir Blum <[email protected]>
…sql example (#1784)
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…le (#4268) Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Processing otel-js - (xM) /auto-merge/js/experimental/packages/otlp-transformer/test/performance/benchmark/index.js - Re-Copying master file - (*F) /experimental - Removing extra folder experimental Processing otel-js-contrib
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
Co-authored-by: Daniel Dyla <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
…s (#1792) Better align with the other exports. Follow-up to #1772.
* chore: replace deprecated SpanAttributes type with Attributes * fix: handle layer path being a string or regex * chore: add test for RegExp koa route * fix: single quote string due to linting --------- Co-authored-by: Amir Blum <[email protected]>
* chore: typo in CONTRIBUTING.md * chore: cleanup files entries in package.json (#820) * chore: add missing files entries to package.json (#820) * chore: remove useless .npmignore (#820) --------- Co-authored-by: Amir Blum <[email protected]>
…essaging.destination.name for SNS topics (#1727) * Capture full ARN for SNS topics in messaging.destination Problem: The use of topic names instead of ARNs in `messaging.destination` omits essential account information, making topic localization cumbersome. Solution: Adopt full ARNs as the value for `messaging.destination`, preserving both topic name and account details, aligning with current SNS ServiceExtension approach. Closes #1716 * Add new span attribute instead of modifying the existing attribute --------- Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Daniel Dyla <[email protected]>
Co-authored-by: Daniel Dyla <[email protected]>
…y attributes (#4277) Co-authored-by: artahmetaj <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…ript (#4275) Co-authored-by: Trent Mick <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…metry-js@51be418) - commit 51be418 - Author: Daniel Dyla <[email protected]> - Date: Thu Nov 16 15:56:26 2023 -0500 - Execute binaries from root node modules (#4302) - ...
…opentelemetry-js-contrib@5c1050b) - commit 5c1050b - Author: Mend Renovate <[email protected]> - Date: Thu Nov 16 16:29:56 2023 +0100 - chore(deps): update all patch versions (#1723) - ... ### Auto resolving 52 conflicts to select the master repo version Summary of changes by file state UD (Updated <=> Deleted): 47 UA (Updated <=> Added): 5 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/metapackages/auto-instrumentations-node/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/packages/opentelemetry-host-metrics/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.npmignore - Unmerged, deleted by them => remove - (UA) auto-merge/contrib/packages/opentelemetry-test-utils/src/test-fixtures.ts - Unmerged, added by them => checkout theirs - (UD) auto-merge/contrib/plugins/node/instrumentation-amqplib/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/plugins/node/instrumentation-dataloader/.npmignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/plugins/node/instrumentation-fs/.npmignore - Unmerged, deleted by them => remove ...truncated...
Processing otel-js - (xM) /auto-merge/js/.npmrc - Re-Copying master file - (*E) /.npmrc - Removing extra file - (*E) /package-lock.json - Removing extra file - (*F) /plugins - Removing extra folder plugins - (*E) /tsconfig.base.esnext.json - Removing extra file Processing otel-js-contrib - (xM) /auto-merge/contrib/.npmrc - Re-Copying master file - (xM) /auto-merge/contrib/package-lock.json - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/test/fixtures/use-ioredis.mjs - Re-Copying master file - (xM) /auto-merge/contrib/tsconfig.base.esnext.json - Re-Copying master file
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
### Moving package from auto-merge/js/api to pkgs/api/ ### Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/ ### Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/ ### Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/ ### Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/ ### Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/ ### Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/ ### Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/ ### Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer ### Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base ### Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/ ### Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/ ### Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/ ### Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/ ### Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/
### Auto resolving 101 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 4 DD (Deleted <=> Deleted): 40 AA (Added <=> Added): 55 UD (Updated <=> Deleted): 1 AU (Added <=> Updated): 1 - (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json - Removed from both - (UA) auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/tsconfig.base.esnext.json - Unmerged, added by them => checkout theirs - (DD) auto-merge/js/api/karma.conf.js - Removed from both - (DD) auto-merge/js/api/karma.worker.js - Removed from both - (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/api/tsconfig.esnext.json - Removed from both - (DD) auto-merge/js/api/tsconfig.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/tsconfig.esnext.json - Removed from both - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/otlp-proto-exporter-base/.npmignore - Removed from both - (DD) auto-merge/js/experimental/packages/sdk-logs/.npmignore - Removed from both ...truncated... Identifying and fixing merge issues from staged repos
opentelemetrybot
force-pushed
the
opentelemetrybot/merge-main
branch
from
18bb47f
to
2d6aaeb
Compare
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.
staging @ 9c5bcd5...
Moving package from auto-merge/js/api to pkgs/api/
Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/
Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/
Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/
Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/
Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/
Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/
Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/
Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/
Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/
Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/
Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/
Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer
Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base
Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/
Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/
Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/
Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/
Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/
Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/
Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/
Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/
Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/
Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/
Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/
Merge Staged changes to main
Auto resolving 101 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 4
DD (Deleted <=> Deleted): 40
AA (Added <=> Added): 55
UD (Updated <=> Deleted): 1
AU (Added <=> Updated): 1
...truncated...
Identifying and fixing merge issues from staged repos