Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[AutoMerge][Main] Merging staged change(s) to main #200

Merged
merged 11 commits into from
Oct 24, 2023
Merged

[AutoMerge][Main] Merging staged change(s) to main #200

merged 11 commits into from
Oct 24, 2023

Conversation

opentelemetrybot
Copy link
Contributor

staging @ abb964a...

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

trentm and others added 11 commits October 17, 2023 10:05
@trentm @pichlermarc
fix(ioredis): fix instrumentation of ESM-imported ioredis (#1694)
7b457cd 
Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
chore(deps): update all patch versions (#4194)
00e78ef
@trentm @pichlermarc
fix(pg): fix instrumentation of ESM-imported pg (#1701)
2502e18 
Co-authored-by: Marc Pichler <[email protected]>
@david-luna @pichlermarc
fix: fix context loss when cursor are accesed concurrently (#1721)
1dc2e81 
Co-authored-by: Marc Pichler <[email protected]>
@pichlermarc
fix: bump deploy docs workflow to node 18 (#4199)
7f52f70
@luismiramirez
fix(sdk-node) Remove @opentelemetry/exporter-jaeger explicit dependen…
1c7d7a3 
…cy (#4214)
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [1c7d7a3...](open-telemetry/opentele…
eff5d46 
…metry-js@1c7d7a3)

  - commit 1c7d7a3
  - Author: Luismi Ramírez <[email protected]>
  - Date:   Thu Oct 19 08:14:18 2023 +0200
  -     fix(sdk-node) Remove @opentelemetry/exporter-jaeger explicit dependency (#4214)
  - ...
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [1dc2e81...](open-telemetry/…
9fc3e1b 
…opentelemetry-js-contrib@1dc2e81)

  - commit 1dc2e81
  - Author: David Luna <[email protected]>
  - Date:   Tue Oct 17 15:17:22 2023 +0200
  -     fix: fix context loss when cursor are accesed concurrently (#1721)
  - ...
@MSNev
Merge pull request open-telemetry#199 from opentelemetrybot/opentelem…
abb964a 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] staging @ [abb964a...](open-telemetry@abb964a)
b48e41b 
### 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/
@opentelemetrybot
[AutoMerge] Merge Staged changes to main
ceb8c08 
Identifying and fixing merge issues from staged repos
@MSNev MSNev merged commit d8fab86 into open-telemetry:main Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MSNev MSNev MSNev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@opentelemetrybot @MSNev @trentm @renovate-bot @david-luna @pichlermarc @luismiramirez