Skip to content

Commit

Permalink
Merge branch 'main' into update-checkout-andproduct-catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
cartermp authored Dec 2, 2023
2 parents bbd38b9 + 75471b4 commit 53e1697
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion content/en/docs/collector/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Collector
description: Vendor-agnostic way to receive, process and export telemetry data.
aliases: [collector/about]
cascade:
vers: 0.90.0
vers: 0.90.1
weight: 10
---

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/demo/services/feature-flag.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ In order to set up OpenTelemetry instrumentation for
[Phoenix](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix/),
and
[Ecto](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_ecto/),
, we need to call the setup methods of their instrumentation packages before
we need to call the setup methods of their instrumentation packages before
starting the Supervisor.

This is done in the `application.ex` as follows:
Expand Down
4 changes: 3 additions & 1 deletion content/en/docs/instrumentation/net/manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,9 @@ available by

## Logs

The logs API & SDK are currently under development.
The documentation for the logs API and SDK is missing. You can help make it
available by
[editing this page](https://github.com/open-telemetry/opentelemetry.io/edit/main/content/en/docs/instrumentation/net/manual.md).

## Next steps

Expand Down

0 comments on commit 53e1697

Please sign in to comment.