From 2a63850970d172a6d446fb21ec291900130a165e Mon Sep 17 00:00:00 2001
From: Pankaj Agrawal <pankaagr@amazon.com>
Date: Thu, 19 Aug 2021 15:45:05 +0200
Subject: [PATCH] fix: reset cold start only when placed on handler

---
 .../powertools/tracing/internal/LambdaTracingAspect.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java
index c2907c277..a9c7a3965 100644
--- a/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java
+++ b/powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java
@@ -61,7 +61,10 @@ public Object around(ProceedingJoinPoint pjp,
                 segment.putMetadata(namespace(tracing), pjp.getSignature().getName() + " response", methodReturn);
             }
 
-            coldStartDone();
+            if (placedOnHandlerMethod(pjp)) {
+                coldStartDone();
+            }
+
             return methodReturn;
         } catch (Exception e) {
             if (captureError) {