made various cleanups (#179)

Author: willarmiros

src/docs/getting-started/dotnet-sdk/trace-manual-instr.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Tracing with the AWS Distro for OpenTelemetry .NET SDK'
+title: 'Tracing with the AWS Distro for OpenTelemetry .NET SDK and X-Ray'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
     In this tutorial, we will introduce how to use OpenTelemetry .NET SDK for traces instrumentation in the application.

src/docs/getting-started/go-sdk/trace-manual-instr.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Tracing with the AWS Distro for OpenTelemetry Go SDK'
+title: 'Tracing with the AWS Distro for OpenTelemetry Go SDK and X-Ray'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
     In this tutorial, we will introduce how to use OpenTelemetry Go SDK for traces instrumentation in the application.

src/docs/getting-started/java-sdk.mdx

@@ -1,14 +1,12 @@
 ---
-title: 'Getting Started with the Java SDK on Traces and Metrics Instrumentation'
+title: 'Getting Started with the Java SDK for Traces Instrumentation'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
 path: '/docs/getting-started/java-sdk'
 ---
 
 import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
 
-# Getting Started with the Java SDK on Traces and Metrics Instrumentation
-
 The AWS Distro for OpenTelemetry (ADOT) Java refers to some components developed to complement the upstream
 [OpenTelemetry (OTel) Java SDK](https://github.com/open-telemetry/opentelemetry-java) and
 [OTel Java Auto-Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation). Below are links
@@ -23,4 +21,4 @@ backend.
 * [Manual Instrumentation for Traces with the Java SDK](/docs/getting-started/java-sdk/trace-manual-instr)
 
 ## Sample Code
-* [Sample Spring App using OpenTelemetry Java Auto Instrumentation](https://github.com/aws-samples/one-observability-demo/tree/main/PetAdoptions/petsearch-java)
+* [Sample Spring App using OpenTelemetry Java Auto-Instrumentation](https://catalog.us-east-1.prod.workshops.aws/v2/workshops/31676d37-bbe9-4992-9cd1-ceae13c5116c/en-US/adot/javawalkthrough)

src/docs/getting-started/java-sdk/trace-auto-instr.mdx

@@ -12,7 +12,7 @@ import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.js
 
 ## Introduction
 
-The AWS Distro for OpenTelemetry Java Auto-Instrumentation Agent can be attached to any Java 8+ application to gather
+The AWS Distro for OpenTelemetry (ADOT) Java Auto-Instrumentation Agent can be attached to any Java 8+ application to gather
 telemetry data from a diverse set of libraries and frameworks. The agent will automatically transform code at startup
 to collect tracing data. It is preconfigured for compatibility with X-Ray and AWS services but can also be used with any
 other tracing backend. Out of the box, it propagates traces using all of W3C Trace Context, B3, and X-Amzn-Trace-Id.
@@ -83,7 +83,7 @@ artifact, any usage of it will be disabled by the agent.
 ##### For Gradle:
 ```java lineNumbers=true
 dependencies {
-    implementation("io.opentelemetry:opentelemetry-api:1.5.0")
+    implementation("io.opentelemetry:opentelemetry-api:1.6.0")
 }
 ```
 
@@ -93,7 +93,7 @@ dependencies {
   <dependency>
     <groupId>io.opentelemetry</groupId>
     <artifactId>opentelemetry-api</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
   </dependency>
 </dependencies>
 ```
@@ -103,4 +103,6 @@ for more detail on using the OpenTelemetry API.
 
 <SectionSeparator />
 
-* [Sample Spring App using OpenTelemetry Java Auto Instrumentation](https://github.com/aws-samples/one-observability-demo/tree/main/PetAdoptions/petsearch-java)
+## Sample Application
+
+Visit the [Sample Spring App using OpenTelemetry Java Auto-Instrumentation](https://catalog.us-east-1.prod.workshops.aws/v2/workshops/31676d37-bbe9-4992-9cd1-ceae13c5116c/en-US/adot/javawalkthrough).

src/docs/getting-started/java-sdk/trace-manual-instr.mdx

@@ -25,7 +25,7 @@ If you are using the Auto-Instrumentation Java Agent, refer to the [documentatio
 
 [Java 8 (or later)](https://adoptopenjdk.net/) is required to run an application using OpenTelemetry.
 
-Note: You’ll also need to have the AWS Distro for OpenTelemetry Collector running to export traces to X-Ray.
+Note: You’ll also need to have the AWS Distro for OpenTelemetry (ADOT) Collector running to export traces to X-Ray.
 
 <SectionSeparator />
 
@@ -37,7 +37,7 @@ to align dependency versions for non-contrib components.
 ##### For Gradle:
 ```java lineNumbers=true
 dependencies {
-    api(platform("io.opentelemetry:opentelemetry-bom:1.5.0"))
+    api(platform("io.opentelemetry:opentelemetry-bom:1.6.0"))
 
     implementation("io.opentelemetry:opentelemetry-api")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")
@@ -46,7 +46,7 @@ dependencies {
 
     implementation("io.opentelemetry:opentelemetry-extension-aws")
     implementation("io.opentelemetry:opentelemetry-sdk-extension-aws")
-    implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.5.0")
+    implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.6.0")
 }
 ```
 
@@ -57,7 +57,7 @@ dependencies {
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-bom</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
       <type>pom</type>
       <scope>import</scope>
     <dependency>
@@ -87,7 +87,7 @@ dependencies {
   <dependency>
     <groupId>io.opentelemetry.contrib</groupId>
     <artifactId>opentelemetry-aws-xray</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
   </dependency>
 </dependencies>
 ```
@@ -102,10 +102,14 @@ Initialize the OpenTelemetry SDK with AWS components for exporting to X-Ray as f
 
 ```java
 OpenTelemetrySdk.builder()
+
+        // This will enable your downstream requests to include the X-Ray trace header
         .setPropagators(
             ContextPropagators.create(
                 TextMapPropagator.composite(
                     W3CTraceContextPropagator.getInstance(), AwsXrayPropagator.getInstance())))
+        
+        // This provides basic configuration of a TracerProvider which generates X-Ray compliant IDs
         .setTracerProvider(
             SdkTracerProvider.builder()
                 .addSpanProcessor(
@@ -147,6 +151,7 @@ OpenTelemetrySdk.builder()
                 ...
                 .setResource(
                     Resource.getDefault()
+                        .merge(BeanstalkResource.get())
                         .merge(Ec2Resource.get())
                         .merge(EcsResource.get()
                         .merge(EksResource.get())))
@@ -176,7 +181,7 @@ library instrumentation. When using this, do not include `opentelemetry-bom`.
 ##### For Gradle:
 ```java lineNumbers=true
 dependencies {
-    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha"))
+    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.6.0-alpha"))
 
     implementation("io.opentelemetry:opentelemetry-api")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")
@@ -195,7 +200,7 @@ dependencies {
     <dependency>
       <groupId>io.opentelemetry.instrumentation</groupId>
       <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
       <type>pom</type>
       <scope>import</scope>
     <dependency>
@@ -226,7 +231,6 @@ dependencies {
 
 The `opentelemetry-instrumentation-aws-sdk-2.2` artifact provides instrumentation for the AWS SDK v2.
 
-
 ##### For Gradle:
 ```java lineNumbers=true
 dependencies {

src/docs/getting-started/python-sdk/trace-auto-instr.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'ADOT Python - Auto-Instrumentation Documentation'
+title: 'Tracing with the AWS Distro for OpenTelemetry Python Auto-Instrumentation and X-Ray'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
     In this tutorial, we will introduce how to use OpenTelemetry Python SDK for traces and metrics instrumentation in the application...
@@ -9,8 +9,6 @@ path: '/docs/getting-started/python-sdk/trace-auto-instr'
 import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
 import SubSectionSeparator from "components/MdxSubSectionSeparator/subsectionSeparator.jsx"
 
-# Tracing with the AWS Distro for OpenTelemetry Python Auto-Instrumentation
-
 ## Introduction
 
 OpenTelemetry Python supports automatic instrumentation. It automatically produces spans with telemetry data describing the values used by the python frameworks in your application without adding a single line of code. This telemetry data can then be exported to a backend like AWS X-Ray using the ADOT Python `opentelemetry-sdk-extension-aws` package.
@@ -34,7 +32,7 @@ The easiest way to download the packages needed for auto-instrumentation is usin
 ```bash
 # Install required packages for instrumentation and to support tracing with AWS X-Ray
 $ pip install opentelemetry-distro[otlp]>=0.24b0 \
-              opentelemetry-sdk-extension-aws~=1.0.0
+              opentelemetry-sdk-extension-aws~=1.0
 ```
 
 Installing the `opentelemetry-sdk-extension-aws` package automatically installs the `opentelemetry-api`, `opentelemetry-sdk`, and `opentelemetry-instrumentation` packages as dependencies.
@@ -50,8 +48,6 @@ $ opentelemetry-bootstrap --action=install
 
 For example, if you have `boto3` installed, this command will automatically install the `opentelemetry-instrumentation-botocore` package which auto-instrumentation can subsequently configure automatically. Check out the OpenTelemetry registry for a [full list of instrumentation packages provided by OpenTelemetry Python](https://opentelemetry.io/registry/?s=&component=instrumentation&language=python).
 
-<SubSectionSeparator />
-
 ## Running an Application with Auto-Instrumentation
 
 Auto-instrumentation uses the `opentelemetry-instrument` executable functions as a wrapper to automatically initialize the `Instrumentors` installed by the `opentelemetry-bootstrap` command and start the provided application.
@@ -110,4 +106,4 @@ Because there can only be one global `TracerProvider`, manual instrumentation sh
 
 ## Sample Application
 
-See a [sample Flask App using OpenTelemetry Python SDK Automatic Instrumentation](https://github.com/aws-observability/aws-otel-python/tree/main/integration-test-apps/auto-instrumentation/flask)
+See a [sample Flask App using OpenTelemetry Python SDK Automatic Instrumentation](https://github.com/aws-observability/aws-otel-python/tree/main/integration-test-apps/auto-instrumentation/flask).

src/docs/getting-started/python-sdk/trace-manual-instr.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'ADOT Python - Manual Instrumentation Documentation'
+title: 'Tracing with the AWS Distro for OpenTelemetry Python SDK and X-Ray'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
     In this tutorial, we will introduce how to use OpenTelemetry Python SDK for traces and metrics instrumentation in the application...
@@ -9,8 +9,6 @@ path: '/docs/getting-started/python-sdk/trace-manual-instr'
 import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
 import SubSectionSeparator from "components/MdxSubSectionSeparator/subsectionSeparator.jsx"
 
-# Tracing with the AWS Distro for OpenTelemetry Python SDK
-
 ## Introduction
 
 With OpenTelemetry Python manual instrumentation, you configure the OpenTelemetry SDK within your application's code. It automatically produces spans with telemetry data describing the values used by the Python frameworks in your application with only a few lines of code. This telemetry data can then be exported to a backend like AWS X-Ray using the ADOT Python `opentelemetry-sdk-extension-aws` package.
@@ -110,8 +108,6 @@ Alternatively, set the `OTEL_PROPAGATORS` environment variable to achieve the sa
 OTEL_PROPAGATORS=xray
 ```
 
-<SectionSeparator />
-
 ### Using the AWS resource Detectors
 
 When you install `opentelemetry-sdk-extension-aws`, you automatically get AWS Resource Detectors in the same package. Use the provided `Resource Detectors` to automatically populate attributes under the `resource` namespace of each generated span.
@@ -140,9 +136,9 @@ trace.set_tracer_provider(
 )
 ```
 
-To see what attributes are captured and how to add other resource detectors, refer to each detectors' docstring in the [OpenTelemetry SDK Extension for AWS](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/sdk-extension/opentelemetry-sdk-extension-aws) to determine any requirements for that detector.
-
-<SubSectionSeparator />
+To see what attributes are captured and how to add other resource detectors, refer to each detectors' docstring in the
+[OpenTelemetry SDK Extension for AWS](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/sdk-extension/opentelemetry-sdk-extension-aws)
+to determine any requirements for that detector.
 
 ### Debug Logging
 
@@ -166,7 +162,7 @@ logger = logging.getLogger(__file__)
 logger.debug("My debug level log.")
 ```
 
-<SubSectionSeparator />
+<SectionSeparator />
 
 ## Instrumenting an Application
 
@@ -189,8 +185,6 @@ RequestsInstrumentor().instrument()
 FlaskInstrumentor().instrument_app(app)
 ```
 
-<SubSectionSeparator />
-
 ### Instrumenting the AWS SDK
 
 To install the instrumentation library for the AWS SDK and its dependencies, run the `pip install` command from below which applies to your application. **NOTE:** Since these instrumentations are not yet stable, we recommend installing it at a pinned version.
@@ -229,7 +223,7 @@ BotocoreInstrumentor().instrument()
 
 For more information refer to the upstream documentation for [OpenTelemetry Python boto Instrumentation](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-boto) or [OpenTelemetry Python botocore Instrumentation](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore).
 
-<SubSectionSeparator />
+<SectionSeparator />
 
 ## Custom Instrumentation
 
@@ -261,8 +255,6 @@ with tracer.start_as_current_span("Root Span", kind=trace.SpanKind.SERVER):
         return '<h1>Good job! Traces recorded!</h1>'
 ```
 
-<SubSectionSeparator />
-
 ### Adding custom attributes
 
 You can also add custom key-value pairs as attributes onto your spans. Attributes are converted to metadata by default. If you [configure your collector](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/7bf2266a025425993a233f66c77a0810ab11a78b/exporter/awsxrayexporter#exporter-configuration), you can convert some or all of the attributes to annotations. To read more about X-Ray annotations and metadata see the [AWS X-Ray Developer Guide](https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-annotations).
@@ -298,8 +290,8 @@ with tracer.start_as_current_span("Root Span") as span:
     current_span.set_attribute("my_attribute", "foo")
 ```
 
-<SubSectionSeparator />
+<SectionSeparator />
 
 ## Sample Application
 
-See a [sample Flask App using OpenTelemetry Python SDK Manual Instrumentation](https://github.com/aws-observability/aws-otel-python/tree/main/integration-test-apps/manual-instrumentation/flask)
+See a [sample Flask App using OpenTelemetry Python SDK Manual Instrumentation](https://github.com/aws-observability/aws-otel-python/tree/main/integration-test-apps/manual-instrumentation/flask).