Skip to content

Commit 0b15532

Browse files
committed
Addressed review comments
Signed-off-by: Kondaka <krishkdk@amazon.com>
1 parent 92cc504 commit 0b15532

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

data-prepper-plugins/prometheus-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/prometheus/PrometheusSigV4Signer.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,15 @@ class PrometheusSigV4Signer {
4242
this.region = config.getAwsConfig().getAwsRegion();
4343

4444
this.config = config;
45-
this.credentialsProvider = (config.getAwsConfig() != null) ?
46-
awsCredentialsSupplier.getProvider(convertToCredentialOptions(config.getAwsConfig())) :
47-
awsCredentialsSupplier.getProvider(AwsCredentialsOptions.builder().build());
48-
49-
/*
50-
this.credentialsProvider = awsCredentialsProvider(AwsCredentialsOptions.builder()
51-
.withRegion(region)
52-
.withStsRoleArn(config.getAwsConfig().getAwsStsRoleArn())
53-
.withStsExternalId(config.getAwsConfig().getAwsStsExternalId())
54-
.build());
55-
56-
*/
45+
this.credentialsProvider = awsCredentialsSupplier.getProvider(convertToCredentialOptions(config.getAwsConfig()));
5746

5847
this.endpointUri = URI.create(url);
5948
}
6049

6150
private static AwsCredentialsOptions convertToCredentialOptions(final AwsConfig awsConfig) {
51+
if config.getAwsConfig() == null) {
52+
return AwsCredentialsOptions.builder().build();
53+
}
6254
return AwsCredentialsOptions.builder()
6355
.withRegion(awsConfig.getAwsRegion())
6456
.withStsRoleArn(awsConfig.getAwsStsRoleArn())

data-prepper-plugins/prometheus-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/prometheus/service/PrometheusTimeSeries.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ public class PrometheusTimeSeries {
3838
private static final Logger LOG = LoggerFactory.getLogger(PrometheusTimeSeries.class);
3939
private static final Character UNDERSCORE = '_';
4040

41-
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/pkg/translator/prometheus
42-
// for the following map and metric/label sanitization rules
41+
/**
42+
* @see https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/pkg/translator/prometheus
43+
*/ for the following map and metric/label sanitization rules
4344
private static final Map<String, String> otelToPrometheusUnitsMap = Map.ofEntries(
4445
Map.entry("d", "days"),
4546
Map.entry("h", "hours"),

0 commit comments

Comments
 (0)