Skip to content

Commit 59359b2

Browse files
yiyuan-heyiyuan-he
committed
apply formatting
1 parent 0b40dcf commit 59359b2

File tree

3 files changed

+52
-33
lines changed
  • appsignals-tests
    • contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base
    • images/aws-sdk
      • aws-sdk-v1/src/main/java/com/amazon/sampleapp
      • aws-sdk-v2/src/main/java/com/amazon/sampleapp

3 files changed

+52
-33
lines changed

‎appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.List;
2424
import java.util.Map;
2525
import java.util.Set;
26-
2726
import org.assertj.core.api.ThrowingConsumer;
2827
import org.junit.jupiter.api.AfterAll;
2928
import org.junit.jupiter.api.BeforeAll;
@@ -166,7 +165,9 @@ private String getSecretsManagerServiceName() {
166165
return "AWS::SecretsManager";
167166
}
168167

169-
private String getStepFunctionsServiceName() { return "AWS::StepFunctions"; }
168+
private String getStepFunctionsServiceName() {
169+
return "AWS::StepFunctions";
170+
}
170171

171172
private String s3SpanName(String operation) {
172173
return String.format("%s.%s", getS3SpanNamePrefix(), operation);

‎appsignals-tests/images/aws-sdk/aws-sdk-v1/src/main/java/com/amazon/sampleapp/App.java‎

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.amazonaws.services.dynamodbv2.model.KeyType;
4545
import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
4646
import com.amazonaws.services.dynamodbv2.model.PutItemRequest;
47+
import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient;
4748
import com.amazonaws.services.identitymanagement.model.CreateRoleRequest;
4849
import com.amazonaws.services.identitymanagement.model.PutRolePolicyRequest;
4950
import com.amazonaws.services.kinesis.AmazonKinesisClient;
@@ -59,13 +60,12 @@
5960
import com.amazonaws.services.secretsmanager.model.DescribeSecretRequest;
6061
import com.amazonaws.services.secretsmanager.model.ListSecretsRequest;
6162
import com.amazonaws.services.secretsmanager.model.SecretListEntry;
62-
import com.amazonaws.services.stepfunctions.AWSStepFunctionsClient;
63-
import com.amazonaws.services.stepfunctions.model.*;
64-
import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient;
6563
import com.amazonaws.services.sqs.AmazonSQSClient;
6664
import com.amazonaws.services.sqs.model.CreateQueueRequest;
6765
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
6866
import com.amazonaws.services.sqs.model.SendMessageRequest;
67+
import com.amazonaws.services.stepfunctions.AWSStepFunctionsClient;
68+
import com.amazonaws.services.stepfunctions.model.*;
6969
import com.fasterxml.jackson.databind.ObjectMapper;
7070
import java.io.File;
7171
import java.io.IOException;
@@ -570,22 +570,27 @@ private static void setupSecretsManager() {
570570
});
571571

