Merge branch 'aws-otel:main' into main

Author: mhausenblas

.github/CODEOWNERS

@@ -1,3 +1,15 @@
 # https://help.github.com/articles/about-codeowners/
 
-* @alolita @anuraaga @mxiamxia
+* @aws-otel/webteam
+
+src/docs/getting-started/collector                         @aws-otel/webteam
+src/docs/getting-started/container-insights                @aws-otel/webteam @vijayansarathy
+src/docs/getting-started/dotnet-sdk                        @aws-otel/webteam @willarmiros @NathanielRN
+src/docs/getting-started/ecs-configurations                @aws-otel/webteam @vasireddy99 @anuraaga
+src/docs/getting-started/go-sdk                            @aws-otel/webteam @Aneurysm9 @bryan-aguilar
+src/docs/getting-started/java-sdk                          @aws-otel/webteam @anuraaga
+src/docs/getting-started/js-sdk                            @aws-otel/webteam @willarmiros
+src/docs/getting-started/lambda                            @aws-otel/webteam @NathanielRN @vasireddy99 @willarmiros @wangzlei
+src/docs/getting-started/prometheus-remote-write-exporter  @aws-otel/webteam @Aneurysm9 @erichsueh3
+src/docs/getting-started/python-sdk                        @aws-otel/webteam @NathanielRN
+src/docs/getting-started/ruby-sdk                          @aws-otel/webteam @anuraaga @NathanielRN

.github/dependabot.yml

@@ -0,0 +1,30 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: '/'
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    labels:
+      - "npm dependencies"
+    rebase-strategy: "auto"
+  - package-ecosystem: "github-actions"
+    directory: '/'
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    labels:
+      - "actions"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,48 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+name: CodeQL Analysis
+
+on:
+  push:
+    branches: [ main ]
+
+concurrency:
+  group: codeql-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/main.yml

@@ -1,19 +1,72 @@
 name: Gatsby Publish
 
+env:
+  DELTA_THRESHOLD: .90
+
 on:
   push:
     branches:
       - main
+    
 
 jobs:
-  build:
+  publish-smoke-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3.1.0
       - uses: enriikke/gatsby-gh-pages-action@v2
         env:
           GH_API_KEY: ${{ secrets.GITHUB_TOKEN }}
         with:
           access-token: ${{ secrets.demo }}
-          deploy-branch: gh-pages
-#          gatsby-args: --prefix-paths
+          deploy-branch: smoke-test
+  verify-smoke-test:
+    runs-on: ubuntu-latest
+    needs: publish-smoke-test
+    steps:
+      - name: Checkout Smoke Test Branch
+        uses: actions/[email protected]
+        with:
+          path: smoke-test
+          ref: smoke-test
+      - name: Calculate total lines in smoke-test branch
+        run: |
+          export ST_LC=$(find ./smoke-test -type f -print0 | wc -l --files0=- | tail -n 1 | cut -d ' ' -f 1)
+          echo $ST_LC
+          echo "SMOKE_TEST_LINE_COUNT=$ST_LC" >> $GITHUB_ENV
+      - name: Checkout Published Branch
+        uses: actions/[email protected]
+        with:
+          path: published
+          ref: gh-pages
+      - name: Calculate total lines in published branch
+        run: |
+          export PUB_LC=$(find ./published -type f -print0 | wc -l --files0=- | tail -n 1 | cut -d ' ' -f 1)
+          echo $PUB_LC
+          echo "PUBLISHED_LINE_COUNT=$PUB_LC" >> $GITHUB_ENV
+      - name: Generate percentile diff
+        run: |
+          export PERCENTILE_DIFF=$(bc<<<"scale=2;${{ env.SMOKE_TEST_LINE_COUNT}} / ${{ env.PUBLISHED_LINE_COUNT }}")
+          echo $PERCENTILE_DIFF
+          if [ 1 -eq $(bc<<<"$PERCENTILE_DIFF < ${{ env.DELTA_THRESHOLD }}") ]; then
+            exit 1
+          else
+            exit 0
+          fi
+
+  publish-live:
+    needs: verify-smoke-test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          ref: gh-pages
+      - name: merge commit push
+        env:
+          GITHUB_TOKEN: ${{ secrets.demo }}
+        run: |
+          git config --global user.name 'Gatsby Publish Workflow'
+          git config --global user.email '[email protected]'
+          git fetch --all
+          git reset --hard origin/smoke-test
+          git push -f origin gh-pages

