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

Merged
merged 25 commits into from
Oct 16, 2023
Merged

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

merged 25 commits into from
Oct 16, 2023

Conversation

opentelemetrybot
Copy link
Contributor

staging @ 42d1cfc...

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

Summary of changes by file state
DD (Deleted <=> Deleted): 11
AA (Added <=> Added): 12

  • (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/api/tsconfig.esm.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/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js - Removed from both
  • (AA) pkgs/api-events/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/api-logs/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/api-logs/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/api/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/context/zone-peer-dep/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/core/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/detectors/browser/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/metrics/http/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/trace/http/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/trace/proto/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/instrumentations/web/auto/.eslintrc.js - Added in both => checkout theirs
    ...truncated...
    Identifying and fixing merge issues from staged repos

martinkuba and others added 25 commits September 29, 2023 06:45
@martinkuba @pichlermarc
Benchmark tests workflow (#4144)
c84698d 
Co-authored-by: Marc Pichler <[email protected]>
@pichlermarc
fix(benchmark): write benchmark results to file (#4172)
868f75e
@renovate-bot
chore(deps): update all patch versions (#1707)
8ee01b6
@renovate-bot
chore(deps): update dependency @types/sinon to v10.0.18 (#4179)
5af8653
@martinkuba @tylerbenson @pichlermarc
Added performance benchmarking doc (#4169)
5ce32c0 
Co-authored-by: Tyler Benson <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
@pichlermarc
fix: reconfigure stalebot to not close bugs (#1709)
2d36152
@nordfjord @dyladan @pichlermarc
fix: BatchExporter should export continuously when batch size is reac…
9122561 
…hed (#3958)

* fix: BathExporter should export continuously when batch size is reached

* fix: add tests

* lintfix

* add changelog

* add test for concurrency

* Update CHANGELOG.md

* Apply suggestions from code review

* Lint and fix browser tests

* fix: lint

---------

Co-authored-by: Daniel Dyla <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot @dyladan
chore(deps): update dependency @types/jquery to v3.5.21 (#4187)
84861cd 
Co-authored-by: Daniel Dyla <[email protected]>
@pichlermarc
chore: remove outdated and empty docs (#4181)
5fd3737
@dyladan
deps: update proto-loader (#4192)
c320c98
@pichlermarc
fix(sdk-metrics): prevent per-reader storages from keeping unreported…
4eb10f7 
… accumulations in memory (#4163)
@pichlermarc
chore: release SDK 1.17.1/Experimental 0.44.0 (#4183)
f8e187b
@pichlermarc
fix(instrumentation-fastify): add tav script (#1710)
52dd42d
@seidelmartin @pichlermarc
fix: Removed deprecated properties usage in Fastify instrumentation (…
d3328f8 
…#1679)

Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
fix(deps): update otel core experimental to v0.44.0 (#1725)
540a0d1
@dyladan
chore: release main (#1683)
a8c225d
@legendecas @pichlermarc
feat(metrics): prototype experimental advice support (#3876)
b6e532b 
Co-authored-by: Marc Pichler <[email protected]>
@trentm @pichlermarc
fix(instrumentation-redis-4): avoid shimmer warning by only wrapping …
247a81c 
…multi/MULTI if they exist (#1729)

Co-authored-by: Marc Pichler <[email protected]>
@trentm
fix(instrumentation-redis-4): fix unhandledRejection in client.multi(…
d953531 
…...) handling (#1730)
@dyladan
chore: release main (#1737)
659d7ba
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [b6e532b...](open-telemetry/opentele…
ae979d9 
…metry-js@b6e532b)

  - commit b6e532b
  - Author: Chengzhong Wu <[email protected]>
  - Date:   Wed Oct 11 16:05:03 2023 +0800
  -     feat(metrics): prototype experimental advice support (#3876)
  - ...
### Auto resolving 4 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 2
UD (Updated <=> Deleted): 2

 - (UA) auto-merge/js/.github/workflows/benchmark.yml - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/contributing/benchmark-tests.md - Unmerged, added by them => checkout theirs
 - (UD) auto-merge/js/doc/library-author.md - Unmerged, deleted by them => remove
 - (UD) auto-merge/js/doc/processor-api.md - Unmerged, deleted by them => remove
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [659d7ba...](open-telemetry/…
3a644e4 
…opentelemetry-js-contrib@659d7ba)

  - commit 659d7ba
  - Author: Daniel Dyla <[email protected]>
  - Date:   Mon Oct 16 07:50:22 2023 -0400
  -     chore: release main (#1737)
  - ...
### 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-fastify/.tav.yml - Unmerged, added by them => checkout theirs
@MSNev
Merge pull request open-telemetry#196 from opentelemetrybot/opentelem…
42d1cfc 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] staging @ [42d1cfc...](open-telemetry@42d1cfc)
3a49d2c 
### 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
c7b0253 
### Auto resolving 23 conflicts to select the master repo version
Summary of changes by file state
DD (Deleted <=> Deleted): 11
AA (Added <=> Added): 12

 - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/api/tsconfig.esm.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/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js - Removed from both
 - (AA) pkgs/api-events/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/api-logs/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/api-logs/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/api/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/context/zone-peer-dep/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/core/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/detectors/browser/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/metrics/http/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/trace/http/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/trace/proto/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/instrumentations/web/auto/.eslintrc.js - Added in both => checkout theirs
...truncated...
Identifying and fixing merge issues from staged repos
@MSNev MSNev merged commit 97f33e1 into open-telemetry:main Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MSNev MSNev MSNev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@opentelemetrybot @MSNev @martinkuba @pichlermarc @renovate-bot @nordfjord @dyladan @seidelmartin @legendecas @trentm