chore: Merge main branch to minification branch #170
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Marc Pichler <[email protected]>
…s (#3868) * chore(renovate): improve PR grouping and add @pichlermarc to assingees * chore: fix 'compatability' typo
* chore(otlp-grpc-exporter): remove unused certs * chore(otlp-grpc-exporter): update TLS certs and keys for tests
Co-authored-by: Daniel Dyla <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
…s shim (#3778) Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…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]>
… 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
…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]>
…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]>
* chore: release main * chore: release main
fix: Handle renaming of eslint.config.js to eslint.base.js
### 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/
### Auto resolving 64 conflicts to select the master repo version Summary of changes by file state DD (Deleted <=> Deleted): 24 UA (Updated <=> Added): 3 AU (Added <=> Updated): 1 AA (Added <=> Added): 36 - (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js - Removed from both - (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts - 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/js/api/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/eslint.config.js - Removed from both - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-http/.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-exporter-metrics-otlp-http/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts - 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-core/.eslintrc.js - Removed from both ...truncated... Identifying and fixing merge issues from staged repos
…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
…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) - ...
…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
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
fix: handle re-adding submodule to the index
### 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/
### 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
…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
|
/easycla |
2 similar comments
|
/easycla |
|
/easycla |
|
/easycla |
15 tasks
|
/easycla |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge main branch to minification using
git merge mainwith the localmainbranch up to date with the upstreammain