diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 9c4c68e..4ea0bd5 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -41,7 +41,7 @@ jobs: if: env.LANGUAGE == 'java' with: distribution: adopt - java-version: '11' + java-version: '17' - name: Cache (Java) if: env.LANGUAGE == 'java' uses: actions/cache@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d7ee6..a416f3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. +## [java-v2.20.1] + +### Released 2025-10-13 + +### Changed + +- Update collector and instrumentation to latest upstream version + +[java-v2.20.1]: https://github.com/SumoLogic/sumologic-otel-lambda/releases/tag/java-v2.20.1 + ## [nodejs-v2.0.0] ### Released 2025-09-02 diff --git a/java/README.md b/java/README.md index 42a79d2..3fe04f1 100644 --- a/java/README.md +++ b/java/README.md @@ -11,48 +11,48 @@ Sumo Logic lambda layers support: | Region | ARN | |----------------|----------------------------------------------------------------------------------------------| -| af-south-1 | arn:aws:lambda:af-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-east-1 | arn:aws:lambda:ap-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-northeast-1 | arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-northeast-2 | arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-northeast-3 | arn:aws:lambda:ap-northeast-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-south-1 | arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-southeast-1 | arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ap-southeast-2 | arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| ca-central-1 | arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-central-1 | arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-north-1 | arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-south-1 | arn:aws:lambda:eu-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-west-1 | arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-west-2 | arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| eu-west-3 | arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| me-south-1 | arn:aws:lambda:me-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| sa-east-1 | arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| us-east-1 | arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| us-east-2 | arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| us-west-1 | arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | -| us-west-2 | arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1 | +| af-south-1 | arn:aws:lambda:af-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-east-1 | arn:aws:lambda:ap-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-northeast-1 | arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-northeast-2 | arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-northeast-3 | arn:aws:lambda:ap-northeast-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-south-1 | arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-southeast-1 | arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ap-southeast-2 | arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| ca-central-1 | arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-central-1 | arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-north-1 | arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-south-1 | arn:aws:lambda:eu-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-west-1 | arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-west-2 | arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| eu-west-3 | arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| me-south-1 | arn:aws:lambda:me-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| sa-east-1 | arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| us-east-1 | arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| us-east-2 | arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| us-west-1 | arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | +| us-west-2 | arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1 | ## ARM64 Lambda Layers List | Region | ARN | |----------------|---------------------------------------------------------------------------------------------| -| ap-northeast-1 | arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| ap-northeast-3 | arn:aws:lambda:ap-northeast-3:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| ap-south-1 | arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| ap-southeast-1 | arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| ap-southeast-2 | arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| eu-central-1 | arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| eu-west-1 | arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| eu-west-2 | arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| us-east-1 | arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| us-east-2 | arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | -| us-west-2 | arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-15-0:1 | +| ap-northeast-1 | arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| ap-northeast-3 | arn:aws:lambda:ap-northeast-3:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| ap-south-1 | arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| ap-southeast-1 | arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| ap-southeast-2 | arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| eu-central-1 | arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| eu-west-1 | arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| eu-west-2 | arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| us-east-1 | arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| us-east-2 | arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | +| us-west-2 | arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-arm64-v2-20-1:1 | ## Lambda Container dependencies -- [amd64 containers](https://github.com/SumoLogic/sumologic-otel-lambda/releases/download/java-v2.15.0/opentelemetry-java-wrapper-amd64.zip) -- [arm64 containers](https://github.com/SumoLogic/sumologic-otel-lambda/releases/download/java-v2.15.0/opentelemetry-java-wrapper-arm64.zip) +- [amd64 containers](https://github.com/SumoLogic/sumologic-otel-lambda/releases/download/java-v2.20.1/opentelemetry-java-wrapper-amd64.zip) +- [arm64 containers](https://github.com/SumoLogic/sumologic-otel-lambda/releases/download/java-v2.20.1/opentelemetry-java-wrapper-arm64.zip) ## Sample applications diff --git a/java/layer-data.sh b/java/layer-data.sh index 5800459..efa8c28 100755 --- a/java/layer-data.sh +++ b/java/layer-data.sh @@ -6,4 +6,4 @@ ARCHITECTURE_ARM=arm64 RUNTIMES='java8.al2 java11 java17 java21' DESCRIPTION='Sumo Logic OTEL Collector and Java Lambda Layer https://github.com/SumoLogic/sumologic-otel-lambda/tree/release-java-2.15.0/java' LICENSE=Apache-2.0 -VERSION=v2-15-0 +VERSION=v2-20-1 diff --git a/java/sample-apps/template.yaml b/java/sample-apps/template.yaml index 8b12a02..6496719 100644 --- a/java/sample-apps/template.yaml +++ b/java/sample-apps/template.yaml @@ -16,7 +16,7 @@ Resources: Type: AWS::Serverless::Function Properties: Handler: io.opentelemetry.lambda.sampleapps.awssdk.AwsSdkRequestHandler::handleRequest - Runtime: java11 + Runtime: java17 CodeUri: ./java-sample-app.jar Description: Java sample application MemorySize: 512 @@ -49,34 +49,34 @@ Outputs: Mappings: RegionMap: ap-northeast-1: - layer: "arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" ap-northeast-2: - layer: "arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" ap-south-1: - layer: "arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" ap-southeast-1: - layer: "arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" ap-southeast-2: - layer: "arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" ca-central-1: - layer: "arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" eu-central-1: - layer: "arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" eu-north-1: - layer: "arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" eu-west-1: - layer: "arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" eu-west-2: - layer: "arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" eu-west-3: - layer: "arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" sa-east-1: - layer: "arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" us-east-1: - layer: "arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" us-east-2: - layer: "arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" us-west-1: - layer: "arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" us-west-2: - layer: "arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-15-0:1" + layer: "arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-1:1" diff --git a/java/tests/deploy/main.tf b/java/tests/deploy/main.tf index f38525b..8fa723d 100644 --- a/java/tests/deploy/main.tf +++ b/java/tests/deploy/main.tf @@ -12,7 +12,7 @@ module "java-hello-lambda-function" { architectures = compact([var.architecture]) function_name = "${var.name}-${replace(var.architecture, "_", "-")}-${local.timestamp_sanitized}" handler = "io.opentelemetry.lambda.sampleapps.awssdk.AwsSdkRequestHandler::handleRequest" - runtime = "java11" + runtime = "java17" create_package = false local_existing_package = var.function_package diff --git a/opentelemetry-lambda b/opentelemetry-lambda index 1fca858..045fb76 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit 1fca858d13e01fac64a0e682404f17b774cdebf4 +Subproject commit 045fb76da07c9427231e2319ce17f20e1dad2a99