.github/workflows/pr.yml

@@ -16,16 +16,16 @@ jobs:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3.1.0
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '16'
           check-latest: true
       - name: Get npm cache directory
         id: npm-cache-dir
         run: |
           echo "::set-output name=dir::$(npm config get cache)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -38,7 +38,7 @@ jobs:
           GH_API_KEY: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload site as actions artifact
         if: ${{ runner.os == 'Linux' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: site
           path: public

.idea/FINAL_SITE.iml

@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
 ## Contributing via Pull Requests
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-1. You are working against the latest source on the *master* branch.
+1. You are working against the latest source on the *main* branch.
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 

CONTRIBUTING.md

@@ -8,23 +8,41 @@
 ## Development Setup
 
 1. Clone this repository onto your local machine
-2. [Download and Set up Gatsby Environment](https://www.gatsbyjs.com/tutorial/part-zero/) Note: When using Gatsby, you will need downgrade your version of Node to 14 prior to installation of gatsby-cli. You can do this via `nvm use 14`.
+2. [Download and Set up Gatsby Environment](https://www.gatsbyjs.com/tutorial/part-zero/).
 3. Open up the project using your preferred code editor
 4. Install the required node modules for this project.
     ```
     npm install
     ```
-5. [Generate a GitHub Personal Access Token](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token)
-6. Create a new file in the root called `.env.development` (See [Project Structure](#project-structure) for more information)
-7. In the `.env.development` file, add the following line:
+5. Disable GitHub API access (Used to fetch the list of contributors)
+   Create a new file in the root called `.env.development` (See [Project Structure](#project-structure) for more information)
+   Write the following line to it:
+   ```
+   NO_GH_API_KEY=true
+   ```
+4. Start up the Gatsby site
+    ```
+    npm start
+    ```
+5. Open http://localhost:8000 to check the site
+
+**Obs**: The `NO_GH_API_KEY` environment variable can also be passed through command line. E.g.: `NO_GH_API_KEY=true npm run start`.
+
+### Optional - Test the GitHub API integration
+
+This step is optional and allows you to test that the list of contributors is being fetched from GitHub.
+
+1. [Generate a GitHub Personal Access Token](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token)
+2. Create a new file in the root called `.env.development` (See [Project Structure](#project-structure) for more information)
+3. In the `.env.development` file, add the following line:
    ```
    GH_API_KEY=<INSERT YOUR ACCESS TOKEN>
    ```
-8. Start up the Gatsby site
+4. Start up the Gatsby site
     ```
     npm start
     ```
-9. Open http://localhost:8000 to check the site
+5. Open http://localhost:8000 to check the site
 
 ## Making Changes to the Site
 
@@ -80,6 +98,6 @@
 | `/src/assets`       | Contains images and styling for the site                                                                      |
 | `/src/components`   | Contains the React Components used throughout the site                                                        |
 | `/src/config`       | Defines routing for technical documentation pages and side navigation bar                                     |
-| `/src/content`      | Holds the site's static content using YAML format                                                             |
+| `/src/content`      | Holds the site's static content using YAML format and blog pages under `/blogs` using mdx markdown            |
 | `/src/docs`         | Holds the technical documentation pages content using MDX markdown                                            |
 | `/src/pages`        | Files for each site page                                                                                      |

DEV_GUIDE.md

@@ -32,5 +32,4 @@ This code is licensed under the Apache 2.0 License.
 * [Filing an Issue](https://github.com/aws-observability/aws-otel-community/issues)
 * [Reporting a Bug](https://github.com/aws-observability/aws-otel-community/issues)
 * [Creating a new Pull Request](https://github.com/aws-otel/aws-otel.github.io/compare)
-* [AWS Distro for OpenTelemetry Project Repos](https://github.com/aws-observability)
-* [Join the Gitter Channel](https://gitter.im/aws-otel-distro/community)
+* [AWS Distro for OpenTelemetry Project Repos](https://github.com/aws-observability)

README.md

@@ -0,0 +1,7 @@
+## Release Notes
+
+### 2021-12-14 update
+
+1. Upgraded the Nodejs version to 16.
+2. Upgraded Gatsby to v3.
+3. Updated the image names to be prefixed with adot.