From 2284b56f0120d2f3fa19ea610a55e74e25f8508e Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Thu, 19 Dec 2024 15:04:22 -0800 Subject: [PATCH 1/3] Change back to use java 17 base image. --- scripts/docker/corretto-slim/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/corretto-slim/Dockerfile b/scripts/docker/corretto-slim/Dockerfile index 1d3de1cd63..b9c97e3781 100644 --- a/scripts/docker/corretto-slim/Dockerfile +++ b/scripts/docker/corretto-slim/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/amazoncorretto:23-alpine-jdk +FROM public.ecr.aws/docker/library/amazoncorretto:17-alpine-jdk # Copied from https://github.com/corretto/corretto-docker/blob/master/11/jre/alpine/Dockerfile RUN apk update && apk add binutils && jlink --endian little --release-info $JAVA_HOME/release \ From d1ca85e36aa8f4f743dd38784cc75bc15e70e7de Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Thu, 19 Dec 2024 15:29:31 -0800 Subject: [PATCH 2/3] Migrate logging exporter. --- .github/collector/collector-config.yml | 8 ++++---- .github/workflows/e2e-tests-app-with-java-agent.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/collector/collector-config.yml b/.github/collector/collector-config.yml index 13ac39a41d..83147d1445 100644 --- a/.github/collector/collector-config.yml +++ b/.github/collector/collector-config.yml @@ -5,8 +5,8 @@ receivers: endpoint: 0.0.0.0:4317 exporters: - logging: - loglevel: info + debug: + verbosity: normal awsxray: region: us-west-2 awsemf: @@ -21,11 +21,11 @@ service: receivers: - otlp exporters: - - logging + - debug - awsxray metrics: receivers: - otlp exporters: - - logging + - debug - awsemf diff --git a/.github/workflows/e2e-tests-app-with-java-agent.yml b/.github/workflows/e2e-tests-app-with-java-agent.yml index b2c4d744bf..3a22f9f184 100644 --- a/.github/workflows/e2e-tests-app-with-java-agent.yml +++ b/.github/workflows/e2e-tests-app-with-java-agent.yml @@ -83,7 +83,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 23 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -114,7 +114,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 23 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -145,7 +145,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 23 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 From 05929c91c009e051816545501a0dad2efecf081f Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Thu, 19 Dec 2024 15:33:22 -0800 Subject: [PATCH 3/3] Use Java 17 for build. --- .github/workflows/e2e-tests-app-with-java-agent.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-tests-app-with-java-agent.yml b/.github/workflows/e2e-tests-app-with-java-agent.yml index 3a22f9f184..b2c4d744bf 100644 --- a/.github/workflows/e2e-tests-app-with-java-agent.yml +++ b/.github/workflows/e2e-tests-app-with-java-agent.yml @@ -83,7 +83,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 23 + java-version: 17 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -114,7 +114,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 23 + java-version: 17 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -145,7 +145,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 23 + java-version: 17 distribution: 'temurin' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4