[AutoMerge][Main] Merging staged change(s) to main #210
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]>
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v0.21.4...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…(security) (#1868) * chore: bump system info version to address arbitrary command injection vulnerability in systeminformation Signed-off-by: yyomba <[email protected]> * chore: sync package-lock.json --------- Signed-off-by: yyomba <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
* fix: remove unnecessary base64 encoding for span contexts * chore: add changelog --------- Co-authored-by: Daniel Dyla <[email protected]>
* fix(instrumentation): use caret on import-in-the-middle * fix: add chanelog entry --------- Co-authored-by: Daniel Dyla <[email protected]>
we may want information but still never stale it so set exempt label first for early return. any-of-label is comma-separated allowlist. remove instr-request and bug to avoid needing to remove labels. Co-authored-by: Marc Pichler <[email protected]>
This is as a workaround for ESM testing failing with v18.19.0 due to node's off-thread ESM loading and import-in-the-middle's limitation with reexports. Refs: open-telemetry/opentelemetry-js-contrib#1872
* fix(deps): update opentelemetry-js monorepo * fix(deps): update otel core experimental to ^0.46.0 * fix: re-generate package-lock.json * fix: test with updated import-in-the-middle hook * fix: use type-compatible versions of rxjs * fix(mongodb-example): remove unneeded useUnifiedTopology parameter * fix: remove iitm 1.7.2 again, use otel hook (iitm 1.7.1) --------- Co-authored-by: Mend Renovate <[email protected]>
* added maintainer for the react plugin * Update .github/component_owners.yml --------- Co-authored-by: Marc Pichler <[email protected]>
Also, fix error in test-all-versions@6 with not liking socket.io@^3.1.3 being an empty range I also reduced the number of socket.io@4 versions tested (4.4.1 is over 2y old) Co-authored-by: Trent Mick <[email protected]>
* fix(instrumentation): do not import 'path' in browser runtimes * fix(changelog): clean up and add entry * fix(instrumentation): add missing license header * fix(changelog): formatting * fix(instrumentation): do not throw
…… (#4351) * fix(exporter-logs-otlp-proto): programatic headers take precedence over environment variables * chore: update PR url in changelog * chore: fix deletion of env var * fix(exporter-logs-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-proto): programatic headers take precedence over environment variable * chore: update CHANGELOG --------- Co-authored-by: Marc Pichler <[email protected]>
…1884) * fix(azure-resource-detector): Ensure that resources aren't classified as app service when they're using functions and both detectors are imported. * Fix lint. * Clean up and unify tests.
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <[email protected]>
* ci: automatically map component labels to PRs * feat: ensure labels are applied when dependencies are updated * fix: faulty paths
* Allow configuring pino to log with different keys * Update README and add jsdoc * Still have 2 failing tests * Break tests out * Return test context * Simplify --------- Co-authored-by: Amir Blum <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
…metry-js@ae0a3c5) - commit ae0a3c5 - Author: Vladimir Adamić <[email protected]> - Date: Wed Jan 3 17:42:17 2024 +0100 - fix(exporter-logs-otlp-proto): programatic headers take precedence ov… (#4351) - ... ### Auto resolving 5 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 5 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/packages/opentelemetry-core/src/common/hex-to-binary.ts - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@33b31d0) - commit 33b31d0 - Author: drewcorlin1 <[email protected]> - Date: Sun Jan 7 01:30:28 2024 -0500 - feat: Allow configuring pino to log with different keys (#1867) - ... ### Auto resolving 18 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 9 UD (Updated <=> Deleted): 7 AU (Added <=> Updated): 1 DD (Deleted <=> Deleted): 1 - (UA) auto-merge/contrib/.github/component-label-map.yml - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/.github/workflows/label-prs.yml - Unmerged, added by them => checkout theirs - (UD) auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/README.md - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_client.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_server.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/package.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/tracer.js - Unmerged, deleted by them => remove - (UA) auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/common.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-default-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-named-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-disabled.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-enabled.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Added in ours => checkout ours - (UD) auto-merge/contrib/scripts/parse-lerna-scopes.mjs - Unmerged, deleted by them => remove ...truncated...
Processing otel-js - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Re-Copying master file - (*F) /auto-merge/contrib/examples/grpc_dynamic_codegen - Removing extra folder grpc_dynamic_codegen - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/fixtures/use-koa.mjs - Re-Copying master file - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Removing extra 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 119 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 8 DD (Deleted <=> Deleted): 46 AA (Added <=> Added): 60 UD (Updated <=> Deleted): 2 AU (Added <=> Updated): 3 - (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/app.js - 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 ...truncated... - (DD) auto-merge/js/tsconfig.base.esnext.json - Removed from both Identifying and fixing merge issues from staged repos
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 @ affc211...
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 119 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 8
DD (Deleted <=> Deleted): 46
AA (Added <=> Added): 60
UD (Updated <=> Deleted): 2
AU (Added <=> Updated): 3
...truncated...
Identifying and fixing merge issues from staged repos