572572
get(
573-
"/secretsmanager/error",
573+
"/secretsmanager/error",
574574
(req, res) -> {
575-
setMainStatus(400);
576-
var errorClient =
577-
AWSSecretsManagerClient.builder()
578-
.withCredentials(CREDENTIALS_PROVIDER)
579-
.withEndpointConfiguration(new EndpointConfiguration("http://error.test:8080", Regions.US_WEST_2.getName()))
580-
.build();
575+
setMainStatus(400);
576+
var errorClient =
577+
AWSSecretsManagerClient.builder()
578+
.withCredentials(CREDENTIALS_PROVIDER)
579+
.withEndpointConfiguration(
580+
new EndpointConfiguration(
581+
"http://error.test:8080", Regions.US_WEST_2.getName()))
582+
.build();
581583

582-
try {
583-
var describeRequest = new DescribeSecretRequest().withSecretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id");
584-
errorClient.describeSecret(describeRequest);
585-
} catch (Exception e) {
586-
logger.debug("Error describing secret", e);
587-
}
588-
return "";
584+
try {
585+
var describeRequest =
586+
new DescribeSecretRequest()
587+
.withSecretId(
588+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id");
589+
errorClient.describeSecret(describeRequest);
590+
} catch (Exception e) {
591+
logger.debug("Error describing secret", e);
592+
}
593+
return "";
589594
});
590595

591596
get(
@@ -595,16 +600,21 @@ private static void setupSecretsManager() {
595600
var faultClient =
596601
AWSSecretsManagerClient.builder()
597602
.withCredentials(CREDENTIALS_PROVIDER)
598-
.withEndpointConfiguration(new EndpointConfiguration("http://fault.test:8080", Regions.US_WEST_2.getName()))
603+
.withEndpointConfiguration(
604+
new EndpointConfiguration(
605+
"http://fault.test:8080", Regions.US_WEST_2.getName()))
599606
.build();
600607

601608
try {
602-
var describeRequest = new DescribeSecretRequest().withSecretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id");
609+
var describeRequest =
610+
new DescribeSecretRequest()
611+
.withSecretId(
612+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id");
603613
faultClient.describeSecret(describeRequest);
604614
} catch (Exception e) {
605615
logger.debug("Error describing secret", e);
606616
}
607-
return"";
617+
return "";
608618
});
609619
}
610620

@@ -728,15 +738,17 @@ private static void setupStepFunctions() {
728738
get(
729739
"/sfn/describestatemachine/:name",
730740
(req, res) -> {
731-
var describeRequest = new DescribeStateMachineRequest().withStateMachineArn(finalExistingStateMachineArn);
741+
var describeRequest =
742+
new DescribeStateMachineRequest().withStateMachineArn(finalExistingStateMachineArn);
732743
stepFunctionsClient.describeStateMachine(describeRequest);
733744
return "";
734745
});
735746

736747
get(
737748
"/sfn/describeactivity/:name",
738749
(req, res) -> {
739-
var describeRequest = new DescribeActivityRequest().withActivityArn(finalExistingActivityArn);
750+
var describeRequest =
751+
new DescribeActivityRequest().withActivityArn(finalExistingActivityArn);
740752
stepFunctionsClient.describeActivity(describeRequest);
741753
return "";
742754
});
@@ -749,13 +761,15 @@ private static void setupStepFunctions() {
749761
AWSStepFunctionsClient.builder()
750762
.withCredentials(CREDENTIALS_PROVIDER)
751763
.withEndpointConfiguration(
752-
new EndpointConfiguration("http://error.test:8080", Regions.US_WEST_2.getName()))
764+
new EndpointConfiguration(
765+
"http://error.test:8080", Regions.US_WEST_2.getName()))
753766
.build();
754767

755768
try {
756769
var describeRequest =
757770
new DescribeActivityRequest()
758-
.withActivityArn("arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity");
771+
.withActivityArn(
772+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity");
759773
errorClient.describeActivity(describeRequest);
760774
} catch (Exception e) {
761775
logger.error("Error describing activity", e);
@@ -771,13 +785,15 @@ private static void setupStepFunctions() {
771785
AWSStepFunctionsClient.builder()
772786
.withCredentials(CREDENTIALS_PROVIDER)
773787
.withEndpointConfiguration(
774-
new EndpointConfiguration("http://fault.test:8080", Regions.US_WEST_2.getName()))
788+
new EndpointConfiguration(
789+
"http://fault.test:8080", Regions.US_WEST_2.getName()))
775790
.build();
776791

777792
try {
778793
var describeRequest =
779794
new DescribeActivityRequest()
780-
.withActivityArn("arn:aws:states:us-west-2:000000000000:activity:fault-activity");
795+
.withActivityArn(
796+
"arn:aws:states:us-west-2:000000000000:activity:fault-activity");
781797
faultClient.describeActivity(describeRequest);
782798
} catch (Exception e) {
783799
logger.error("Error describing activity", e);

‎appsignals-tests/images/aws-sdk/aws-sdk-v2/src/main/java/com/amazon/sampleapp/App.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,8 @@ private static void setupSecretsManager() {
597597
try {
598598
var describeRequest =
599599
DescribeSecretRequest.builder()
600-
.secretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id")
600+
.secretId(
601+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id")
601602
.build();
602603
errorClient.describeSecret(describeRequest);
603604
} catch (Exception e) {
@@ -619,7 +620,8 @@ private static void setupSecretsManager() {
619620
try {
620621
var describeRequest =
621622
DescribeSecretRequest.builder()
622-
.secretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id")
623+
.secretId(
624+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id")
623625
.build();
624626
faultClient.describeSecret(describeRequest);
625627
} catch (Exception e) {
@@ -718,8 +720,7 @@ private static void setupSfn() {
718720
.definition(stateMachineDefinition)
719721
.type(StateMachineType.STANDARD)
720722
.build();
721-
existingStateMachineArn =
722-
sfnClient.createStateMachine(sfnRequest).stateMachineArn();
723+
existingStateMachineArn = sfnClient.createStateMachine(sfnRequest).stateMachineArn();
723724
}
724725

725726
var activityName = "test-activity";
@@ -782,7 +783,8 @@ private static void setupSfn() {
782783
try {
783784
var describeRequest =
784785
DescribeActivityRequest.builder()
785-
.activityArn("arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")
786+
.activityArn(
787+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")
786788
.build();
787789
errorClient.describeActivity(describeRequest);
788790
} catch (Exception e) {

0 commit comments

Comments
 (0)