…071)" (#4137)

…… (#4140)

…s (#4049)

…metry-js@5615b1c)

  - commit 5615b1c
  - Author: Vadim Korolik <[email protected]>
  - Date:   Wed Sep 13 00:12:20 2023 -0700
  -     fix(sdk-node): move @opentelemetry/exporter-jaeger to dev dependencies (#4049)
  - ...
### Auto resolving 17 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 9
AU (Added <=> Updated): 4
DD (Deleted <=> Deleted): 4

 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogExporter.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts - Added in ours => checkout ours
 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts - Added in ours => checkout ours
 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogExporter.test.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogsExporter.test.ts - Added in ours => checkout ours
 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogExporter.test.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts - Added in ours => checkout ours
 - (UA) auto-merge/js/packages/opentelemetry-exporter-jaeger/src/version.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/packages/opentelemetry-exporter-zipkin/src/version.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/packages/opentelemetry-propagator-b3/src/version.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/packages/opentelemetry-propagator-jaeger/src/version.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/packages/sdk-metrics/src/version.js - Unmerged, added by them => checkout theirs
 - (DD) experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts - Removed from both
 - (DD) experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts - Removed from both
...truncated...

…opentelemetry-js-contrib@b10224b)

  - commit b10224b
  - Author: Mend Renovate <[email protected]>
  - Date:   Mon Sep 11 13:54:55 2023 +0200
  -     chore(deps): update all patch versions (#1675)
  - ...

Processing otel-js
 - (xS) /auto-merge/js/.github/workflows/codeql-analysis.yml - Re-Copying master file as size mismatch 1115 !== 558
 - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts - Removing extra file
 - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts - Removing extra file
 - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogsExporter.test.ts - Removing extra file
 - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts - Removing extra file
 - (xM) /auto-merge/js/packages/template/src/version.js - Re-Copying master file
 - (*F) /packages - Removing extra folder packages
Processing otel-js-contrib
 - (xS) /auto-merge/contrib/.github/workflows/codeql-analysis.yml - Re-Copying master file as size mismatch 558 !== 1115

…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;

…metry-js@be16272)

  - commit be16272
  - Author: Marc Pichler <[email protected]>
  - Date:   Mon Sep 18 17:30:52 2023 +0200
  -     feat(exporter-metrics-otlp-proto): add esm build (#4099)
  - ...
### Auto resolving 12 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 8
AU (Added <=> Updated): 2
DD (Deleted <=> Deleted): 2

 - (UA) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.esm.json - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.esnext.json - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/src/OpenCensusMetricProducer.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/src/metric-transform.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/src/trace-transform.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/shim-opencensus/src/transform.ts - Added in ours => checkout ours
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/test/OpenCensusMetricProducer.test.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/test/metric-transform.test.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/shim-opencensus/test/trace-transform.test.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/experimental/packages/shim-opencensus/test/transform.test.ts - Added in ours => checkout ours
 - (DD) experimental/packages/shim-opencensus/src/transform.ts - Removed from both
 - (DD) experimental/packages/shim-opencensus/test/transform.test.ts - Removed from both

…opentelemetry-js-contrib@deb9aa4)

  - commit deb9aa4
  - Author: Mend Renovate <[email protected]>
  - Date:   Thu Sep 14 13:34:06 2023 +0200
  -     fix(deps): update otel core experimental to v0.43.0 (#1676)
  - ...

Processing otel-js
 - (*E) /auto-merge/js/experimental/packages/shim-opencensus/src/transform.ts - Removing extra file
 - (*E) /auto-merge/js/experimental/packages/shim-opencensus/test/transform.test.ts - Removing extra file
Processing otel-js-contrib

…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 17 conflicts to select the master repo version
Summary of changes by file state
DD (Deleted <=> Deleted): 4
DU (Deleted <=> Updated): 2
AA (Added <=> Added): 3
UA (Updated <=> Added): 4
AU (Added <=> Updated): 4

 - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogsExporter.test.ts - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts - Removed from both
 - (DU) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.esm.json - Deleted by us => checkout theirs
 - (DU) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.esnext.json - Deleted by us => checkout theirs
 - (AA) pkgs/exporters/otlp/logs/http/package.json - Added in both => checkout theirs
 - (UA) pkgs/exporters/otlp/logs/proto/src/platform/browser/OTLPLogExporter.ts - Unmerged, added by them => checkout theirs
 - (AU) pkgs/exporters/otlp/logs/proto/src/platform/browser/OTLPLogsExporter.ts - Added in ours => checkout ours
 - (UA) pkgs/exporters/otlp/logs/proto/src/platform/node/OTLPLogExporter.ts - Unmerged, added by them => checkout theirs
 - (AU) pkgs/exporters/otlp/logs/proto/src/platform/node/OTLPLogsExporter.ts - Added in ours => checkout ours
 - (UA) pkgs/exporters/otlp/logs/proto/test/browser/OTLPLogExporter.test.ts - Unmerged, added by them => checkout theirs
 - (AU) pkgs/exporters/otlp/logs/proto/test/browser/OTLPLogsExporter.test.ts - Added in ours => checkout ours
 - (UA) pkgs/exporters/otlp/logs/proto/test/node/OTLPLogExporter.test.ts - Unmerged, added by them => checkout theirs
 - (AU) pkgs/exporters/otlp/logs/proto/test/node/OTLPLogsExporter.test.ts - Added in ours => checkout ours
 - (AA) pkgs/exporters/otlp/metrics/http/package.json - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/proto-base/protos - Added in both => checkout theirs
Identifying and fixing merge issues from staged repos
...truncated...