Merge branch 'main' into patch-2

open-telemetry · Jan 22, 2024 · 9c58ad8 · 9c58ad8
2 parents 490c1c0 + 6e3bf58
commit 9c58ad8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/content/en/blog/2022/announcing-opentelemetry-demo-release/index.md b/content/en/blog/2022/announcing-opentelemetry-demo-release/index.md
@@ -19,7 +19,7 @@ system instrumented with 100% OpenTelemetry Traces and Metrics.
 One of our primary goals of this project has been to create a robust sample
 application for developers to use in learning OpenTelemetry, and we’re proud to
 say that we’ve done just that. Every OpenTelemetry language SDK except Swift is
-[represented](/docs/demo/service-table/) in this release -- yes, even PHP! We’ve
+[represented](/docs/demo/services/) in this release -- yes, even PHP! We’ve
 built complete [tracing flows](/docs/demo/telemetry-features/trace-coverage/)
 that demonstrate a breadth of common instrumentation tasks such as:
 

diff --git a/content/en/docs/concepts/signals/logs.md b/content/en/docs/concepts/signals/logs.md
@@ -33,7 +33,7 @@ components that will play a part in instrumenting our code.
 As an application developer, the **Logs Bridge API** should not be called by you
 directly, as it is provided for logging library authors to build log appenders /
 bridges. Instead, you just use your preferred logging library and configure it
-to use an log appender (or log bridge) that is able to emit logs into an
+to use a log appender (or log bridge) that is able to emit logs into an
 OpenTelemetry LogRecordExporter.
 
 OpenTelemetry language SDKs offer this functionality.

diff --git a/content/en/docs/concepts/signals/traces.md b/content/en/docs/concepts/signals/traces.md
@@ -298,7 +298,7 @@ Each span has a status. The three possible values are:
 The default value is `Unset`. A span status that is `Unset` means that the
 operation it tracked successfully completed without an error.
 
-When a span status is `Error`, then that means some error ocurred in the
+When a span status is `Error`, then that means some error occurred in the
 operation it tracks. For example, this could be due to an HTTP 500 error on a
 server handling a request.
 

diff --git a/content/en/docs/demo/_index.md b/content/en/docs/demo/_index.md
@@ -78,7 +78,7 @@ Project reference documentation, like requirements and feature matrices.
 - [Metric Feature Matrix](telemetry-features/metric-coverage/)
 - [Requirements](./requirements/)
 - [Screenshots](screenshots/)
-- [Service Roles Table](service-table/)
+- [Services](services/)
 - [Span Attributes Reference](telemetry-features/manual-span-attributes/)
 - [Tests](tests/)
 - [Trace Feature Matrix](telemetry-features/trace-coverage/)
diff --git a/content/en/docs/demo/service-table.md b/content/en/docs/demo/service-table.md
diff --git a/content/en/docs/demo/services/_index.md b/content/en/docs/demo/services/_index.md
@@ -1,3 +1,24 @@
 ---
 title: Services
+cSpell:ignore: loadgenerator
 ---
+
+View [Service Graph](../architecture/) to visualize request flows.
+
+| Service                                   | Language      | Description                                                                                                                                  |
+| ----------------------------------------- | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| [accountingservice](accounting/)          | Go            | Processes incoming orders and count the sum of all orders (mock/).                                                                           |
+| [adservice](ad/)                          | Java          | Provides text ads based on given context words.                                                                                              |
+| [cartservice](cart/)                      | .NET          | Stores the items in the user's shopping cart in Redis and retrieves it.                                                                      |
+| [checkoutservice](checkout/)              | Go            | Retrieves user cart, prepares order and orchestrates the payment, shipping and the email notification.                                       |
+| [currencyservice](currency/)              | C++           | Converts one money amount to another currency. Uses real values fetched from European Central Bank. It's the highest QPS service.            |
+| [emailservice](email/)                    | Ruby          | Sends users an order confirmation email (mock/).                                                                                             |
+| [frauddetectionservice](fraud-detection/) | Kotlin        | Analyzes incoming orders and detects fraud attempts (mock/).                                                                                 |
+| [featureflagservice](feature-flag/)       | Erlang/Elixir | CRUD feature flag service to demonstrate various scenarios like fault injection & how to emit telemetry from a feature flag reliant service. |
+| [frontend](frontend/)                     | JavaScript    | Exposes an HTTP server to serve the website. Does not require sign up / login and generates session IDs for all users automatically.         |
+| [loadgenerator](load-generator/)          | Python/Locust | Continuously sends requests imitating realistic user shopping flows to the frontend.                                                         |
+| [paymentservice](payment/)                | JavaScript    | Charges the given credit card info (mock/) with the given amount and returns a transaction ID.                                               |
+| [productcatalogservice](product-catalog/) | Go            | Provides the list of products from a JSON file and ability to search products and get individual products.                                   |
+| [quoteservice](quote/)                    | PHP           | Calculates the shipping costs, based on the number of items to be shipped.                                                                   |
+| [recommendationservice](recommendation/)  | Python        | Recommends other products based on what's given in the cart.                                                                                 |
+| [shippingservice](shipping/)              | Rust          | Gives shipping cost estimates based on the shopping cart. Ships items to the given address (mock/).                                          |
diff --git a/content/en/docs/languages/net/libraries.md b/content/en/docs/languages/net/libraries.md
@@ -4,9 +4,13 @@ linkTitle: Libraries
 weight: 40
 ---
 
-You can use
+{{% docs/languages/libraries-intro ".NET" %}}
+
+## Use Instrumentation Libraries
+
+If a library does not come with OpenTelemetry out of the box, you can use
 [instrumentation libraries](/docs/specs/otel/glossary/#instrumentation-library)
-in order to generate telemetry data for a particular instrumented library.
+in order to generate telemetry data for a library or framework.
 
 For example,
 [the instrumentation library for ASP.NET Core](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNetCore)
@@ -111,9 +115,9 @@ You can also find more instrumentations available in the
 
 ## Next steps
 
-After you have set up instrumentation libraries, you may want to add
-[manual instrumentation](/docs/languages/net/instrumentation) to collect custom
-telemetry data.
+After you have set up instrumentation libraries, you may want to add your own
+[instrumentation](/docs/languages/net/instrumentation) to your code, to collect
+custom telemetry data.
 
 If you are using .NET Framework 4.x instead of modern .NET, refer to the
 [.NET Framework docs](/docs/languages/net/netframework) to configure