-
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
chore: Merge main to minification branch #184
Merged
MSNev
merged 64 commits into
open-telemetry:minification
from
MSNev:MSNev/UpstreamMinification
Sep 13, 2023
Merged
chore: Merge main to minification branch #184
MSNev
merged 64 commits into
open-telemetry:minification
from
MSNev:MSNev/UpstreamMinification
Sep 13, 2023
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: Daniel Dyla <[email protected]>
Co-authored-by: Daniel Dyla <[email protected]>
* docs(guidelines): add dependencies guidelines * docs(guidelines): add line to CHANGELOG * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * docs(guidelines): lint * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Update GUIDELINES.md Co-authored-by: Marc Pichler <[email protected]> * Move guidelines to doc directory --------- Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Daniel Dyla <[email protected]>
…metry-js@92050b5) - commit 92050b5 - Author: Daniel Dyla <[email protected]> - Date: Wed Aug 23 12:01:51 2023 -0400 - docs: fix broken link to renovate.json (#4085) - ... ### Auto resolving 1 conflict to select the master repo version Summary of changes by file state UA (Updated <=> Added): 1 - (UA) auto-merge/js/doc/GUIDELINES.md - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@d83b57b) - commit d83b57b - Author: Daniel Dyla <[email protected]> - Date: Wed Aug 16 23:16:28 2023 -0400 - chore: release main (#1640) - ...
…3996) (#4076) Co-authored-by: Daniel Dyla <[email protected]>
…#4075) * chore(deps): update dependency prettier to v3 * chore: bump prettier-plugin-eslint and apply rules --------- Co-authored-by: Mend Renovate <[email protected]> Co-authored-by: Daniel Dyla <[email protected]>
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
…metry-js@c230076) - commit c230076 - Author: Mend Renovate <[email protected]> - Date: Wed Aug 23 20:42:58 2023 +0200 - chore(deps): update dependency gh-pages to v6 (#4058) - ...
### 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 1 conflict to select the master repo version Summary of changes by file state AA (Added <=> Added): 1 - (AA) pkgs/exporters/otlp/proto-base/protos - Added in both => checkout theirs Identifying and fixing merge issues from staged repos - (xS) /.gitmodules - Re-Copying master file as size mismatch 0 !== 163
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js;
…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
The type `V4Connection` re-introduced in #1170 is missing any type definitions or imports for `Document`, breaking the build with Typescript strict mode. `V4Connection` in `types.ts` is not referenced anywhere (the type definition in `internal-types.ts` is used. So lets just drop this type definition. BREAKING CHANGE: removes the broken exported type `V4Connection`. Fixes #1639 Signed-off-by: Simon Berz <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
* chore(deps): update dependency semver to v7.5.4 * chore(deps): align semver versions across repo * chore(deps): pin semver version v7.5.4
…it to the whole repo (#4091)
…accept optional metric producers (#4077) Co-authored-by: Daniel Dyla <[email protected]> Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…metry-js@1da2b1b) - commit 1da2b1b - Author: Mend Renovate <[email protected]> - Date: Wed Aug 30 16:05:51 2023 +0200 - chore(deps): update dependency prettier to v3.0.3 (#4092) - ...
…opentelemetry-js-contrib@78472a7) - commit 78472a7 - Author: Amir Blum <[email protected]> - Date: Wed Aug 30 11:08:00 2023 +0300 - chore: align @types/node to core repo and disable renovate (#1653) - ...
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
…metry-js@5b7f619) - commit 5b7f619 - Author: Mend Renovate <[email protected]> - Date: Thu Aug 31 13:04:59 2023 +0200 - chore(deps): update dependency @babel/preset-env to v7.22.14 (#4103) - ...
…opentelemetry-js-contrib@d1436eb) - commit d1436eb - Author: Daniel Dyla <[email protected]> - Date: Thu Aug 31 02:35:52 2023 -0400 - chore: release main (#1651) - ...
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
fix: limit npm to <10.0.0 on node v14 and v16
### 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/
Identifying and fixing merge issues from staged repos
* fix(sdk-metrics): metric names should be case-insensitive * fixup! * fixup!
…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
…metry-js@415b198) - commit 415b198 - Author: Marc Pichler <[email protected]> - Date: Thu Sep 7 10:20:44 2023 +0200 - fix(ci): pin nx to 15.9.6 for Node.js v14 (#4124) - ...
…opentelemetry-js-contrib@99ce679) - commit 99ce679 - Author: Mend Renovate <[email protected]> - Date: Wed Sep 6 18:59:40 2023 +0200 - chore(deps): update dependency ts-mocha to v10 (#1662) - ...
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
### 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 1 conflict to select the master repo version Summary of changes by file state AA (Added <=> Added): 1 - (AA) pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts - Added in both => checkout theirs Identifying and fixing merge issues from staged repos
…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
martinkuba
approved these changes
Sep 12, 2023
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.
Merging the
main
branch to theminification
branch.Where
upstream
ishttps://github.com/open-telemetry/opentelemetry-sandbox-web-js
MSNev/UpstreamMain
which trackedupstream/main
MSNev/UpstreamMinification
which trackedupstream/minification
git fetch && git rebase
on both branchesgit merge MSNev/UpstreamMain
on theMSNev/UpstreamMinification
branchMSNev/UpstreamMinification
branch to myorigin
(fork) of the sandboxMSNev/UpstreamMinification
to the master upstreamminification
branch