Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AutoMerge][Main] Merging staged change(s) to main #210

Closed
wants to merge 164 commits into from
Closed

[AutoMerge][Main] Merging staged change(s) to main #210

wants to merge 164 commits into from

Conversation

opentelemetrybot
Copy link
Contributor

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

  • (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

JacksonWeber and others added 30 commits October 27, 2023 14:32
@JacksonWeber
feat: Add Azure App Service, Azure Functions, and VM Resource Detecto…
1b0caa6 
…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.
@legendecas @dyladan
chore: track package-lock.json (#4238)
e9328ab 
* 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 <dyladan@users.noreply.github.com>
@martinkuba @legendecas
docs: fixed link to benchmark results (#4233)
95471d1 
Co-authored-by: Chengzhong Wu <legendecas@gmail.com>
@trentm
fix(instrumentation-fastify): do not wrap preClose and onRequestAbort…
de6156a 
… hooks (#1764)

Fixes: open-telemetry/opentelemetry-js-contrib#1762
@renovate-bot
chore(deps): update all patch versions (#4215)
586def4
@seemk @pichlermarc
fix: otlp json encoding (#4220)
9db6352 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@david-luna @pichlermarc
fix: remove duplicate export star from version.ts (#4225)
cd232cd 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@edosrecki @pichlermarc
docs: fix sdk-node config instructions (#4249)
d434f84 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [d434f84...](open-telemetry/opentele…
d7c948b 
…metry-js@d434f84)

  - commit d434f84
  - Author: Dinko Osrecki <dinko.osrecki@emarsys.com>
  - 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
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [de6156a...](open-telemetry/…
99bde18 
…opentelemetry-js-contrib@de6156a)

  - commit de6156a
  - Author: Trent Mick <trentm@gmail.com>
  - Date:   Mon Nov 6 00:56:47 2023 -0800
  -     fix(instrumentation-fastify): do not wrap preClose and onRequestAbort hooks (#1764)
  - ...
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
7d5a607 
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...
@david-luna
fix: host-metrics system.cpu.utilization calculation fix (#1741)
b9350d9 
* 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
@legendecas
feat(api): publish api esnext target (#4231)
9fd1948
@david-luna @blumamir
fix: use context API to bind connection checkOut callback (#1766)
229b1f7 
* fix: use context API to bind connection checkOut callback

* chore: fix lint

---------

Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@pichlermarc
chore: release API 1.7.0/Core 1.18.0/Experimental 0.45.0 (#4254)
73b4466
@renovate-bot @blumamir
fix(deps): update dependency gcp-metadata to v6 (#1720)
267dfad 
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@renovate-bot
fix(deps): update otel core experimental to v0.45.0 (#1779)
7348635
@seemk @blumamir
feat: additional instrumentation debug diagnostics (#1777)
adbe86d 
* feat: additional instrumentation diagnostics

* fix: use componentlogger

---------

Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@pichlermarc
fix(sdk-metrics): hand-roll MetricAdvice type as older API versions d…
c7c1867 
…o not include it (#4260)
@Zirak @blumamir
feat(auto-instrumentations-node): Expose getting resource detectors (…
89f07d1 
…#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 <amirgiraffe@gmail.com>
@renovate-bot
chore(deps): update actions/setup-node action to v4 (#1755)
7ef45fa
@pichlermarc
chore: prepare release 1.18.1/0.45.1 (#4261)
f665499
@renovate-bot
fix(deps): update otel core experimental to v0.45.1 (#1781)
7f420e2
@dbasilio @blumamir
fix(auto-instrumentations-web)!: Add zone.js as a peerDependency (#1768)
5564096 
* chore: Add zone.js as a peerDep of auto-instrumentations-web

* chore: Empty commit to re-run CI

---------

Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@trentm
chore: no need for 'packages' in "lerna.json" (#4264)
c478c11
@pichlermarc
chore(deps): unpin @opentelemetry/* in fastify instrumentation and my…
da94ee9 
…sql example (#1784)
@martinkuba @pichlermarc
Benchmark tests for trace OTLP transform and BatchSpanProcessor (#4218)
654638a 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@legendecas @pichlermarc
chore: type reference on zone.js (#4257)
f2b447d 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@Lp-Francois @pichlermarc
docs: add docker-compose to run prometheus for the experimental examp…
40fde0f 
…le (#4268)

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@HyunnoH @pichlermarc
fix(sdk-logs): avoid map attribute set when count limit exceeded (#4195)
f5ef8de 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
dependabot bot and others added 29 commits December 19, 2023 10:48
@dependabot
chore(deps): bump axios from 0.21.4 to 1.6.0 (#1801)
67909e5 
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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@renovate-bot
chore(deps): update dependency mongoose to v6.12.3 (#1870)
7e335c7
@chentsulin
fix(instrumentation): bump import-in-the-middle to 1.7.2 (#4379)
3cf2cf6
@yoanyomba2023 @pichlermarc
fix(host-metrics): bump minimum systeminformation version to 5.21.20 …
c59e666 
…(security) (#1868)

* chore: bump system info version to address arbitrary command injection vulnerability in systeminformation

Signed-off-by: yyomba <yyomba@salesforce.com>

* chore: sync package-lock.json

---------

Signed-off-by: yyomba <yyomba@salesforce.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@renovate-bot
chore(deps): update dependency chromedriver to v120 (#4374)
42aaae0
@seemk @dyladan
perf: remove unnecessary base64 encode+decode from OTLP export (#4343)
a512494 
* fix: remove unnecessary base64 encoding for span contexts

* chore: add changelog

---------

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
@pichlermarc @dyladan
fix(instrumentation): use caret range on import-in-the-middle (#4380)
f4b681d 
* fix(instrumentation): use caret on import-in-the-middle

* fix: add chanelog entry

---------

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
@JamieDanielson @pichlermarc
maint: specify label for stale, exempt never-stale (#1732)
e35e370 
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 <marc.pichler@dynatrace.com>
@trentm
test: temporarily pin Node.js 18 testing to 18.18.2 (#1873)
44cba00 
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
@pichlermarc
chore: remove grpc-dynamic-codegen example (#1871)
f45d99f
@renovate-bot
chore(deps): update actions/stale action to v9 (#1852)
6b7eb19
@pichlermarc @renovate-bot
fix(deps): update otel core experimental (#1866)
9366543 
* 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 <bot@renovateapp.com>
@renovate-bot
chore(deps): update github/codeql-action action to v3 (#1878)
c60e8bc
@martinkuba @pichlermarc
ci: Add maintainer for the React plugin (#1876)
cf57292 
* added maintainer for the react plugin

* Update .github/component_owners.yml

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@david-luna
chore: update guidelines (#1882)
ec7125b
@renovate-bot
chore(deps): update github/codeql-action action to v3 (#4391)
0206181
@renovate-bot @trentm
chore(deps): update dependency test-all-versions to v6 (#1877)
2d11b69 
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 <trentm@gmail.com>
@pichlermarc
fix(instrumentation): do not import 'path' in browser runtimes (#4386)
b36ab12 
* 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
@Vunovati @pichlermarc
fix(exporter-logs-otlp-proto): programatic headers take precedence ov…
ae0a3c5 
…… (#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 <marc.pichler@dynatrace.com>
@JacksonWeber
fix: Fix Azure Fns Detector When Running with App Service Detector (#…
006c963 
…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.
@dyladan @opentelemetrybot
chore: release main (#1855)
9092823 
* chore: release main

* chore: sync package-lock.json

---------

Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
@pichlermarc
ci: automatically map component labels to PRs (#1879)
bb1ba31 
* ci: automatically map component labels to PRs

* feat: ensure labels are applied when dependencies are updated

* fix: faulty paths
@drewcorlin1 @blumamir @pichlermarc
feat: Allow configuring pino to log with different keys (#1867)
33b31d0 
* 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 <amirgiraffe@gmail.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [ae0a3c5...](open-telemetry/opentele…
4944ef2 
…metry-js@ae0a3c5)

  - commit ae0a3c5
  - Author: Vladimir Adamić <441333+Vunovati@users.noreply.github.com>
  - 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
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [33b31d0...](open-telemetry/…
c7f3958 
…opentelemetry-js-contrib@33b31d0)

  - commit 33b31d0
  - Author: drewcorlin1 <82601620+drewcorlin1@users.noreply.github.com>
  - 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...
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
12175b1 
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
@MSNev
Merge pull request open-telemetry#209 from opentelemetrybot/opentelem…
affc211 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] staging @ [affc211...](open-telemetry@affc211)
6407734 
### 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/
@opentelemetrybot
[AutoMerge] Merge Staged changes to main
00cd4cc 
### 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
@MSNev MSNev closed this Jan 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet