-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
[AutoMerge][Main] Merging staged change(s) to main #197
[AutoMerge][Main] Merging staged change(s) to main #197
Commits on Sep 29, 2023
-
Benchmark tests workflow (#4144)
Co-authored-by: Marc Pichler <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for c84698d - Browse repository at this point
Copy the full SHA c84698dView commit details
Commits on Oct 1, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 868f75e - Browse repository at this point
Copy the full SHA 868f75eView commit details
Commits on Oct 3, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8ee01b6 - Browse repository at this point
Copy the full SHA 8ee01b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5af8653 - Browse repository at this point
Copy the full SHA 5af8653View commit details
Commits on Oct 4, 2023
-
Added performance benchmarking doc (#4169)
Co-authored-by: Tyler Benson <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 5ce32c0 - Browse repository at this point
Copy the full SHA 5ce32c0View commit details
Commits on Oct 5, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2d36152 - Browse repository at this point
Copy the full SHA 2d36152View commit details
Commits on Oct 6, 2023
-
fix: BatchExporter should export continuously when batch size is reac…
…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]>
Configuration menu - View commit details
-
Copy full SHA for 9122561 - Browse repository at this point
Copy the full SHA 9122561View commit details -
chore(deps): update dependency @types/jquery to v3.5.21 (#4187)
Co-authored-by: Daniel Dyla <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 84861cd - Browse repository at this point
Copy the full SHA 84861cdView commit details
Commits on Oct 7, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5fd3737 - Browse repository at this point
Copy the full SHA 5fd3737View commit details -
Configuration menu - View commit details
-
Copy full SHA for c320c98 - Browse repository at this point
Copy the full SHA c320c98View commit details
Commits on Oct 10, 2023
-
fix(sdk-metrics): prevent per-reader storages from keeping unreported…
… accumulations in memory (#4163)
Configuration menu - View commit details
-
Copy full SHA for 4eb10f7 - Browse repository at this point
Copy the full SHA 4eb10f7View commit details -
Configuration menu - View commit details
-
Copy full SHA for f8e187b - Browse repository at this point
Copy the full SHA f8e187bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 52dd42d - Browse repository at this point
Copy the full SHA 52dd42dView commit details -
fix: Removed deprecated properties usage in Fastify instrumentation (…
…#1679) Co-authored-by: Marc Pichler <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for d3328f8 - Browse repository at this point
Copy the full SHA d3328f8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 540a0d1 - Browse repository at this point
Copy the full SHA 540a0d1View commit details
Commits on Oct 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for a8c225d - Browse repository at this point
Copy the full SHA a8c225dView commit details -
feat(metrics): prototype experimental advice support (#3876)
Co-authored-by: Marc Pichler <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for b6e532b - Browse repository at this point
Copy the full SHA b6e532bView commit details
Commits on Oct 13, 2023
-
fix(instrumentation-redis-4): avoid shimmer warning by only wrapping …
…multi/MULTI if they exist (#1729) Co-authored-by: Marc Pichler <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 247a81c - Browse repository at this point
Copy the full SHA 247a81cView commit details -
fix(instrumentation-redis-4): fix unhandledRejection in client.multi(…
…...) handling (#1730)
Configuration menu - View commit details
-
Copy full SHA for d953531 - Browse repository at this point
Copy the full SHA d953531View commit details
Commits on Oct 16, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 659d7ba - Browse repository at this point
Copy the full SHA 659d7baView commit details -
[AutoMerge] ## Merging otel-js @ [b6e532b...](open-telemetry/opentele…
…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
Configuration menu - View commit details
-
Copy full SHA for ae979d9 - Browse repository at this point
Copy the full SHA ae979d9View commit details -
[AutoMerge] ## Merging otel-js-contrib @ [659d7ba...](open-telemetry/…
…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
Configuration menu - View commit details
-
Copy full SHA for 3a644e4 - Browse repository at this point
Copy the full SHA 3a644e4View commit details -
Merge pull request open-telemetry#196 from opentelemetrybot/opentelem…
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
Configuration menu - View commit details
-
Copy full SHA for 42d1cfc - Browse repository at this point
Copy the full SHA 42d1cfcView commit details -
[AutoMerge] staging @ [42d1cfc...](open-telemetry@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/
Configuration menu - View commit details
-
Copy full SHA for 3a49d2c - Browse repository at this point
Copy the full SHA 3a49d2cView commit details -
[AutoMerge] 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
Configuration menu - View commit details
-
Copy full SHA for c7b0253 - Browse repository at this point
Copy the full SHA c7b0253View commit details