-
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 #168
[AutoMerge][Main] Merging staged change(s) to main #168
Commits on Aug 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8802eae - Browse repository at this point
Copy the full SHA 8802eaeView commit details
Commits on Aug 12, 2023
-
fix(connect): fix wrong rpcMetada.route value not handle nested route…
… (#1555) * fix(connect): fix wrong rpcMetada.route value not handle nested route * fix: update base on PR feedback * fix: lint issue * Fix PR's feedback * Fix lint issue * Fix typo --------- Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Gerhard Stöbich <[email protected]> Co-authored-by: Haddas Bronfman <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 704f76f - Browse repository at this point
Copy the full SHA 704f76fView commit details -
feat: Add capacity information when applicable to dynamodb spans (#1365)
Co-authored-by: Haddas Bronfman <[email protected]> Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Amir Blum <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for ad94c5c - Browse repository at this point
Copy the full SHA ad94c5cView commit details -
feat(hapi): Skip update HTTP's span name and update RpcMetadata's rou…
…te instead (#1570) Co-authored-by: Gerhard Stöbich <[email protected]> Co-authored-by: Amir Blum <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 10bdbf7 - Browse repository at this point
Copy the full SHA 10bdbf7View commit details -
feat(restify): Skip update HTTP's span name and update RpcMetadata's …
…route instead (#1571) * feat(restify): Skip update HTTP's span name and update RpcMetadata's route instead * feat(restify): remove unused import --------- Co-authored-by: Amir Blum <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 7d4b13e - Browse repository at this point
Copy the full SHA 7d4b13eView commit details
Commits on Aug 13, 2023
-
fix(express): make rpcMetadata.route capture the last layer even when…
… if the last layer is not REQUEST_HANDLER (#1620) * fix(express): make rpcMetadata.route capture the last layer even when if the last layer is mot REQUEST_HANDLER * fix lint issue * remove test.only * revert code to change ignore order * update test * remove comment related to update span name * Move rpcRoute.metadata calculation logic up * Add more test * Fix lint
Configuration menu - View commit details
-
Copy full SHA for eeda32a - Browse repository at this point
Copy the full SHA eeda32aView commit details -
feat(koa): Skip update HTTP's span name and update RpcMetadata's rout…
…e instead (#1567) * feat(koa): Skip update HTTP's span name and update RpcMetadata's route instead * make the logic of rpcMetadata.route the same as previously * Remove unused variable --------- Co-authored-by: Haddas Bronfman <[email protected]> Co-authored-by: Amir Blum <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 825b5a8 - Browse repository at this point
Copy the full SHA 825b5a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 853a7b6 - Browse repository at this point
Copy the full SHA 853a7b6View commit details
Commits on Aug 14, 2023
-
feat(instrumentation-aws-lambda): Adds lambdaHandler config option (#…
…1627) * feat(lambda): Adds lambdaHandler config option * Apply suggestions from code review Co-authored-by: Amir Blum <[email protected]> * Apply suggestions from code review Co-authored-by: Carol Abadeer <[email protected]> * Update README.md --------- Co-authored-by: Amir Blum <[email protected]> Co-authored-by: Carol Abadeer <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for c4a8e82 - Browse repository at this point
Copy the full SHA c4a8e82View commit details -
* chore: release main * chore: release main
Configuration menu - View commit details
-
Copy full SHA for b3d30af - Browse repository at this point
Copy the full SHA b3d30afView commit details
Commits on Aug 15, 2023
-
[AutoMerge] ## Merging otel-js @ [853a7b6...](open-telemetry/opentele…
…metry-js@853a7b6) - commit 853a7b6 - Author: Marc Pichler <[email protected]> - Date: Sun Aug 13 11:08:59 2023 +0200 - fix(changelog): fix incorrect version for latest experimental release (#4047) - ...
Configuration menu - View commit details
-
Copy full SHA for fd77149 - Browse repository at this point
Copy the full SHA fd77149View commit details -
[AutoMerge] ## Merging otel-js-contrib @ [b3d30af...](open-telemetry/…
…opentelemetry-js-contrib@b3d30af) - commit b3d30af - Author: Daniel Dyla <[email protected]> - Date: Mon Aug 14 15:32:07 2023 -0400 - chore: release main (#1590) - ... ### Auto resolving 3 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 3 - (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/CHANGELOG.md - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/src/utils.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts - Unmerged, added by them => checkout theirs
Configuration menu - View commit details
-
Copy full SHA for 4de96c2 - Browse repository at this point
Copy the full SHA 4de96c2View commit details
Commits on Aug 16, 2023
-
Merge pull request open-telemetry#165 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 878a31c - Browse repository at this point
Copy the full SHA 878a31cView commit details -
[AutoMerge] staging @ [878a31c...](open-telemetry@878a31c)
### 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 1daaad8 - Browse repository at this point
Copy the full SHA 1daaad8View 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 3a3c873 - Browse repository at this point
Copy the full SHA 3a3c873View commit details