Merge branch 'main' into configureAwsInstrumentation

.github/workflows/release-layer-ruby.yml

@@ -18,38 +18,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2.0'
-
-      - name: Install SAM
-        run: |
-          sudo apt-get update && sudo apt-get install wget unzip make -y
-          wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip
-          unzip aws-sam-cli-linux-x86_64.zip -d sam-installation
-          sudo ./sam-installation/install --update
-
       - name: Build
         id: save-ruby-sdk-version
         run: |
-          sam build -u -t template.yml
-          export GEM_PATH=$PWD/.aws-sam/build/OTelLayer/ruby/gems/3.2.0/
-          RUBY_SDK_VERSION=$(ruby -e 'require "opentelemetry-sdk"; puts OpenTelemetry::SDK::VERSION')
-          echo "RUBY_SDK_VERSION=$RUBY_SDK_VERSION" >> $GITHUB_OUTPUT
+          ./build.sh
+        shell: bash
         working-directory: ruby/src
 
-      - name: Zip the layer file
+      - name: Show directory contents
         run: |
-          echo ${{ steps.save-ruby-sdk-version.outputs.RUBY_SDK_VERSION}}
-          ./zip_ruby_layer.sh
-        working-directory: ruby/src
-        shell: bash
+          ls -al
+        working-directory: ruby/src/build
 
       - uses: actions/upload-artifact@v4
         name: Save assembled layer to build
         with:
           name: opentelemetry-ruby-layer.zip
-          path: ruby/src/opentelemetry-ruby-layer.zip
+          path: ruby/src/build/opentelemetry-ruby-layer.zip
 
   publish-layer:
     uses: ./.github/workflows/layer-publish.yml
@@ -77,7 +62,7 @@ jobs:
       artifact-name: opentelemetry-ruby-layer.zip
       layer-name: opentelemetry-ruby
       component-version: ${{needs.build-layer.outputs.RUBY_SDK_VERSION}}
-      runtimes: ruby3.2
-      release-group: prod
+      runtimes: ruby3.2 ruby3.3
+      release-group: dev
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit

README.md

@@ -4,7 +4,7 @@
 ![GitHub Collector Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-collector.yml?branch%3Amain&label=CI%20%28Collector%29&style=for-the-badge)
 ![GitHub NodeJS Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-nodejs.yml?branch%3Amain&label=CI%20%28NodeJS%29&style=for-the-badge)
 ![GitHub Terraform Lint Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-terraform.yml?branch%3Amain&label=CI%20%28Terraform%20Lint%29&style=for-the-badge)
-![GitHub Python Pull Request Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/pr-python.yml?branch%3Amain&label=Pull%20Request%20%28Python%29&style=for-the-badge)
+![GitHub Python Pull Request Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-python.yml?branch%3Amain&label=Pull%20Request%20%28Python%29&style=for-the-badge)
 
 ## OpenTelemetry Lambda Layers
 
@@ -26,7 +26,7 @@ Some layers include the corresponding OTel language SDK for the Lambda. This all
 * **What exporters/receivers/processors are included from the OpenTelemetry Collector?**
     > You can check out [the stripped-down collector's imports](https://github.com/open-telemetry/opentelemetry-lambda/blob/main/collector/lambdacomponents/default.go#L18) in this repository for a full list of currently included components.
 * **Is the Lambda layer provided or do I need to build it and distribute it myself?**
-    > This repository does not provide pre-build Lambda layers. They must be built manually and saved in your AWS account. This repo has files to facilitate doing that. More information is provided in [the Collector folder's README](collector/README.md).
+    > This repository provides pre-built Lambda layers, their ARNs are available in the [Releases](https://github.com/open-telemetry/opentelemetry-lambda/releases). You can also build the layers manually and publish them in your AWS account. This repo has files to facilitate doing that. More information is provided in [the Collector folder's README](collector/README.md).
 
 ## Design Proposal
 

RELEASE.md

@@ -4,4 +4,11 @@ The release process is almost entirely managed by [GitHub actions](https://githu
 
 1. Create a new tag for the layer to publish. For example, to create a new collector layer, the following command is used:
         `git tag layer-collector/0.0.8`
-2. Push the tag to [opentelemetry-lambda](https://github.com/open-telemetry/opentelemetry-lambda) repository to trigger the publish action.
+2. Push the tag to [opentelemetry-lambda](https://github.com/open-telemetry/opentelemetry-lambda) repository to trigger the publish action:
+        `git push origin tag layer-collector/0.0.8`
+3. Wait for the [release workflow](https://github.com/open-telemetry/opentelemetry-lambda/actions/workflows/release-layer-collector.yml) to finish.
+4. Create a release in https://github.com/open-telemetry/opentelemetry-lambda/releases/new
+    * Select a the newly pushed tag
+    * Select the corresponding previous release
+    * Click "Generate Release Notes"
+    * Adjust the release notes. Include the ARN, list of changes and diff with previous label.