runtime java17 in script

aws-observability · May 10, 2024 · a06ccfe · a06ccfe
1 parent 76969ce
commit a06ccfe
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/main-build-java.yml b/.github/workflows/main-build-java.yml
@@ -62,26 +62,32 @@ jobs:
             instrumentation-type: agent-confmap
             architecture: amd64
             confmap: s3
+            runtime: java11
           - sample-app: aws-sdk
             instrumentation-type: agent-confmap
             architecture: arm64
             confmap: s3
+            runtime: java11
           - sample-app: aws-sdk
             instrumentation-type: agent-confmap
             architecture: amd64
             confmap: http
+            runtime: java11
           - sample-app: aws-sdk
             instrumentation-type: agent-confmap
             architecture: arm64
             confmap: http
+            runtime: java11
           - sample-app: aws-sdk
             instrumentation-type: agent-confmap
             architecture: amd64
             confmap: https
+            runtime: java11
           - sample-app: aws-sdk
             instrumentation-type: agent-confmap
             architecture: arm64
             confmap: https
+            runtime: java11
 
     steps:
       - uses: actions/checkout@v4
@@ -114,7 +120,7 @@ jobs:
       - name: Generate UUID
         id: generate-uuid
         run: |
-          UUID=$(uuidgen)
+          UUID=$(uuidgen | cut -c1-4)
           echo "uuid=$UUID" >> $GITHUB_OUTPUT
       - name: Patch ADOT
         run: ./patch-upstream.sh

diff --git a/.github/workflows/main-build-python.yml b/.github/workflows/main-build-python.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Generate UUID
         id: generate-uuid
         run: |
-          UUID=$(uuidgen)
+          UUID=$(uuidgen | cut -c1-4)
           echo "uuid=$UUID" >> $GITHUB_OUTPUT
       - name: Patch ADOT
         run: ./patch-upstream.sh

diff --git a/java/integration-tests/aws-sdk/agent-confmap/main.tf b/java/integration-tests/aws-sdk/agent-confmap/main.tf
@@ -7,7 +7,7 @@ locals {
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
   filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
   source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip")
 }
@@ -124,6 +124,6 @@ resource "aws_lambda_layer_version" "collector_config_layer" {
   depends_on          = [data.archive_file.init]
   layer_name          = "custom-config-layer"
   filename            = "${path.module}/build/custom-config-layer.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
 }
diff --git a/java/integration-tests/aws-sdk/agent/main.tf b/java/integration-tests/aws-sdk/agent/main.tf
@@ -5,7 +5,7 @@ locals {
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
   filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
   source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip")
 }
@@ -103,6 +103,6 @@ resource "aws_lambda_layer_version" "collector_config_layer" {
   depends_on          = [data.archive_file.init]
   layer_name          = "custom-config-layer"
   filename            = "${path.module}/build/custom-config-layer.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
 }
diff --git a/java/integration-tests/aws-sdk/wrapper/main.tf b/java/integration-tests/aws-sdk/wrapper/main.tf
@@ -5,7 +5,7 @@ locals {
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
   filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
   source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
 }

diff --git a/java/integration-tests/okhttp/wrapper/main.tf b/java/integration-tests/okhttp/wrapper/main.tf
@@ -5,7 +5,7 @@ locals {
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
   filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
   source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
 }

diff --git a/java/sample-apps/aws-sdk/deploy/agent/main.tf b/java/sample-apps/aws-sdk/deploy/agent/main.tf
@@ -80,6 +80,6 @@ resource "aws_lambda_layer_version" "collector_config_layer" {
   depends_on          = [data.archive_file.init]
   layer_name          = "custom-config-layer"
   filename            = "${path.module}/build/custom-config-layer.zip"
-  compatible_runtimes = ["java8", "java8.al2", "java11"]
+  compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
 }