-
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 #178
Closed
opentelemetrybot
wants to merge
33
commits into
open-telemetry:main
from
opentelemetrybot:opentelemetrybot/merge-main
Closed
[AutoMerge][Main] Merging staged change(s) to main #178
opentelemetrybot
wants to merge
33
commits into
open-telemetry:main
from
opentelemetrybot:opentelemetrybot/merge-main
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
…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]>
…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) - ...
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js;
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]>
…ter-jaeger' (#4068) Co-authored-by: Daniel Dyla <[email protected]>
…cy (#3968) Co-authored-by: Daniel Dyla <[email protected]>
* fix(fastify): Make sure consturctor patching works with esm * ref: Streamline fastify wrapping Align this with how other instrumentations wrap. * Revert "ref: Streamline fastify wrapping" This reverts commit cbffbc731fe81a559d355d3e6b2e726b8a3509ec. * fix linting --------- Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Amir Blum <[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;
### 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
opentelemetrybot
force-pushed
the
opentelemetrybot/merge-main
branch
from
September 1, 2023 19:42
068203f
to
d357a05
Compare
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.
staging @ c572756...
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
Identifying and fixing merge issues from staged repos