fix kinesis verifier failure for kinesis sdk2 before 2.18.40 (#2123)

* fix kinesis verifier failure for kinesis sdk2 before 2.18.40

* fix kinesis instrumentation tests

Author: obenkenobi

…/aws-java-sdk-kinesis-2.0.6/build.gradle …/aws-java-sdk-kinesis-2.1.0/build.gradleinstrumentation/aws-java-sdk-kinesis-2.0.6/build.gradle renamed to instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle instrumentation/aws-java-sdk-kinesis-2.0.6/build.gradle renamed to instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle

@@ -1,10 +1,10 @@
 dependencies {
     implementation(project(":agent-bridge"))
-    implementation("software.amazon.awssdk:kinesis:2.20.45")
+    implementation("software.amazon.awssdk:kinesis:2.1.0")
 }
 
 jar {
-    manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.aws-java-sdk-kinesis-2.0.6' }
+    manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.aws-java-sdk-kinesis-2.1.0' }
 }
 
 verifyInstrumentation {

…vasdk2/services/kinesis/KinesisUtil.java …vasdk2/services/kinesis/KinesisUtil.javainstrumentation/aws-java-sdk-kinesis-2.0.6/src/main/java/com/agent/instrumentation/awsjavasdk2/services/kinesis/KinesisUtil.java renamed to instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/kinesis/KinesisUtil.java instrumentation/aws-java-sdk-kinesis-2.0.6/src/main/java/com/agent/instrumentation/awsjavasdk2/services/kinesis/KinesisUtil.java renamed to instrumentation/aws-java-sdk-kinesis-2.1.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/kinesis/KinesisUtil.java

@@ -0,0 +1,237 @@
+package software.amazon.awssdk.services.kinesis;
+
+import com.agent.instrumentation.awsjavasdk2.services.kinesis.KinesisUtil;
+import com.agent.instrumentation.awsjavasdk2.services.kinesis.StreamRawData;
+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.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.CreateStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.DecreaseStreamRetentionPeriodRequest;
+import software.amazon.awssdk.services.kinesis.model.DecreaseStreamRetentionPeriodResponse;
+import software.amazon.awssdk.services.kinesis.model.DeleteStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.DeleteStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.DeregisterStreamConsumerRequest;
+import software.amazon.awssdk.services.kinesis.model.DeregisterStreamConsumerResponse;
+import software.amazon.awssdk.services.kinesis.model.DescribeLimitsRequest;
+import software.amazon.awssdk.services.kinesis.model.DescribeLimitsResponse;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerRequest;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerResponse;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamSummaryRequest;
+import software.amazon.awssdk.services.kinesis.model.DescribeStreamSummaryResponse;
+import software.amazon.awssdk.services.kinesis.model.DisableEnhancedMonitoringRequest;
+import software.amazon.awssdk.services.kinesis.model.DisableEnhancedMonitoringResponse;
+import software.amazon.awssdk.services.kinesis.model.EnableEnhancedMonitoringRequest;
+import software.amazon.awssdk.services.kinesis.model.EnableEnhancedMonitoringResponse;
+import software.amazon.awssdk.services.kinesis.model.GetRecordsRequest;
+import software.amazon.awssdk.services.kinesis.model.GetRecordsResponse;
+import software.amazon.awssdk.services.kinesis.model.GetShardIteratorRequest;
+import software.amazon.awssdk.services.kinesis.model.GetShardIteratorResponse;
+import software.amazon.awssdk.services.kinesis.model.IncreaseStreamRetentionPeriodRequest;
+import software.amazon.awssdk.services.kinesis.model.IncreaseStreamRetentionPeriodResponse;
+import software.amazon.awssdk.services.kinesis.model.ListShardsRequest;
+import software.amazon.awssdk.services.kinesis.model.ListShardsResponse;
+import software.amazon.awssdk.services.kinesis.model.ListStreamConsumersRequest;
+import software.amazon.awssdk.services.kinesis.model.ListStreamConsumersResponse;
+import software.amazon.awssdk.services.kinesis.model.ListStreamsRequest;
+import software.amazon.awssdk.services.kinesis.model.ListStreamsResponse;
+import software.amazon.awssdk.services.kinesis.model.ListTagsForStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.ListTagsForStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.MergeShardsRequest;
+import software.amazon.awssdk.services.kinesis.model.MergeShardsResponse;
+import software.amazon.awssdk.services.kinesis.model.PutRecordRequest;
+import software.amazon.awssdk.services.kinesis.model.PutRecordResponse;
+import software.amazon.awssdk.services.kinesis.model.PutRecordsRequest;
+import software.amazon.awssdk.services.kinesis.model.PutRecordsResponse;
+import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerRequest;
+import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerResponse;
+import software.amazon.awssdk.services.kinesis.model.RemoveTagsFromStreamRequest;
+import software.amazon.awssdk.services.kinesis.model.RemoveTagsFromStreamResponse;
+import software.amazon.awssdk.services.kinesis.model.SplitShardRequest;
+import software.amazon.awssdk.services.kinesis.model.SplitShardResponse;
+import software.amazon.awssdk.services.kinesis.model.StartStreamEncryptionRequest;
+import software.amazon.awssdk.services.kinesis.model.StartStreamEncryptionResponse;
+import software.amazon.awssdk.services.kinesis.model.StopStreamEncryptionRequest;
+import software.amazon.awssdk.services.kinesis.model.StopStreamEncryptionResponse;
+import software.amazon.awssdk.services.kinesis.model.UpdateShardCountRequest;
+import software.amazon.awssdk.services.kinesis.model.UpdateShardCountResponse;
+
+@Weave(originalName = "software.amazon.awssdk.services.kinesis.DefaultKinesisClient", type = MatchType.ExactClass)
+class DefaultKinesisClient_Instrumentation {
+    private final SdkClientConfiguration clientConfiguration = Weaver.callOriginal();
+
+    @Trace(leaf=true)
+    public AddTagsToStreamResponse addTagsToStream(AddTagsToStreamRequest request) {
+        KinesisUtil.setTraceDetails("addTagsToStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public CreateStreamResponse createStream(CreateStreamRequest request) {
+        KinesisUtil.setTraceDetails("createStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DecreaseStreamRetentionPeriodResponse decreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
+        KinesisUtil.setTraceDetails("decreaseStreamRetentionPeriod", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DeleteStreamResponse deleteStream(DeleteStreamRequest request) {
+        KinesisUtil.setTraceDetails("deleteStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DeregisterStreamConsumerResponse deregisterStreamConsumer(DeregisterStreamConsumerRequest request) {
+        String streamArn = request.streamARN();
+        String consumerArn = request.consumerARN();
+        String arn = streamArn != null && !streamArn.isEmpty() ? streamArn : consumerArn;
+        KinesisUtil.setTraceDetails("deregisterStreamConsumer", new StreamRawData(null, arn, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DescribeLimitsResponse describeLimits(DescribeLimitsRequest request) {
+        KinesisUtil.setTraceDetails("describeLimits", new StreamRawData(null, null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DescribeStreamResponse describeStream(DescribeStreamRequest request) {
+        KinesisUtil.setTraceDetails("describeStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DescribeStreamConsumerResponse describeStreamConsumer(DescribeStreamConsumerRequest request) {
+        String streamArn = request.streamARN();
+        String consumerArn = request.consumerARN();
+        String arn = streamArn != null && !streamArn.isEmpty() ? streamArn : consumerArn;
+        KinesisUtil.setTraceDetails("describeStreamConsumer", new StreamRawData(null, arn, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public DescribeStreamSummaryResponse describeStreamSummary(DescribeStreamSummaryRequest request) {
+        KinesisUtil.setTraceDetails("describeStreamSummary", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    
+    @Trace(leaf=true)
+    public DisableEnhancedMonitoringResponse disableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
+        KinesisUtil.setTraceDetails("disableEnhancedMonitoring", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public EnableEnhancedMonitoringResponse enableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
+        KinesisUtil.setTraceDetails("enableEnhancedMonitoring", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public GetRecordsResponse getRecords(GetRecordsRequest request) {
+        KinesisUtil.setTraceDetails("getRecords", new StreamRawData(null, null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    
+    @Trace(leaf=true)
+    public GetShardIteratorResponse getShardIterator(GetShardIteratorRequest request) {
+        KinesisUtil.setTraceDetails("getShardIterator", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public IncreaseStreamRetentionPeriodResponse increaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
+        KinesisUtil.setTraceDetails("increaseStreamRetentionPeriod", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public ListShardsResponse listShards(ListShardsRequest request) {
+        KinesisUtil.setTraceDetails("listShards", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public ListStreamConsumersResponse listStreamConsumers(ListStreamConsumersRequest request) {
+        KinesisUtil.setTraceDetails("listStreamConsumers", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public ListStreamsResponse listStreams(ListStreamsRequest request) {
+        KinesisUtil.setTraceDetails("listStreams", new StreamRawData(null, null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public ListTagsForStreamResponse listTagsForStream(ListTagsForStreamRequest request) {
+        KinesisUtil.setTraceDetails("listTagsForStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public MergeShardsResponse mergeShards(MergeShardsRequest request) {
+        KinesisUtil.setTraceDetails("mergeShards", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public PutRecordResponse putRecord(PutRecordRequest request) {
+        KinesisUtil.setTraceDetails("putRecord", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public PutRecordsResponse putRecords(PutRecordsRequest request) {
+        KinesisUtil.setTraceDetails("putRecords", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    @Trace(leaf=true)
+    public RegisterStreamConsumerResponse registerStreamConsumer(RegisterStreamConsumerRequest request) {
+        KinesisUtil.setTraceDetails("registerStreamConsumer", new StreamRawData(null, request.streamARN(), this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+
+    @Trace(leaf=true)
+    public RemoveTagsFromStreamResponse removeTagsFromStream(RemoveTagsFromStreamRequest request) {
+        KinesisUtil.setTraceDetails("removeTagsFromStream", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public SplitShardResponse splitShard(SplitShardRequest request) {
+        KinesisUtil.setTraceDetails("splitShard", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+
+    @Trace(leaf=true)
+    public StartStreamEncryptionResponse startStreamEncryption(StartStreamEncryptionRequest request) {
+        KinesisUtil.setTraceDetails("startStreamEncryption", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    
+    @Trace(leaf=true)
+    public StopStreamEncryptionResponse stopStreamEncryption(StopStreamEncryptionRequest request) {
+        KinesisUtil.setTraceDetails("stopStreamEncryption", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    
+    @Trace(leaf=true)
+    public UpdateShardCountResponse updateShardCount(UpdateShardCountRequest request) {
+        KinesisUtil.setTraceDetails("updateShardCount", new StreamRawData(request.streamName(), null, this, clientConfiguration));
+        return Weaver.callOriginal();
+    }
+    
+}