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 #216

Closed
wants to merge 244 commits into from
Closed

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

wants to merge 244 commits into from

Conversation

opentelemetrybot
Copy link
Contributor

staging @ 531474b...

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 142 conflicts to select the master repo version

Summary of changes by file state
UA (Updated <=> Added): 10
DD (Deleted <=> Deleted): 55
AA (Added <=> Added): 69
UD (Updated <=> Deleted): 3
AU (Added <=> Updated): 5

  • (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/instrumentation-perf-hooks/src/types.ts - Unmerged, added by them => checkout theirs
  • (UA) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/tsconfig.json - 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-document-load/tsconfig.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-long-task/tsconfig.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-events/tsconfig.esnext.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both
    ...truncated...
    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>
pichlermarc and others added 29 commits February 6, 2024 14:20
@pichlermarc
fix(sdk-metrics): ignore NaN value recordings for histograms (#4455)
f6712fd 
* fix(sdk-metrics): ignore NaN value recordings

* fix(changelog): add changelog entry

* test(exporter-prometheus): adapt tests

* fix(sdk-metrics): ignore in accumulation instead

* fix(changelog): update changelog
@dyladan @opentelemetrybot
chore: release main (#1924)
39c34df 
* chore: release main

* chore: sync package-lock.json

---------

Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
@pichlermarc
fix(sdk-metrics): allow single bucket histograms (#4456)
63845ec 
* fix(sdk-metrics): allow single bucket histograms

* test(sdk-metrics): undefined and null inputs for bucket boundaries

* fixup! test(sdk-metrics): undefined and null inputs for bucket boundaries
@legendecas @pichlermarc
docs: shorten readme sections (#4460)
f86251d 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@pichlermarc
feat(context-zone*): support zone.js 0.13.x, 0.14.x (#4469)
25548fd 
* feat(context-zone*): support zone.js 0.13.x, 0.14.x

* fix(changelog): add changelog entry

* fix(changelog): formatting
@pichlermarc
fix(instrumentation): normalize paths for internal files in scoped pa…
01348e6 
…ckages (#4467)

* fix(instrumentation): normalize paths for internal files in scoped packages

* fix(instrumentation): normalize name passed to onRequire in RequireInTheMiddleSingleton

* fix(instrumentation): apply normalization during filtering internal files

* fix(changelog): add changelog entry

* fix: normalize before filtering

* fix: lint
@MikeShi42
docs: Update getting started link in README
7e709a6
@pichlermarc
Merge pull request #4477 from MikeShi42/patch-1
44b0b29 
docs: Update getting started link in README
@trentm
chore: add non-releasing packages to release-please config so their l…
cf034c8 
…ocal deps get bumped (#1928)

* chore: add unreleasing packages to release-please config so their local deps get bumped

This is option 1 from #1917.

Refs: open-telemetry/opentelemetry-js-contrib#1917

* drop commented out debug output
@trentm
chore: add trentm as a component owner of instr-bunyan (#1941)
f4e6f11
@pichlermarc
feat(instrumentation): add getModuleDefinitions() instead of making…
8bbebfd 
… `init()` public (#4475)

* feat(instrumentation): add getModuleDefinitions() instead of making init() public

* test(instrumetation): add tests for getModuleDefinitions()

* chore: changelog
@pichlermarc
fix(otlp-transformer): only use BigInt inside hrTimeToNanos() (#4484)
5bc8ced 
* fix(otlp-transformer): only use BigInt inside hrTimeToNanos()

* fix: changelog
@trentm @pichlermarc
chore: attempt to prevent non-releasing packages from being included …
dbf2c96 
…in release-please release PRs (#1939)

This continues on from #1928. The non-releasing packages are being added to the
release-please manifest in the hope that this prevents them from being listed
in the set of released packages in a release-please PR. This is
effectively Option 1b from #1917.

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@trentm @pichlermarc
docs(instr-bunyan): fix bug in README example (#1940)
5b0b67f 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@eldavojohn @pichlermarc
chore: remove unload event from OTLPExporterBrowserBase (#4438)
356ef8a 
* Add the ability for the implementation to provide the binding event for shutdown.

* fix: whoops totally missed the linting formatting fix step

* Remove any concept of a shutdown event

* add change log and obey interface

* no longer need globalthis

* modify the correct changelog and identify this as a breaking change under the scenario in comments

* markdown lint

* Update experimental/CHANGELOG.md

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@esara
fix(net.peer.port): net.peer.port needs to be a number not a string (…
038e0bf 
…#1916)

Signed-off-by: esara <endresara@gmail.com>
@pichlermarc
Add @david-luna to triagers (#4497)
89caef9
@rtpg
Fix the usage example (#1949)
d0fc194 
KnexInstrumentationConfig is just a type
@trentm @pichlermarc
fix(instr-fetch): do not enable in Node.js; clarify in docs this inst…
aff48a1 
…r is for web fetch only (#4498)

* fix(instr-fetch): do not enable in Node.js; clarify in docs this instr is for web fetch only

* add a changelog entry

* add a diagnostic warning if attempting to use instr-fetch in Node.js

* fixup! add a diagnostic warning if attempting to use instr-fetch in Node.js

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@MSNev @pichlermarc
chore: Semantic Conventions export individual strings (#4298)
5637e2a 
* chore: Semantic Conventions export individual strings

* Reduce to just emit full strings and add size-limit test output to review the results

* Update generation to use createConstMap for enums where possible

* Move changelog back to Unreleased -- merge shifted it

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@10xLaCroixDrinker @pichlermarc
feat(instrumentation-dns): allow ignoreHostnames to be only a single …
a7861f6 
…IgnoreMatcher (#1929)

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@d4nyll @pichlermarc
feat(perf_hooks): add node instrumentation perf_hooks (#1902)
882fb4b 
* feat(perf_hooks): add node instrumentation perf_hooks

* chore(perf_hooks): rename to instrumentation-perf-hooks

* test(perf_hooks): decrease wait time for tests

* fix(perf_hooks): don't export when disabled

* chore(perf_hooks): add empty CHANGELOG

* refactor(perf_hooks): use import type over import

* chore(perf_hooks): add @opentelemetry/instrumentation dependency

* fix(perf_hooks): sync package-lock.json

* fix(perf_hooks): Markdown lint errors

* chore: remove 'performance' from gauge name

* fix: update release-please-config

* fix(perf_hooks): peer-api-check

* chore(perf_hooks): update devDependencies

* test(perf_hooks): fix flakey tests

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@MSNev
Merge pull request open-telemetry#214 from opentelemetrybot/opentelem…
a5e11bd 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [5637e2a...](open-telemetry/opentele…
c8cb9e8 
…metry-js@5637e2a)

  - commit 5637e2a
  - Author: Nev <54870357+MSNev@users.noreply.github.com>
  - Date:   Fri Feb 23 04:00:58 2024 -0800
  -     chore: Semantic Conventions export individual strings (#4298)
  - ...
### Auto resolving 18 conflicts to select the master repo version
Summary of changes by file state
AU (Added <=> Updated): 4
UA (Updated <=> Added): 10
DD (Deleted <=> Deleted): 4

 - (AU) auto-merge/js/doc/GUIDELINES.md - Added in ours => checkout ours
 - (UA) auto-merge/js/doc/contributing/bug_triage.md - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/contributing/dependencies.md - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/contributing/npm_workspaces.md - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/contributing/releasing.md - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/upgrade-guide.md - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/package.json - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/src/index.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/@opentelemetry/scoped-test-module/src/internal.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/scoped-package-instrumentation.test.ts - Unmerged, added by them => checkout theirs
 - (AU) auto-merge/js/maintenance/bug_triage.md - Added in ours => checkout ours
 - (AU) auto-merge/js/maintenance/npm_workspaces.md - Added in ours => checkout ours
 - (AU) auto-merge/js/maintenance/releasing.md - Added in ours => checkout ours
 - (UA) auto-merge/js/packages/sdk-metrics/test/regression/histogram-recording-nan.test.ts - Unmerged, added by them => checkout theirs
 - (DD) doc/GUIDELINES.md - Removed from both
 - (DD) maintenance/bug_triage.md - Removed from both
 - (DD) maintenance/npm_workspaces.md - Removed from both
 - (DD) maintenance/releasing.md - Removed from both
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [882fb4b...](open-telemetry/…
392d0fd 
…opentelemetry-js-contrib@882fb4b)

  - commit 882fb4b
  - Author: Daniel Li <dan@danyll.com>
  - Date:   Fri Feb 23 13:10:23 2024 +0000
  -     feat(perf_hooks): add node instrumentation perf_hooks (#1902)
  - ...
### Auto resolving 1 conflict to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 1

 - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-aws-sdk/src/propwrap.ts - Unmerged, added by them => checkout theirs
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
27995ce 
Processing otel-js
 - (*E) /auto-merge/js/doc/GUIDELINES.md - Removing extra file
 - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/src/internal/utils.ts - Re-Copying master file
 - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/test/helpers/autoImports.ts - Re-Copying master file
 - (xM) /auto-merge/js/packages/opentelemetry-semantic-conventions/test/sizeLimit.test.ts - Re-Copying master file
 - (*F) /auto-merge/js/maintenance - Removing extra folder maintenance
 - (*F) /packages - Removing extra folder packages
 - (*F) /plugins - Removing extra folder plugins
Processing otel-js-contrib
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintignore - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintrc.js - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/CHANGELOG.md - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/LICENSE - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/README.md - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/package.json - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/index.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/instrumentation.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/src/types.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/test/event_loop_utilization.test.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-perf-hooks/tsconfig.json - Re-Copying master file
@MSNev
Merge pull request open-telemetry#215 from opentelemetrybot/opentelem…
531474b 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] staging @ [531474b...](open-telemetry@531474b)
79924a0 
### 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
2441905 
### Auto resolving 142 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 10
DD (Deleted <=> Deleted): 55
AA (Added <=> Added): 69
UD (Updated <=> Deleted): 3
AU (Added <=> Updated): 5

 - (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/instrumentation-perf-hooks/src/types.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/tsconfig.json - 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-document-load/tsconfig.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-long-task/tsconfig.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-events/tsconfig.esnext.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both
...truncated...
Identifying and fixing merge issues from staged repos
@MSNev MSNev closed this Mar 27, 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