chore(tracing): fix static code warnings

Author: pankajagrawal16

powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspectTest.java

@@ -86,7 +86,11 @@ void tearDown() {
     @Test
     void shouldCaptureNonHandlerMethod() {
         nonHandlerMethod.doSomething();
-        assertThat(AWSXRay.getTraceEntity().getSubsegments())
+
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
+        assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .anySatisfy(segment ->
                         assertThat(segment.getName()).isEqualTo("## doSomething"));
@@ -95,7 +99,11 @@ void shouldCaptureNonHandlerMethod() {
     @Test
     void shouldCaptureNonHandlerMethodWithCustomSegmentName() {
         nonHandlerMethod.doSomethingCustomName();
-        assertThat(AWSXRay.getTraceEntity().getSubsegments())
+
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
+        assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .anySatisfy(segment ->
                         assertThat(segment.getName()).isEqualTo("custom"));
@@ -105,6 +113,9 @@ void shouldCaptureNonHandlerMethodWithCustomSegmentName() {
     void shouldCaptureTraces() {
         requestHandler.handleRequest(new Object(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -125,6 +136,9 @@ void shouldCaptureTracesWithExceptionMetaData() {
 
         Throwable exception = catchThrowable(() -> requestHandler.handleRequest(new Object(), context));
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -147,6 +161,9 @@ void shouldCaptureTracesWithExceptionMetaData() {
     void shouldCaptureTracesForStream() throws IOException {
         streamHandler.handleRequest(new ByteArrayInputStream("test".getBytes()), new ByteArrayOutputStream(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -166,6 +183,9 @@ void shouldNotCaptureTracesNotEnabled() throws IOException {
         requestHandler = new PowerToolDisabled();
         requestHandler.handleRequest(new Object(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .isEmpty();
 
@@ -182,6 +202,9 @@ void shouldCaptureTracesWithNoMetadata() {
 
         requestHandler.handleRequest(new Object(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -201,6 +224,9 @@ void shouldCaptureTracesForStreamWithNoMetadata() throws IOException {
 
         streamHandler.handleRequest(new ByteArrayInputStream("test".getBytes()), new ByteArrayOutputStream(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -220,6 +246,9 @@ void shouldCaptureTracesWithNoMetadataDeprecated() {
 
         requestHandler.handleRequest(new Object(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -241,6 +270,9 @@ void shouldNotCaptureTracesIfDisabledViaEnvironmentVariable() {
 
             requestHandler.handleRequest(new Object(), context);
 
+            assertThat(AWSXRay.getTraceEntity())
+                    .isNotNull();
+
             assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                     .hasSize(1)
                     .allSatisfy(subsegment -> {
@@ -263,6 +295,9 @@ void shouldCaptureTracesIfExplicitlyEnabledAndEnvironmentVariableIsDisabled() {
 
             requestHandler.handleRequest(new Object(), context);
 
+            assertThat(AWSXRay.getTraceEntity())
+                    .isNotNull();
+
             assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                     .hasSize(1)
                     .allSatisfy(subsegment -> {
@@ -284,6 +319,9 @@ void shouldCaptureTracesForSelfReferencingReturnTypesViaCustomMapper() {
 
         requestHandler.handleRequest(new Object(), context);
 
+        assertThat(AWSXRay.getTraceEntity())
+                .isNotNull();
+
         assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                 .hasSize(1)
                 .allSatisfy(subsegment -> {
@@ -311,6 +349,9 @@ void shouldCaptureTracesIfExplicitlyEnabledBothAndEnvironmentVariableIsDisabled(
 
             requestHandler.handleRequest(new Object(), context);
 
+            assertThat(AWSXRay.getTraceEntity())
+                    .isNotNull();
+
             assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                     .hasSize(1)
                     .allSatisfy(subsegment -> {
@@ -333,7 +374,13 @@ void shouldNotCaptureTracesWithExceptionMetaDataIfDisabledViaEnvironmentVariable
             mocked.when(() -> SystemWrapper.getenv("POWERTOOLS_TRACER_CAPTURE_ERROR")).thenReturn("false");
             requestHandler = new PowerTracerToolEnabledWithException();
 
-            catchThrowable(() -> requestHandler.handleRequest(new Object(), context));
+            Throwable throwable = catchThrowable(() -> requestHandler.handleRequest(new Object(), context));
+
+            assertThat(throwable)
+                    .isInstanceOf(RuntimeException.class);
+
+            assertThat(AWSXRay.getTraceEntity())
+                    .isNotNull();
 
             assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                     .hasSize(1)
@@ -358,6 +405,9 @@ void shouldCaptureTracesWithExceptionMetaDataEnabledExplicitlyAndEnvironmentVari
 
             Throwable exception = catchThrowable(() -> requestHandler.handleRequest(new Object(), context));
 
+            assertThat(AWSXRay.getTraceEntity())
+                    .isNotNull();
+
             assertThat(AWSXRay.getTraceEntity().getSubsegmentsCopy())
                     .hasSize(1)
                     .allSatisfy(subsegment -> {