Merge branch 'main' into colrelease

vasireddy99 · web-flow · commit e3c4147081be · 2023-09-25T11:15:11.000-07:00
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -5,11 +5,11 @@ require("dotenv").config({
 module.exports = {
   // pathPrefix: "/",
   siteMetadata: {
-    title: 'AWS Open Distro for OpenTelemetry',
-    siteTitle: `AWS Open Distro for OpenTelemetry`,
-    defaultTitle: `AWS Open Distro for OpenTelemetry`,
+    title: 'AWS Distro for OpenTelemetry',
+    siteTitle: `AWS Distro for OpenTelemetry`,
+    defaultTitle: `AWS Distro for OpenTelemetry`,
     siteTitleShort: `AWS Distro OpenTelemetry`,
-    siteDescription: `Technical documentation for AWS Open Distro for OpenTelemetry`,
+    siteDescription: `Technical documentation for AWS Distro for OpenTelemetry`,
     siteAuthor: `Amazon AWS Observability`,
     // siteImage: `/banner.png`,
     siteLanguage: `en`,
diff --git a/src/content/Announcements/announcements.yaml b/src/content/Announcements/announcements.yaml
@@ -1,6 +1,6 @@
 title: Announcements
 description:
-  This page contains all the latest and previous announcements for AWS Open Distro for OpenTelemetry
+  This page contains all the latest and previous announcements for AWS Distro for OpenTelemetry
 path: /announcements
 
 announcements:
diff --git a/src/content/BlogPosts/blogPosts.yaml b/src/content/BlogPosts/blogPosts.yaml
@@ -14,6 +14,14 @@ blogs:
         from the Amazon Elastic Container Registry (Amazon ECR) Public Gallery."
     link: "/docs/ReleaseBlogs/aws-distro-for-opentelemetry-collector-v0.33.1"
 
+  - title: "AWS Distro for OpenTelemetry Java Instrumentation v1.30.0 is now available"
+    author: "Huy Vo"
+    date: "19-September-2023"
+    body:
+      "AWS Distro for OpenTelemetry Java Instrumentation v1.30.0 is now available. You can download the latest ADOT Java auto-instrumentation Docker image
+        from the Amazon Elastic Container Registry (Amazon ECR) Public Gallery and the jar artifacts from the Maven Central Repository."
+    link: "/docs/ReleaseBlogs/aws-distro-for-opentelemetry-java-instrumentation-v1.30.0"
+
   - title: "AWS Distro for OpenTelemetry EKS Add-on v0.80.0 is now available"
     author: "Kausik Amancherla"
     date: "15-September-2023"
diff --git a/src/content/Blogs/ReleaseBlogs/aws-distro-for-opentelemetry-java-instrumentation-v1.30.0.mdx b/src/content/Blogs/ReleaseBlogs/aws-distro-for-opentelemetry-java-instrumentation-v1.30.0.mdx
@@ -0,0 +1,38 @@
+---
+title: "AWS Distro for OpenTelemetry Java Instrumentation v1.30.0"
+description: This blog post is the release announcement for AWS Distro for OpenTelemetry - Instrumentation for Java v1.30.0
+---
+
+import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx";
+
+<SectionSeparator />
+
+[AWS Distro for OpenTelemetry (ADOT)](https://aws-otel.github.io/) Agent for Java v1.30.0 is now available.
+
+<SectionSeparator />
+
+**Release Highlights**
+
+Contains updates of the following upstream components:
+* OpenTelemetry Java - [1.30.1](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.30.1)
+* OpenTelemetry Instrumentation for Java - [1.30.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.30.0)
+* OpenTelemetry Java Contrib - [1.29.0](https://github.com/open-telemetry/opentelemetry-java-contrib/releases/tag/v1.29.0)
+
+
+**Download**
+
+You can download the latest Docker image from [our public ECR repository](https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-java), and jar artifacts from the
+[GitHub](https://github.com/aws-observability/aws-otel-java-instrumentation/releases/tag/v1.30.0) and [Maven Central Repository](https://central.sonatype.com/artifact/software.amazon.opentelemetry/aws-opentelemetry-agent/1.30.0).
+
+To learn more about how to use AWS Distro for OpenTelemetry (ADOT) to collect data for your observability solution,
+check out the hands-on [AWS Observability workshop](https://observability.workshop.aws/en/adot.html).
+Please file an [issue](https://github.com/aws-observability/aws-otel-community/issues) if you have any
+questions about the distribution, features, or its components.
+
+We also welcome you to participate in the [OpenTelemetry project](https://github.com/open-telemetry).
+The project was [approved for incubation](https://www.cncf.io/blog/2021/08/26/opentelemetry-becomes-a-cncf-incubating-project/) status
+in August 2021 by the Cloud Native Computing Foundation Technical Oversight Committee (CNCF TOC). Learn more about
+[AWS Distro for OpenTelemetry](https://aws.amazon.com/blogs/opensource/category/management-tools/aws-distro-for-opentelemetry/) on the
+[AWS Open Source Blog](https://aws.amazon.com/blogs/opensource/category/management-tools/aws-distro-for-opentelemetry/), where we announced
+the distribution’s [general availability for tracing](https://aws.amazon.com/blogs/opensource/aws-distro-for-opentelemetry-is-now-ga-for-tracing/) in September 2021
+and the distribution's [general availability for metrics](https://aws.amazon.com/blogs/opensource/aws-distro-for-opentelemetry-is-now-generally-available-for-metrics/) in May 2022.
diff --git a/src/content/SiteContent/get-involved.yaml b/src/content/SiteContent/get-involved.yaml
@@ -1,6 +1,6 @@
 title: Get Involved
 description:
-  This page is about how to get involved with AWS Open Distro for OpenTelemetry
+  This page is about how to get involved with AWS Distro for OpenTelemetry
 path: /get-involved
 
 paragraph1:
diff --git a/src/docs/getting-started/go-sdk.mdx b/src/docs/getting-started/go-sdk.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Getting Started with the OpenTelemetry Go SDK on Traces Instrumentation'
+title: 'Getting Started with the OpenTelemetry Go SDK on Traces and Metrics Instrumentation'
 description:
     OpenTelemetry provides different language SDKs to instrument customer's application for collecting telemetry data.
     In this tutorial, we will introduce how to use OpenTelemetry Go SDK for manual instrumentation
diff --git a/src/docs/getting-started/java-sdk.mdx b/src/docs/getting-started/java-sdk.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Getting Started with the Java SDK for Traces Instrumentation'
+title: 'Getting Started with the Java SDK for Traces and Metrics Instrumentation'
 description:
     OpenTelemetry provides different language SDKs to instrument code for collecting telemetry data in the application.
 path: '/docs/getting-started/java-sdk'
diff --git a/src/docs/getting-started/java-sdk/auto-instr.mdx b/src/docs/getting-started/java-sdk/auto-instr.mdx
@@ -35,7 +35,7 @@ The ADOT Java Agent is also published in the following maven coordinates:
 
 ```kotlin lineNumbers=true
 dependencies {
-    implementation("software.amazon.opentelemetry:aws-opentelemetry-agent:1.29.0")
+    implementation("software.amazon.opentelemetry:aws-opentelemetry-agent:1.30.0")
 }
 ```
 
@@ -44,7 +44,7 @@ dependencies {
   <dependency>
       <groupId>software.amazon.opentelemetry</groupId>
       <artifactId>aws-opentelemetry-agent</artifactId>
-      <version>1.29.0</version>
+      <version>1.30.0</version>
   </dependency>
 </dependencies>
 ```
@@ -111,7 +111,7 @@ artifact, any usage of it will be disabled by the agent.
 ##### For Gradle:
 ```kotlin lineNumbers=true
 dependencies {
-    implementation("io.opentelemetry:opentelemetry-api:1.29.0")
+    implementation("io.opentelemetry:opentelemetry-api:1.30.1")
 }
 ```
 
@@ -121,7 +121,7 @@ dependencies {
   <dependency>
     <groupId>io.opentelemetry</groupId>
     <artifactId>opentelemetry-api</artifactId>
-    <version>1.29.0</version>
+    <version>1.30.1</version>
   </dependency>
 </dependencies>
 ```
diff --git a/src/docs/getting-started/java-sdk/manual-instr.mdx b/src/docs/getting-started/java-sdk/manual-instr.mdx
@@ -37,7 +37,7 @@ to align dependency versions for non-contrib components.
 ##### For Gradle:
 ```kotlin lineNumbers=true
 dependencies {
-    api(platform("io.opentelemetry:opentelemetry-bom:1.29.0"))
+    api(platform("io.opentelemetry:opentelemetry-bom:1.30.1"))
 
     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.27.0")
+    implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.29.0")
 }
 ```
 
@@ -57,7 +57,7 @@ dependencies {
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-bom</artifactId>
-      <version>1.29.0</version>
+      <version>1.30.1</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.27.0</version>
+    <version>1.29.0</version>
   </dependency>
 </dependencies>
 ```
@@ -211,7 +211,7 @@ library instrumentation. When using this, do not include `opentelemetry-bom`.
 ##### For Gradle:
 ```kotlin lineNumbers=true
 dependencies {
-    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha"))
+    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha"))
 
     implementation("io.opentelemetry:opentelemetry-api")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")
@@ -230,7 +230,7 @@ dependencies {
     <dependency>
       <groupId>io.opentelemetry.instrumentation</groupId>
       <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-      <version>1.29.0-alpha</version>
+      <version>1.30.0-alpha</version>
       <type>pom</type>
       <scope>import</scope>
     <dependency>
@@ -264,7 +264,7 @@ The `opentelemetry-instrumentation-aws-sdk-2.2` artifact provides instrumentatio
 ##### For Gradle:
 ```java lineNumbers=true
 dependencies {
-    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha"))\
+    api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha"))\
 
     implementation("io.opentelemetry.instrumentation:opentelemetry-aws-sdk-2.2")
 
@@ -279,7 +279,7 @@ dependencies {
     <dependency>
       <groupId>io.opentelemetry.instrumentation</groupId>
       <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-      <version>1.29.0-alpha</version>
+      <version>1.30.0-alpha</version>
       <type>pom</type>
       <scope>import</scope>
     <dependency>
diff --git a/src/docs/getting-started/prometheus-remote-write-exporter/eks.mdx b/src/docs/getting-started/prometheus-remote-write-exporter/eks.mdx
@@ -86,7 +86,7 @@ We will be using a simple sample app that is used for the integration tests of t
 First, fork the repository. Then clone the repository and run the following commands:
 
 ```bash
-$ cd ./sample-apps/prometheus
+$ cd ./sample-apps/prometheus-sample-app
 $ docker build . -t prometheus-sample-app:latest
 ```
 
@@ -139,7 +139,7 @@ configurations if you would like to scrape a different application.
 To pull the Kubernetes configuration for ADOT Collector:
 
 ```bash
-$ curl https://raw.githubusercontent.com/aws-observability/aws-otel-collector/main/examples/eks/prometheus-pipeline/eks-prometheus-daemonset.yaml -o eks-prometheus-daemonset.yaml
+$ curl https://raw.githubusercontent.com/aws-observability/aws-otel-collector/main/examples/eks/aws-prometheus/prometheus-daemonset.yaml -o eks-prometheus-daemonset.yaml
 ```
 
 You will have to change the `<YOUR_ENDPOINT>` and `<YOUR_REGION>` to correspond with your own AMP workspace. The changes should be with respect to the Prometheus Remote Write Exporter’s configuration and the `sigv4auth` extension's configuration. 
diff --git a/src/docs/getting-started/python-sdk.mdx b/src/docs/getting-started/python-sdk.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Getting Started with the Python SDK'
+title: 'Getting Started with the Python SDK on Traces and Metrics Instrumentation'
 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...
@@ -8,8 +8,6 @@ path: '/docs/getting-started/python-sdk'
 
 import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
 
-# Getting Started with the Python SDK on Traces and Metrics Instrumentation
-
 The AWS Distro for OpenTelemetry (ADOT) Python refers to some components developed to complement the upstream [OpenTelemetry (OTel) Python SDK](https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk). Below are links to guides that go over how to configure the relevant components of the OpenTelemetry SDK to send trace data to the AWS X-Ray backend.
 
 <SectionSeparator />
diff --git a/src/docs/getting-started/ruby-sdk.mdx b/src/docs/getting-started/ruby-sdk.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Getting Started with the ADOT Ruby SDK'
+title: 'Getting Started with the Ruby SDK on Traces Instrumentation'
 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 Ruby SDK for traces and metrics instrumentation in the application...
@@ -8,8 +8,6 @@ path: '/docs/getting-started/ruby-sdk'
 
 import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
 
-# Getting Started with the Ruby SDK on Traces Instrumentation
-
 The AWS Distro for OpenTelemetry (ADOT) Ruby refers to some components developed to complement the upstream [OpenTelemetry (OTel) Ruby SDK](https://github.com/open-telemetry/opentelemetry-ruby/tree/main/sdk). Below are links to guides that go over how to configure the relevant components of the OpenTelemetry SDK to send trace data to the AWS X-Ray backend.
 
 <SectionSeparator />
diff --git a/src/docs/partners/datadog.mdx b/src/docs/partners/datadog.mdx
@@ -53,7 +53,7 @@ On each OpenTelemetry-instrumented application, set the resource attributes `dev
 
 ## Configuring the pipeline
 
-Finally, add a `datadog` exporter pipeline to your `otel-collector-configuration.yml` file. This shows a `traces` pipeline:
+Finally, add a `datadog` exporter pipeline to your `otel-collector-configuration.yml` file. This shows a `traces` pipeline. Also, refer to [Setting up the OpenTelemetry Collector with the Datadog Exporter](https://docs.datadoghq.com/opentelemetry/otel_collector_datadog_exporter/?tab=onahost#setting-up-the-opentelemetry-collector-with-the-datadog-exporter) .
 
 ```yaml lineNumbers=true
 service:
diff --git a/src/docs/setup/ecs/config-through-ssm.mdx b/src/docs/setup/ecs/config-through-ssm.mdx
@@ -19,7 +19,7 @@ and use it with AWS Distro for OpenTelemetry Collector.
 <SectionSeparator />
 
 The AWS Distro for OpenTelemetry Collector can optionally be configured via an environment variable AOT_CONFIG_CONTENT. The value of this
-variable is expected to be a full Collector configuration file; it will override the config file used in the Collector 
+variable is expected to be a full Collector configuration file; it will override the config file used in the Collector
 entrypoint command. In ECS, the values of environment variables can be set from AWS Systems Manager Parameters.
 
 
@@ -28,14 +28,14 @@ entrypoint command. In ECS, the values of environment variables can be set from
 
 **1.1. Select Task Defintion**
 
-Go to AWS Management Console and select Elastic Container Service. From the left side navigation, select [Task 
-definition](https://us-west-2.console.aws.amazon.com/ecs/home?region=us-west-2#/taskDefinitions). Select the 
+Go to AWS Management Console and select Elastic Container Service. From the left side navigation, select [Task
+definition](https://us-west-2.console.aws.amazon.com/ecs/home?region=us-west-2#/taskDefinitions). Select the
 TaskDefinition we created to run AWS Distro for OpenTelemetry Collector and click the `Create new revision` button on top.
 
 **1.2. Add Environment Variable**
 
 From the container definition section, click the **AWS Distro for OpenTelemetry Collector** container (image: `amazon/aws-otel-collector`) and go
-to the **Environment variables** section. Add a new environment variable- **AOT_CONFIG_CONTENT**. Select ValueFrom 
+to the **Environment variables** section. Add a new environment variable- **AOT_CONFIG_CONTENT**. Select ValueFrom
 which will tell ECS to get the value from SSM Parameter, and set **otel-collector-config** (SSM parameter name which
 we will create in the next section) as the value. Finish updating the task definition and create a new revision.
 
@@ -49,24 +49,26 @@ we will create in the next section) as the value. Finish updating the task defin
 
 **2.1. Go to Parameter Store**
 
-Let’s go to **System Manager** service from AWS Management Console and select 
-[Parameter Store](https://us-west-2.console.aws.amazon.com/systems-manager/home?region=us-west-2) from the left 
+Let’s go to **System Manager** service from AWS Management Console and select
+[Parameter Store](https://us-west-2.console.aws.amazon.com/systems-manager/home?region=us-west-2) from the left
 side navigation panel.
 
 <img src={ssm_01} alt="Diagram" style="margin: 10px 0;" />
 <div style="height: 40px" />
 
 **2.2. Create New Parameter**
 
-From the top-right corner, click the **Create new parameter** button. Create a new parameter with the following 
-information. The parameter name should be the same as we used in the environment variable of our task-definition. 
+From the top-right corner, click the **Create new parameter** button. Create a new parameter with the following
+information. The parameter name should be the same as we used in the environment variable of our task-definition.
 
 - **Name:** otel-collector-config
 - **Tier:** Standard
 - **Type:** String
 - **Data type:** Text
 - **Value:** Copy and paste your custom OpenTelemetry configuration file.
 
+**NOTE** The collector configuration should not be used to store credentials in plain text. Instead, replacement instructions such as ${env:API_KEY}
+should be used to load values from an environment variable. These values can be populated either through a secrets manager (or) SSM parameter store on ECS (or) through Kubernetes secrets on EKS
 
 <SectionSeparator />
 
diff --git a/src/pages/404.js b/src/pages/404.js
@@ -10,7 +10,7 @@ export default function NotFound() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <Layout title="Page not found!">
         <SEO title="404: Not found" />
diff --git a/src/pages/about.js b/src/pages/about.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <AboutPage />
     </div>
diff --git a/src/pages/announcements.js b/src/pages/announcements.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
       <div>
         <Helmet>
           <meta charSet="utf-8" />
-          <title>AWS Open Distro for OpenTelemetry</title>
+          <title>AWS Distro for OpenTelemetry</title>
         </Helmet>
         <AnnouncementsPage />
       </div>
diff --git a/src/pages/blog.js b/src/pages/blog.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <BlogPage />
     </div>
diff --git a/src/pages/code-of-conduct.js b/src/pages/code-of-conduct.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <CodeOfConductPage />
     </div>
diff --git a/src/pages/coming-soon.js b/src/pages/coming-soon.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <ComingSoonPage />
     </div>
diff --git a/src/pages/contributing.js b/src/pages/contributing.js
@@ -10,7 +10,7 @@ export default function ComingSoon() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <ContributingPage />
     </div>
diff --git a/src/pages/contributors.js b/src/pages/contributors.js
@@ -10,7 +10,7 @@ export default function Contributors() {
     <div>
       <Helmet>
         <meta charSet="utf-8" />
-        <title>AWS Open Distro for OpenTelemetry</title>
+        <title>AWS Distro for OpenTelemetry</title>
       </Helmet>
       <ContributorsPage />
     </div>
diff --git a/src/pages/download.js b/src/pages/download.js
diff --git a/src/pages/get-involved.js b/src/pages/get-involved.js
diff --git a/src/pages/index.js b/src/pages/index.js
diff --git a/src/pages/resources.js b/src/pages/resources.js
diff --git a/src/pages/search.js b/src/pages/search.js
diff --git a/src/pages/videos.js b/src/pages/videos.js
