Skip to content

Commit

Permalink
Fix kinesis test when region not in url
Browse files Browse the repository at this point in the history
  • Loading branch information
@obenkenobi @meiao
obenkenobi authored and meiao committed Oct 30, 2024
1 parent 57274df commit bf51b34
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 21 deletions.
8 changes: 6 additions & 2 deletions ...106/src/main/java/com/agent/instrumentation/awsjavasdk1/services/kinesis/KinesisUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ public class KinesisUtil {
AgentBridge.collectionFactory.createAccessTimeBasedCache(3600, 8, KinesisUtil::processStreamData);
private KinesisUtil() {}

public static String getRegion(String serviceName, URI endpoint) {
return AwsHostNameUtils.parseRegion(endpoint.getHost(), serviceName);
public static String getRegion(String serviceName, URI endpoint, String overrideRegion) {
String parsedRegion = AwsHostNameUtils.parseRegion(endpoint.getHost(), serviceName);
if (parsedRegion != null && !parsedRegion.isEmpty()) {
return parsedRegion;
}
return overrideRegion;
}

public static void setTokenForRequest(AmazonWebServiceRequest request) {
Expand Down
38 changes: 19 additions & 19 deletions ...106/src/main/java/com/amazonaws/services/kinesis/AmazonKinesisClient_Instrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,133 +56,133 @@ public AmazonKinesisClient_Instrumentation(ClientConfiguration clientConfigurati
@Trace(async = true, leaf = true)
final AddTagsToStreamResult executeAddTagsToStream(AddTagsToStreamRequest request) {
KinesisUtil.setTraceInformation("addTagsToStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final CreateStreamResult executeCreateStream(CreateStreamRequest request) {
KinesisUtil.setTraceInformation("createStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final DecreaseStreamRetentionPeriodResult executeDecreaseStreamRetentionPeriod(DecreaseStreamRetentionPeriodRequest request) {
KinesisUtil.setTraceInformation("decreaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final DeleteStreamResult executeDeleteStream(DeleteStreamRequest request) {
KinesisUtil.setTraceInformation("deleteStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final DescribeLimitsResult executeDescribeLimits(DescribeLimitsRequest request) {
KinesisUtil.setTraceInformation("describeLimits", request, new StreamRawData(null, this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final DescribeStreamResult executeDescribeStream(DescribeStreamRequest request) {
KinesisUtil.setTraceInformation("describeStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final DisableEnhancedMonitoringResult executeDisableEnhancedMonitoring(DisableEnhancedMonitoringRequest request) {
KinesisUtil.setTraceInformation("disableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final EnableEnhancedMonitoringResult executeEnableEnhancedMonitoring(EnableEnhancedMonitoringRequest request) {
KinesisUtil.setTraceInformation("enableEnhancedMonitoring", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final GetRecordsResult executeGetRecords(GetRecordsRequest request) {
KinesisUtil.setTraceInformation("getRecords", request, new StreamRawData(null, this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final GetShardIteratorResult executeGetShardIterator(GetShardIteratorRequest request) {
KinesisUtil.setTraceInformation("getShardIterator", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final IncreaseStreamRetentionPeriodResult executeIncreaseStreamRetentionPeriod(IncreaseStreamRetentionPeriodRequest request) {
KinesisUtil.setTraceInformation("increaseStreamRetentionPeriod", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final ListStreamsResult executeListStreams(ListStreamsRequest request) {
KinesisUtil.setTraceInformation("listStreams", request, new StreamRawData(null, this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final ListTagsForStreamResult executeListTagsForStream(ListTagsForStreamRequest request) {
KinesisUtil.setTraceInformation("listTagsForStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final MergeShardsResult executeMergeShards(MergeShardsRequest request) {
KinesisUtil.setTraceInformation("mergeShards", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final PutRecordResult executePutRecord(PutRecordRequest request) {
KinesisUtil.setTraceInformation("putRecord", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final PutRecordsResult executePutRecords(PutRecordsRequest request) {
KinesisUtil.setTraceInformation("putRecords", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final RemoveTagsFromStreamResult executeRemoveTagsFromStream(RemoveTagsFromStreamRequest request) {
KinesisUtil.setTraceInformation("removeTagsFromStream", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final SplitShardResult executeSplitShard(SplitShardRequest request) {
KinesisUtil.setTraceInformation("splitShard", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

@Trace(async = true, leaf = true)
final UpdateShardCountResult executeUpdateShardCount(UpdateShardCountRequest request) {
KinesisUtil.setTraceInformation("updateShardCount", request, new StreamRawData(request.getStreamName(), this,
KinesisUtil.getRegion(getServiceNameIntern(), endpoint)));
KinesisUtil.getRegion(getServiceNameIntern(), endpoint, getSignerRegionOverride())));
return Weaver.callOriginal();
}

Expand Down

0 comments on commit bf51b34

Please sign in to comment.