diff --git a/examples/powertools-examples-batch/deploy/sqs/template.yml b/examples/powertools-examples-batch/deploy/sqs/template.yml index 2f1d6c363..1232e4d51 100644 --- a/examples/powertools-examples-batch/deploy/sqs/template.yml +++ b/examples/powertools-examples-batch/deploy/sqs/template.yml @@ -65,6 +65,7 @@ Resources: DemoSQSSenderFunction: Type: AWS::Serverless::Function Properties: + Tracing: Active CodeUri: ../.. Handler: org.demo.batch.sqs.SqsBatchSender::handleRequest Environment: @@ -173,7 +174,6 @@ Resources: Action: - s3:PutObject Resource: !Sub ${Bucket.Arn}/* - Events: MySQSEvent: Type: SQS diff --git a/examples/powertools-examples-batch/src/main/java/org/demo/batch/sqs/AbstractSqsBatchHandler.java b/examples/powertools-examples-batch/src/main/java/org/demo/batch/sqs/AbstractSqsBatchHandler.java index ee33b50fd..1b3029d40 100644 --- a/examples/powertools-examples-batch/src/main/java/org/demo/batch/sqs/AbstractSqsBatchHandler.java +++ b/examples/powertools-examples-batch/src/main/java/org/demo/batch/sqs/AbstractSqsBatchHandler.java @@ -14,21 +14,22 @@ package org.demo.batch.sqs; -import com.amazonaws.services.lambda.runtime.Context; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.Random; + import org.demo.batch.model.Product; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; + +import com.fasterxml.jackson.databind.ObjectMapper; + import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.PutObjectRequest; -import software.amazon.lambda.powertools.logging.Logging; import software.amazon.lambda.powertools.tracing.Tracing; import software.amazon.lambda.powertools.tracing.TracingUtils; @@ -43,7 +44,6 @@ public class AbstractSqsBatchHandler { * Simulate some processing (I/O + S3 put request) * @param p deserialized product */ - @Logging @Tracing protected void processMessage(Product p) { TracingUtils.putAnnotation("productId", p.getId()); @@ -51,15 +51,16 @@ protected void processMessage(Product p) { MDC.put("product", String.valueOf(p.getId())); LOGGER.info("Processing product {}", p); - char c = (char)(r.nextInt(26) + 'a'); + char c = (char) (r.nextInt(26) + 'a'); char[] chars = new char[1024 * 1000]; Arrays.fill(chars, c); p.setName(new String(chars)); try { - File file = new File("/tmp/"+p.getId()+".json"); + File file = new File("/tmp/" + p.getId() + ".json"); mapper.writeValue(file, p); s3.putObject( - PutObjectRequest.builder().bucket(bucket).key(p.getId()+".json").build(), RequestBody.fromFile(file)); + PutObjectRequest.builder().bucket(bucket).key(p.getId() + ".json").build(), + RequestBody.fromFile(file)); } catch (IOException e) { throw new RuntimeException(e); } finally {