diff --git a/instrumentation/aws-java-sdk-dynamodb-1.11.106/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBClient_Instrumentation.java b/instrumentation/aws-java-sdk-dynamodb-1.11.106/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBClient_Instrumentation.java
index 6897d767ea..cba8fad882 100644
--- a/instrumentation/aws-java-sdk-dynamodb-1.11.106/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-dynamodb-1.11.106/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBClient_Instrumentation.java
@@ -68,7 +68,7 @@ public AmazonDynamoDBClient_Instrumentation(ClientConfiguration clientConfigurat
 
     private final AWSCredentialsProvider awsCredentialsProvider = Weaver.callOriginal();
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final CreateTableResult executeCreateTable(CreateTableRequest createTableRequest) {
         linkAndExpire(createTableRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "createTable",
@@ -76,21 +76,21 @@ final CreateTableResult executeCreateTable(CreateTableRequest createTableRequest
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final BatchGetItemResult executeBatchGetItem(BatchGetItemRequest batchGetItemRequest) {
         linkAndExpire(batchGetItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchGetItem", "batch", endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final BatchWriteItemResult executeBatchWriteItem(BatchWriteItemRequest batchWriteItemRequest) {
         linkAndExpire(batchWriteItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchWriteItem", "batch", endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DeleteItemResult executeDeleteItem(DeleteItemRequest deleteItemRequest) {
         linkAndExpire(deleteItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteItem",
@@ -98,7 +98,7 @@ final DeleteItemResult executeDeleteItem(DeleteItemRequest deleteItemRequest) {
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DeleteTableResult executeDeleteTable(DeleteTableRequest deleteTableRequest) {
         linkAndExpire(deleteTableRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteTable",
@@ -106,14 +106,14 @@ final DeleteTableResult executeDeleteTable(DeleteTableRequest deleteTableRequest
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeLimitsResult executeDescribeLimits(DescribeLimitsRequest describeLimitsRequest) {
         linkAndExpire(describeLimitsRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeLimits", null, endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeTableResult executeDescribeTable(DescribeTableRequest describeTableRequest) {
         linkAndExpire(describeTableRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTable",
@@ -121,7 +121,7 @@ final DescribeTableResult executeDescribeTable(DescribeTableRequest describeTabl
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeTimeToLiveResult executeDescribeTimeToLive(DescribeTimeToLiveRequest describeTimeToLiveRequest) {
         linkAndExpire(describeTimeToLiveRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTimeToLive",
@@ -129,7 +129,7 @@ final DescribeTimeToLiveResult executeDescribeTimeToLive(DescribeTimeToLiveReque
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final GetItemResult executeGetItem(GetItemRequest getItemRequest) {
         linkAndExpire(getItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "getItem", getItemRequest.getTableName(),
@@ -137,7 +137,7 @@ final GetItemResult executeGetItem(GetItemRequest getItemRequest) {
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListTablesResult executeListTables(ListTablesRequest listTablesRequest) {
         linkAndExpire(listTablesRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTables",
@@ -145,14 +145,14 @@ final ListTablesResult executeListTables(ListTablesRequest listTablesRequest) {
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListTagsOfResourceResult executeListTagsOfResource(ListTagsOfResourceRequest listTagsOfResourceRequest) {
         linkAndExpire(listTagsOfResourceRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTagsOfResource", null, endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final PutItemResult executePutItem(PutItemRequest putItemRequest) {
         linkAndExpire(putItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "putItem", putItemRequest.getTableName(),
@@ -160,7 +160,7 @@ final PutItemResult executePutItem(PutItemRequest putItemRequest) {
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final QueryResult executeQuery(QueryRequest queryRequest) {
         linkAndExpire(queryRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "query", queryRequest.getTableName(),
@@ -169,28 +169,28 @@ final QueryResult executeQuery(QueryRequest queryRequest) {
 
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ScanResult executeScan(ScanRequest scanRequest) {
         linkAndExpire(scanRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "scan", scanRequest.getTableName(), endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final TagResourceResult executeTagResource(TagResourceRequest tagResourceRequest) {
         linkAndExpire(tagResourceRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "tagResource", null, endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourceRequest) {
         linkAndExpire(untagResourceRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "untagResource", null, endpoint, this, awsCredentialsProvider);
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UpdateItemResult executeUpdateItem(UpdateItemRequest updateItemRequest) {
         linkAndExpire(updateItemRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateItem",
@@ -198,7 +198,7 @@ final UpdateItemResult executeUpdateItem(UpdateItemRequest updateItemRequest) {
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UpdateTableResult executeUpdateTable(UpdateTableRequest updateTableRequest) {
         linkAndExpire(updateTableRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTable",
@@ -206,7 +206,7 @@ final UpdateTableResult executeUpdateTable(UpdateTableRequest updateTableRequest
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UpdateTimeToLiveResult executeUpdateTimeToLive(UpdateTimeToLiveRequest updateTimeToLiveRequest) {
        linkAndExpire(updateTimeToLiveRequest);
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTimeToLive",
diff --git a/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbAsyncClient_Instrumentation.java b/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbAsyncClient_Instrumentation.java
index 1b17dcf56a..e7bcc3d005 100644
--- a/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbAsyncClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbAsyncClient_Instrumentation.java
@@ -22,117 +22,117 @@ final class DefaultDynamoDbAsyncClient_Instrumentation {
 
     private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<ScanResponse> scan(ScanRequest scanRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "scan", scanRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<PutItemResponse> putItem(PutItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "putItem", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<GetItemResponse> getItem(GetItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "getItem", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<DeleteItemResponse> deleteItem(DeleteItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteItem", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<ListTablesResponse> listTables(ListTablesRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTables", request.exclusiveStartTableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<DescribeTableResponse> describeTable(DescribeTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<CreateTableResponse> createTable(CreateTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "createTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<DeleteTableResponse> deleteTable(DeleteTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<BatchGetItemResponse> batchGetItem(BatchGetItemRequest batchGetItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchGetItem", "batch", this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<BatchWriteItemResponse> batchWriteItem(BatchWriteItemRequest batchWriteItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchWriteItem", "batch", this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<ListTagsOfResourceResponse> listTagsOfResource(ListTagsOfResourceRequest listTagsOfResourceRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTagsOfResource", listTagsOfResourceRequest.resourceArn(), this,
                 clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<QueryResponse> query(QueryRequest queryRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "query", queryRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<UpdateItemResponse> updateItem(UpdateItemRequest updateItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateItem", updateItemRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<UpdateTableResponse> updateTable(UpdateTableRequest updateTableRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTable", updateTableRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<UpdateTimeToLiveResponse> updateTimeToLive(UpdateTimeToLiveRequest updateTimeToLiveRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTimeToLive", updateTimeToLiveRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<DescribeLimitsResponse> describeLimits(DescribeLimitsRequest describeLimitsRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeLimits", null, this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<UntagResourceResponse> untagResource(UntagResourceRequest untagResourceRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "untagResource", untagResourceRequest.resourceArn(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<TagResourceResponse> tagResource(TagResourceRequest tagResourceRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "tagResource", tagResourceRequest.resourceArn(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CompletableFuture<DescribeTimeToLiveResponse> describeTimeToLive(DescribeTimeToLiveRequest describeTimeToLiveRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTimeToLive", describeTimeToLiveRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
diff --git a/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbClient_Instrumentation.java b/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbClient_Instrumentation.java
index 0f40ae1734..51f5cf0262 100644
--- a/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/software/amazon/awssdk/services/dynamodb/DefaultDynamoDbClient_Instrumentation.java
@@ -19,115 +19,115 @@
 final class DefaultDynamoDbClient_Instrumentation {
     private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
 
-    @Trace(leaf = true)
+    @Trace
     public GetItemResponse getItem(GetItemRequest getItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "getItem", getItemRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public ListTagsOfResourceResponse listTagsOfResource(ListTagsOfResourceRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTagsOfResource", null, this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public UntagResourceResponse untagResource(UntagResourceRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "untagResource", null, this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public BatchGetItemResponse batchGetItem(BatchGetItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchGetItem", "batch", this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public BatchWriteItemResponse batchWriteItem(BatchWriteItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "batchWriteItem", "batch", this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public PutItemResponse putItem(PutItemRequest putItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "putItem", putItemRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public DeleteItemResponse deleteItem(DeleteItemRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteItem", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public ListTablesResponse listTables(ListTablesRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "listTables", request.exclusiveStartTableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public CreateTableResponse createTable(CreateTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "createTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public DeleteTableResponse deleteTable(DeleteTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "deleteTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public DescribeTableResponse describeTable(DescribeTableRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTable", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public ScanResponse scan(ScanRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "scan", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public QueryResponse query(QueryRequest queryRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "query", queryRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public UpdateItemResponse updateItem(UpdateItemRequest updateItemRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateItem", updateItemRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public UpdateTableResponse updateTable(UpdateTableRequest updateTableRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTable", updateTableRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public UpdateTimeToLiveResponse updateTimeToLive(UpdateTimeToLiveRequest request) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "updateTimeToLive", request.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public DescribeLimitsResponse describeLimits(DescribeLimitsRequest describeLimitsRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeLimits", null, this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public TagResourceResponse tagResource(TagResourceRequest tagResourceRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "tagResource", tagResourceRequest.resourceArn(), this, clientConfiguration);
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf = true)
+    @Trace
     public DescribeTimeToLiveResponse describeTimeToLive(DescribeTimeToLiveRequest describeTimeToLiveRequest) {
         DynamoDBMetricUtil.metrics(NewRelic.getAgent().getTracedMethod(), "describeTimeToLive", describeTimeToLiveRequest.tableName(), this, clientConfiguration);
         return Weaver.callOriginal();
diff --git a/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java b/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
index eaf9981c8a..21a39afceb 100644
--- a/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
@@ -3,7 +3,6 @@
 import com.newrelic.api.agent.Trace;
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
-import com.newrelic.api.agent.weaver.Weaver;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
@@ -12,12 +11,12 @@
 
 @Weave(originalName = "software.amazon.awssdk.core.client.handler.AsyncClientHandler", type = MatchType.Interface)
 public abstract class AsyncClientHandler_Instrumentation {
-    // This prevents further traces from forming when using the async client
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
+
+    @Trace(excludeFromTransactionTrace = true)
     public abstract <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
             ClientExecutionParams<InputT, OutputT> executionParams);
 
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
+    @Trace(excludeFromTransactionTrace = true)
     public abstract <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
             ClientExecutionParams<InputT, OutputT> executionParams,
             AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer);
diff --git a/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/services/firehose/DefaultFirehoseClient_Instrumentation.java b/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/services/firehose/DefaultFirehoseClient_Instrumentation.java
index 3c02076e60..51dc824235 100644
--- a/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/services/firehose/DefaultFirehoseClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-firehose-2.1.0/src/main/java/software/amazon/awssdk/core/services/firehose/DefaultFirehoseClient_Instrumentation.java
@@ -37,84 +37,84 @@ class DefaultFirehoseClient_Instrumentation {
 
     private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
 
-    @Trace(leaf=true)
+    @Trace
     public CreateDeliveryStreamResponse createDeliveryStream(CreateDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("createDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DeleteDeliveryStreamResponse deleteDeliveryStream(DeleteDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("deleteDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeDeliveryStreamResponse describeDeliveryStream(DescribeDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("describeDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListDeliveryStreamsResponse listDeliveryStreams(ListDeliveryStreamsRequest request) {
         FirehoseUtil.setTraceDetails("listDeliveryStreams",
                 new DeliveryStreamRawData(null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListTagsForDeliveryStreamResponse listTagsForDeliveryStream(ListTagsForDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("listTagsForDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordResponse putRecord(PutRecordRequest request) {
         FirehoseUtil.setTraceDetails("putRecord",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordBatchResponse putRecordBatch(PutRecordBatchRequest request) {
         FirehoseUtil.setTraceDetails("putRecordBatch",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public StartDeliveryStreamEncryptionResponse startDeliveryStreamEncryption(StartDeliveryStreamEncryptionRequest request) {
         FirehoseUtil.setTraceDetails("startDeliveryStreamEncryption",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public StopDeliveryStreamEncryptionResponse stopDeliveryStreamEncryption(StopDeliveryStreamEncryptionRequest request) {
         FirehoseUtil.setTraceDetails("stopDeliveryStreamEncryption",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public TagDeliveryStreamResponse tagDeliveryStream(TagDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("tagDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public UntagDeliveryStreamResponse untagDeliveryStream(UntagDeliveryStreamRequest request) {
         FirehoseUtil.setTraceDetails("untagDeliveryStream",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public UpdateDestinationResponse updateDestination(UpdateDestinationRequest request) {
         FirehoseUtil.setTraceDetails("updateDestination",
                 new DeliveryStreamRawData(request.deliveryStreamName(), this, clientConfiguration));
diff --git a/instrumentation/aws-java-sdk-kinesis-1.11.106/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-1.11.106/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
index c916cfa8e7..dc7fd2d8e3 100644
--- a/instrumentation/aws-java-sdk-kinesis-1.11.106/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-1.11.106/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
@@ -53,133 +53,133 @@ public AmazonKinesisClient_Instrumentation(ClientConfiguration clientConfigurati
         super(clientConfiguration);
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final AddTagsToStreamResult executeAddTagsToStream(AddTagsToStreamRequest request) {
         KinesisUtil.setTraceInformation("addTagsToStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final CreateStreamResult executeCreateStream(CreateStreamRequest request) {
         KinesisUtil.setTraceInformation("createStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DecreaseStreamRetentionPeriodResult executeDecreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceInformation("decreaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DeleteStreamResult executeDeleteStream(DeleteStreamRequest request) {
         KinesisUtil.setTraceInformation("deleteStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeLimitsResult executeDescribeLimits(DescribeLimitsRequest request) {
         KinesisUtil.setTraceInformation("describeLimits", request, new StreamRawData(null, this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeStreamResult executeDescribeStream(DescribeStreamRequest request) {
         KinesisUtil.setTraceInformation("describeStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DisableEnhancedMonitoringResult executeDisableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceInformation("disableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final EnableEnhancedMonitoringResult executeEnableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceInformation("enableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final GetRecordsResult executeGetRecords(GetRecordsRequest request) {
         KinesisUtil.setTraceInformation("getRecords", request, new StreamRawData(null, this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final GetShardIteratorResult executeGetShardIterator(GetShardIteratorRequest request) {
         KinesisUtil.setTraceInformation("getShardIterator", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final IncreaseStreamRetentionPeriodResult executeIncreaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceInformation("increaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListStreamsResult executeListStreams(ListStreamsRequest request) {
         KinesisUtil.setTraceInformation("listStreams", request, new StreamRawData(null, this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListTagsForStreamResult executeListTagsForStream(ListTagsForStreamRequest request) {
         KinesisUtil.setTraceInformation("listTagsForStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final MergeShardsResult executeMergeShards(MergeShardsRequest request) {
         KinesisUtil.setTraceInformation("mergeShards", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final PutRecordResult executePutRecord(PutRecordRequest request) {
         KinesisUtil.setTraceInformation("putRecord", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final PutRecordsResult executePutRecords(PutRecordsRequest request) {
         KinesisUtil.setTraceInformation("putRecords", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final RemoveTagsFromStreamResult executeRemoveTagsFromStream(RemoveTagsFromStreamRequest request) {
         KinesisUtil.setTraceInformation("removeTagsFromStream", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final SplitShardResult executeSplitShard(SplitShardRequest request) {
         KinesisUtil.setTraceInformation("splitShard", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UpdateShardCountResult executeUpdateShardCount(UpdateShardCountRequest request) {
         KinesisUtil.setTraceInformation("updateShardCount", request, new StreamRawData(request.getStreamName(), this, 
             KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
diff --git a/instrumentation/aws-java-sdk-kinesis-1.11.272/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-1.11.272/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
index 9f565c55aa..e7925f0b4e 100644
--- a/instrumentation/aws-java-sdk-kinesis-1.11.272/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-1.11.272/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
@@ -56,134 +56,134 @@
 public abstract class AmazonKinesisClient_Instrumentation {
     abstract protected String getSigningRegion();
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final AddTagsToStreamResult executeAddTagsToStream(AddTagsToStreamRequest request) {
         KinesisUtil.setTraceInformation("addTagsToStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final CreateStreamResult executeCreateStream(CreateStreamRequest request) {
         KinesisUtil.setTraceInformation("createStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DecreaseStreamRetentionPeriodResult executeDecreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceInformation("decreaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DeleteStreamResult executeDeleteStream(DeleteStreamRequest request) {
         KinesisUtil.setTraceInformation("deleteStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeLimitsResult executeDescribeLimits(DescribeLimitsRequest request) {
         KinesisUtil.setTraceInformation("describeLimits", request, new StreamRawData(null, this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DescribeStreamResult executeDescribeStream(DescribeStreamRequest request) {
         KinesisUtil.setTraceInformation("describeStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final DisableEnhancedMonitoringResult executeDisableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceInformation("disableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final EnableEnhancedMonitoringResult executeEnableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceInformation("enableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final GetRecordsResult executeGetRecords(GetRecordsRequest request) {
         KinesisUtil.setTraceInformation("getRecords", request, new StreamRawData(null, this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final GetShardIteratorResult executeGetShardIterator(GetShardIteratorRequest request) {
         KinesisUtil.setTraceInformation("getShardIterator", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final IncreaseStreamRetentionPeriodResult executeIncreaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceInformation("increaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListStreamsResult executeListStreams(ListStreamsRequest request) {
         KinesisUtil.setTraceInformation("listStreams", request, new StreamRawData(null, this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListTagsForStreamResult executeListTagsForStream(ListTagsForStreamRequest request) {
         KinesisUtil.setTraceInformation("listTagsForStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final MergeShardsResult executeMergeShards(MergeShardsRequest request) {
         KinesisUtil.setTraceInformation("mergeShards", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final PutRecordResult executePutRecord(PutRecordRequest request) {
         KinesisUtil.setTraceInformation("putRecord", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final PutRecordsResult executePutRecords(PutRecordsRequest request) {
         KinesisUtil.setTraceInformation("putRecords", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final RemoveTagsFromStreamResult executeRemoveTagsFromStream(RemoveTagsFromStreamRequest request) {
         KinesisUtil.setTraceInformation("removeTagsFromStream", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final SplitShardResult executeSplitShard(SplitShardRequest request) {
         KinesisUtil.setTraceInformation("splitShard", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final UpdateShardCountResult executeUpdateShardCount(UpdateShardCountRequest request) {
         KinesisUtil.setTraceInformation("updateShardCount", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final ListShardsResult executeListShards(ListShardsRequest request) {
         KinesisUtil.setTraceInformation("listShards", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final StartStreamEncryptionResult executeStartStreamEncryption(StartStreamEncryptionRequest request) {
         KinesisUtil.setTraceInformation("startStreamEncryption", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
 
     }
 
-    @Trace(async = true, leaf = true)
+    @Trace(async = true)
     final StopStreamEncryptionResult executeStopStreamEncryption(StopStreamEncryptionRequest request) {
         KinesisUtil.setTraceInformation("stopStreamEncryption", request, new StreamRawData(request.getStreamName(), this, getSigningRegion()));
         return Weaver.callOriginal();
diff --git a/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
index 17f8e249b5..8c26743299 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
@@ -11,18 +11,14 @@
 import java.util.concurrent.CompletableFuture;
 
 @Weave(originalName = "software.amazon.awssdk.core.client.handler.AsyncClientHandler", type = MatchType.Interface)
-public class AsyncClientHandler_Instrumentation {
-    // This prevents further traces from forming when using the async client
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
-    public <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
-            ClientExecutionParams<InputT, OutputT> executionParams) {
-        return Weaver.callOriginal();
-    }
+public abstract class AsyncClientHandler_Instrumentation {
 
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
-    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
+    @Trace(excludeFromTransactionTrace = true)
+    public abstract <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
+            ClientExecutionParams<InputT, OutputT> executionParams);
+
+    @Trace(excludeFromTransactionTrace = true)
+    public abstract <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
             ClientExecutionParams<InputT, OutputT> executionParams,
-            AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
-        return Weaver.callOriginal();
-    }
+            AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer);
 }
diff --git a/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
index 6ddbf56861..40eb190f1d 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
@@ -66,31 +66,31 @@
 class DefaultKinesisClient_Instrumentation {
     private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
 
-    @Trace(leaf=true)
+    @Trace
     public AddTagsToStreamResponse addTagsToStream(AddTagsToStreamRequest request) {
         KinesisUtil.setTraceDetails("addTagsToStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public CreateStreamResponse createStream(CreateStreamRequest request) {
         KinesisUtil.setTraceDetails("createStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DecreaseStreamRetentionPeriodResponse decreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceDetails("decreaseStreamRetentionPeriod", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DeleteStreamResponse deleteStream(DeleteStreamRequest request) {
         KinesisUtil.setTraceDetails("deleteStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DeregisterStreamConsumerResponse deregisterStreamConsumer(DeregisterStreamConsumerRequest request) {
         String streamArn = request.streamARN();
         String consumerArn = request.consumerARN();
@@ -99,19 +99,19 @@ public DeregisterStreamConsumerResponse deregisterStreamConsumer(DeregisterStrea
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeLimitsResponse describeLimits(DescribeLimitsRequest request) {
         KinesisUtil.setTraceDetails("describeLimits", new StreamRawData(null, null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamResponse describeStream(DescribeStreamRequest request) {
         KinesisUtil.setTraceDetails("describeStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamConsumerResponse describeStreamConsumer(DescribeStreamConsumerRequest request) {
         String streamArn = request.streamARN();
         String consumerArn = request.consumerARN();
@@ -120,115 +120,115 @@ public DescribeStreamConsumerResponse describeStreamConsumer(DescribeStreamConsu
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamSummaryResponse describeStreamSummary(DescribeStreamSummaryRequest request) {
         KinesisUtil.setTraceDetails("describeStreamSummary", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public DisableEnhancedMonitoringResponse disableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceDetails("disableEnhancedMonitoring", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public EnableEnhancedMonitoringResponse enableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceDetails("enableEnhancedMonitoring", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public GetRecordsResponse getRecords(GetRecordsRequest request) {
         KinesisUtil.setTraceDetails("getRecords", new StreamRawData(null, null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public GetShardIteratorResponse getShardIterator(GetShardIteratorRequest request) {
         KinesisUtil.setTraceDetails("getShardIterator", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public IncreaseStreamRetentionPeriodResponse increaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceDetails("increaseStreamRetentionPeriod", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListShardsResponse listShards(ListShardsRequest request) {
         KinesisUtil.setTraceDetails("listShards", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListStreamConsumersResponse listStreamConsumers(ListStreamConsumersRequest request) {
         KinesisUtil.setTraceDetails("listStreamConsumers", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListStreamsResponse listStreams(ListStreamsRequest request) {
         KinesisUtil.setTraceDetails("listStreams", new StreamRawData(null, null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListTagsForStreamResponse listTagsForStream(ListTagsForStreamRequest request) {
         KinesisUtil.setTraceDetails("listTagsForStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public MergeShardsResponse mergeShards(MergeShardsRequest request) {
         KinesisUtil.setTraceDetails("mergeShards", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordResponse putRecord(PutRecordRequest request) {
         KinesisUtil.setTraceDetails("putRecord", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordsResponse putRecords(PutRecordsRequest request) {
         KinesisUtil.setTraceDetails("putRecords", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
-    @Trace(leaf=true)
+    @Trace
     public RegisterStreamConsumerResponse registerStreamConsumer(RegisterStreamConsumerRequest request) {
         KinesisUtil.setTraceDetails("registerStreamConsumer", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
 
-    @Trace(leaf=true)
+    @Trace
     public RemoveTagsFromStreamResponse removeTagsFromStream(RemoveTagsFromStreamRequest request) {
         KinesisUtil.setTraceDetails("removeTagsFromStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public SplitShardResponse splitShard(SplitShardRequest request) {
         KinesisUtil.setTraceDetails("splitShard", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public StartStreamEncryptionResponse startStreamEncryption(StartStreamEncryptionRequest request) {
         KinesisUtil.setTraceDetails("startStreamEncryption", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public StopStreamEncryptionResponse stopStreamEncryption(StopStreamEncryptionRequest request) {
         KinesisUtil.setTraceDetails("stopStreamEncryption", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public UpdateShardCountResponse updateShardCount(UpdateShardCountRequest request) {
         KinesisUtil.setTraceDetails("updateShardCount", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
diff --git a/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
index 17f8e249b5..8c26743299 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler_Instrumentation.java
@@ -11,18 +11,14 @@
 import java.util.concurrent.CompletableFuture;
 
 @Weave(originalName = "software.amazon.awssdk.core.client.handler.AsyncClientHandler", type = MatchType.Interface)
-public class AsyncClientHandler_Instrumentation {
-    // This prevents further traces from forming when using the async client
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
-    public <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
-            ClientExecutionParams<InputT, OutputT> executionParams) {
-        return Weaver.callOriginal();
-    }
+public abstract class AsyncClientHandler_Instrumentation {
 
-    @Trace(leaf = true, excludeFromTransactionTrace = true)
-    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
+    @Trace(excludeFromTransactionTrace = true)
+    public abstract <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
+            ClientExecutionParams<InputT, OutputT> executionParams);
+
+    @Trace(excludeFromTransactionTrace = true)
+    public abstract <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
             ClientExecutionParams<InputT, OutputT> executionParams,
-            AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
-        return Weaver.callOriginal();
-    }
+            AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer);
 }
diff --git a/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java b/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
index 95e7ca630a..e72ebaeb73 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-kinesis-2.18.40/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisClient_Instrumentation.java
@@ -66,31 +66,31 @@
 class DefaultKinesisClient_Instrumentation {
     private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
 
-    @Trace(leaf=true)
+    @Trace
     public AddTagsToStreamResponse addTagsToStream(AddTagsToStreamRequest request) {
         KinesisUtil.setTraceDetails("addTagsToStream", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public CreateStreamResponse createStream(CreateStreamRequest request) {
         KinesisUtil.setTraceDetails("createStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DecreaseStreamRetentionPeriodResponse decreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceDetails("decreaseStreamRetentionPeriod", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DeleteStreamResponse deleteStream(DeleteStreamRequest request) {
         KinesisUtil.setTraceDetails("deleteStream", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DeregisterStreamConsumerResponse deregisterStreamConsumer(DeregisterStreamConsumerRequest request) {
         String streamArn = request.streamARN();
         String consumerArn = request.consumerARN();
@@ -99,19 +99,19 @@ public DeregisterStreamConsumerResponse deregisterStreamConsumer(DeregisterStrea
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeLimitsResponse describeLimits(DescribeLimitsRequest request) {
         KinesisUtil.setTraceDetails("describeLimits", new StreamRawData(null, null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamResponse describeStream(DescribeStreamRequest request) {
         KinesisUtil.setTraceDetails("describeStream", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamConsumerResponse describeStreamConsumer(DescribeStreamConsumerRequest request) {
         String streamArn = request.streamARN();
         String consumerArn = request.consumerARN();
@@ -120,115 +120,115 @@ public DescribeStreamConsumerResponse describeStreamConsumer(DescribeStreamConsu
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public DescribeStreamSummaryResponse describeStreamSummary(DescribeStreamSummaryRequest request) {
         KinesisUtil.setTraceDetails("describeStreamSummary", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public DisableEnhancedMonitoringResponse disableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceDetails("disableEnhancedMonitoring", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public EnableEnhancedMonitoringResponse enableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
         KinesisUtil.setTraceDetails("enableEnhancedMonitoring", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public GetRecordsResponse getRecords(GetRecordsRequest request) {
         KinesisUtil.setTraceDetails("getRecords", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public GetShardIteratorResponse getShardIterator(GetShardIteratorRequest request) {
         KinesisUtil.setTraceDetails("getShardIterator", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public IncreaseStreamRetentionPeriodResponse increaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
         KinesisUtil.setTraceDetails("increaseStreamRetentionPeriod", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListShardsResponse listShards(ListShardsRequest request) {
         KinesisUtil.setTraceDetails("listShards", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListStreamConsumersResponse listStreamConsumers(ListStreamConsumersRequest request) {
         KinesisUtil.setTraceDetails("listStreamConsumers", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListStreamsResponse listStreams(ListStreamsRequest request) {
         KinesisUtil.setTraceDetails("listStreams", new StreamRawData(null, null, this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public ListTagsForStreamResponse listTagsForStream(ListTagsForStreamRequest request) {
         KinesisUtil.setTraceDetails("listTagsForStream", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public MergeShardsResponse mergeShards(MergeShardsRequest request) {
         KinesisUtil.setTraceDetails("mergeShards", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordResponse putRecord(PutRecordRequest request) {
         KinesisUtil.setTraceDetails("putRecord", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public PutRecordsResponse putRecords(PutRecordsRequest request) {
         KinesisUtil.setTraceDetails("putRecords", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
-    @Trace(leaf=true)
+    @Trace
     public RegisterStreamConsumerResponse registerStreamConsumer(RegisterStreamConsumerRequest request) {
         KinesisUtil.setTraceDetails("registerStreamConsumer", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
 
-    @Trace(leaf=true)
+    @Trace
     public RemoveTagsFromStreamResponse removeTagsFromStream(RemoveTagsFromStreamRequest request) {
         KinesisUtil.setTraceDetails("removeTagsFromStream", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public SplitShardResponse splitShard(SplitShardRequest request) {
         KinesisUtil.setTraceDetails("splitShard", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
 
-    @Trace(leaf=true)
+    @Trace
     public StartStreamEncryptionResponse startStreamEncryption(StartStreamEncryptionRequest request) {
         KinesisUtil.setTraceDetails("startStreamEncryption", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public StopStreamEncryptionResponse stopStreamEncryption(StopStreamEncryptionRequest request) {
         KinesisUtil.setTraceDetails("stopStreamEncryption", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();
     }
     
-    @Trace(leaf=true)
+    @Trace
     public UpdateShardCountResponse updateShardCount(UpdateShardCountRequest request) {
         KinesisUtil.setTraceDetails("updateShardCount", new StreamRawData(request.streamName(), request.streamARN(), this, clientConfiguration));
         return Weaver.callOriginal();