Skip to content

Commit 8a47155

Browse files
yiyuan-heyiyuan-he
committed
cleanup
1 parent eaf1cc8 commit 8a47155

File tree

3 files changed

+130
-96
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

+130
-96
lines changed

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

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package software.amazon.opentelemetry.appsignals.test.awssdk.base;
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.assertj.core.api.Assertions.within;
2019

2120
import io.opentelemetry.proto.common.v1.KeyValue;
2221
import io.opentelemetry.proto.trace.v1.Span.SpanKind;
@@ -227,20 +226,9 @@ protected ThrowingConsumer<KeyValue> assertAttribute(String key, String value) {
227226
var actualValue = attribute.getValue().getStringValue();
228227

229228
if (isValidRegex(value)) {
230-
System.out.println("ASSERTING REGEX: " + actualValue + " equivalent to " + value);
231-
assertThat(actualValue).matches(value);
232-
if (!actualValue.matches(value)) {
233-
System.out.println("ASSERTING ERROR: " + actualValue + " does not match " + value);
234-
}
235-
if (!actualValue.matches(value)) {
236-
System.out.println("ASSERTION FAILED between: " + actualValue + " and " + value);
237-
}
229+
assertThat(actualValue).matches(value);
238230
} else {
239-
System.out.println("ASSERTING EXACT: " + actualValue + " equivalent to " + value);
240231
assertThat(actualValue).isEqualTo(value);
241-
if (!actualValue.equals(value)) {
242-
System.out.println("ASSERTION FAILED between: " + actualValue + " and " + value);
243-
}
244232
}
245233
};
246234
}
@@ -2318,12 +2306,12 @@ protected void doTestSecretsManagerDescribeSecret() throws Exception {
23182306
protected void doTestSecretsManagerError() throws Exception {
23192307
appClient.get("/secretsmanager/error").aggregate().join();
23202308
var traces = mockCollectorClient.getTraces();
2321-
var metrics = mockCollectorClient.getMetrics(
2322-
Set.of(
2323-
AppSignalsConstants.ERROR_METRIC,
2324-
AppSignalsConstants.FAULT_METRIC,
2325-
AppSignalsConstants.LATENCY_METRIC
2326-
));
2309+
var metrics =
2310+
mockCollectorClient.getMetrics(
2311+
Set.of(
2312+
AppSignalsConstants.ERROR_METRIC,
2313+
AppSignalsConstants.FAULT_METRIC,
2314+
AppSignalsConstants.LATENCY_METRIC));
23272315

23282316
var localService = getApplicationOtelServiceName();
23292317
var localOperation = "GET /secretsmanager/error";
@@ -2382,12 +2370,12 @@ protected void doTestSecretsManagerError() throws Exception {
23822370
protected void doTestSecretsManagerFault() throws Exception {
23832371
appClient.get("/secretsmanager/fault").aggregate().join();
23842372
var traces = mockCollectorClient.getTraces();
2385-
var metrics = mockCollectorClient.getMetrics(
2386-
Set.of(
2387-
AppSignalsConstants.ERROR_METRIC,
2388-
AppSignalsConstants.FAULT_METRIC,
2389-
AppSignalsConstants.LATENCY_METRIC
2390-
));
2373+
var metrics =
2374+
mockCollectorClient.getMetrics(
2375+
Set.of(
2376+
AppSignalsConstants.ERROR_METRIC,
2377+
AppSignalsConstants.FAULT_METRIC,
2378+
AppSignalsConstants.LATENCY_METRIC));
23912379

23922380
var localService = getApplicationOtelServiceName();
23932381
var localOperation = "GET /secretsmanager/fault";
@@ -2517,11 +2505,12 @@ protected void doTestStepFunctionsDescribeStateMachine() throws Exception {
25172505
protected void doTestStepFunctionsDescribeActivity() throws Exception {
25182506
appClient.get("/sfn/describeactivity/test-activity").aggregate().join();
25192507
var traces = mockCollectorClient.getTraces();
2520-
var metrics = mockCollectorClient.getMetrics(
2521-
Set.of(
2522-
AppSignalsConstants.ERROR_METRIC,
2523-
AppSignalsConstants.FAULT_METRIC,
2524-
AppSignalsConstants.LATENCY_METRIC));
2508+
var metrics =
2509+
mockCollectorClient.getMetrics(
2510+
Set.of(
2511+
AppSignalsConstants.ERROR_METRIC,
2512+
AppSignalsConstants.FAULT_METRIC,
2513+
AppSignalsConstants.LATENCY_METRIC));
25252514

25262515
var localService = getApplicationOtelServiceName();
25272516
var localOperation = "GET /sfn/describeactivity/:name";
@@ -2586,17 +2575,19 @@ protected void doTestStepFunctionsDescribeActivity() throws Exception {
25862575
protected void doTestStepFunctionsError() throws Exception {
25872576
appClient.get("/sfn/error").aggregate().join();
25882577
var traces = mockCollectorClient.getTraces();
2589-
var metrics = mockCollectorClient.getMetrics(
2590-
Set.of(
2591-
AppSignalsConstants.ERROR_METRIC,
2592-
AppSignalsConstants.FAULT_METRIC,
2593-
AppSignalsConstants.LATENCY_METRIC));
2578+
var metrics =
2579+
mockCollectorClient.getMetrics(
2580+
Set.of(
2581+
AppSignalsConstants.ERROR_METRIC,
2582+
AppSignalsConstants.FAULT_METRIC,
2583+
AppSignalsConstants.LATENCY_METRIC));
25942584

25952585
var localService = getApplicationOtelServiceName();
25962586
var localOperation = "GET /sfn/error";
25972587
var type = "AWS::StepFunctions::Activity";
25982588
var identifier = "nonexistent-activity";
2599-
var cloudformationIdentifier = "arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity";
2589+
var cloudformationIdentifier =
2590+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity";
26002591

26012592
assertSpanClientAttributes(
26022593
traces,
@@ -2615,7 +2606,8 @@ protected void doTestStepFunctionsError() throws Exception {
26152606
400,
26162607
List.of(
26172608
assertAttribute(
2618-
SemanticConventionsConstants.AWS_ACTIVITY_ARN, "arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")));
2609+
SemanticConventionsConstants.AWS_ACTIVITY_ARN,
2610+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")));
26192611
assertMetricClientAttributes(
26202612
metrics,
26212613
AppSignalsConstants.LATENCY_METRIC,
@@ -2654,11 +2646,12 @@ protected void doTestStepFunctionsError() throws Exception {
26542646
protected void doTestStepFunctionsFault() throws Exception {
26552647
appClient.get("/sfn/fault").aggregate().join();
26562648
var traces = mockCollectorClient.getTraces();
2657-
var metrics = mockCollectorClient.getMetrics(
2658-
Set.of(
2659-
AppSignalsConstants.ERROR_METRIC,
2660-
AppSignalsConstants.FAULT_METRIC,
2661-
AppSignalsConstants.LATENCY_METRIC));
2649+
var metrics =
2650+
mockCollectorClient.getMetrics(
2651+
Set.of(
2652+
AppSignalsConstants.ERROR_METRIC,
2653+
AppSignalsConstants.FAULT_METRIC,
2654+
AppSignalsConstants.LATENCY_METRIC));
26622655

26632656
var localService = getApplicationOtelServiceName();
26642657
var localOperation = "GET /sfn/fault";

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

Lines changed: 53 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,19 @@ private static void setupSecretsManager() {
689689
"/secretsmanager/error",
690690
(req, res) -> {
691691
setMainStatus(400);
692-
var errorClient = AWSSecretsManagerClient.builder().withCredentials(CREDENTIALS_PROVIDER)
693-
.withEndpointConfiguration(new EndpointConfiguration("http://error.test:8080", Regions.US_WEST_2.getName()))
694-
.build();
692+
var errorClient =
693+
AWSSecretsManagerClient.builder()
694+
.withCredentials(CREDENTIALS_PROVIDER)
695+
.withEndpointConfiguration(
696+
new EndpointConfiguration(
697+
"http://error.test:8080", Regions.US_WEST_2.getName()))
698+
.build();
695699

696700
try {
697-
var describeRequest = new DescribeSecretRequest().withSecretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id");
701+
var describeRequest =
702+
new DescribeSecretRequest()
703+
.withSecretId(
704+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id");
698705
errorClient.describeSecret(describeRequest);
699706
} catch (Exception e) {
700707
logger.info("Error describing secret", e);
@@ -706,12 +713,19 @@ private static void setupSecretsManager() {
706713
"/secretsmanager/fault",
707714
(req, res) -> {
708715
setMainStatus(500);
709-
var errorClient = AWSSecretsManagerClient.builder().withCredentials(CREDENTIALS_PROVIDER)
710-
.withEndpointConfiguration(new EndpointConfiguration("http://fault.test:8080", Regions.US_WEST_2.getName()))
711-
.build();
716+
var errorClient =
717+
AWSSecretsManagerClient.builder()
718+
.withCredentials(CREDENTIALS_PROVIDER)
719+
.withEndpointConfiguration(
720+
new EndpointConfiguration(
721+
"http://fault.test:8080", Regions.US_WEST_2.getName()))
722+
.build();
712723

713724
try {
714-
var describeRequest = new DescribeSecretRequest().withSecretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id");
725+
var describeRequest =
726+
new DescribeSecretRequest()
727+
.withSecretId(
728+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id");
715729
errorClient.describeSecret(describeRequest);
716730
} catch (Exception e) {
717731
logger.info("Error describing secret", e);
@@ -819,11 +833,12 @@ private static void setupStepFunctions() {
819833
try {
820834
var listRequest = new ListActivitiesRequest();
821835
var listResponse = stepFunctionsClient.listActivities(listRequest);
822-
existingActivityArn = listResponse.getActivities().stream()
823-
.filter(activity -> activity.getName().equals(activityName))
824-
.findFirst()
825-
.map(ActivityListItem::getActivityArn)
826-
.orElse(null);
836+
existingActivityArn =
837+
listResponse.getActivities().stream()
838+
.filter(activity -> activity.getName().equals(activityName))
839+
.findFirst()
840+
.map(ActivityListItem::getActivityArn)
841+
.orElse(null);
827842
} catch (Exception e) {
828843
logger.error("Error listing activities", e);
829844
}
@@ -851,7 +866,8 @@ private static void setupStepFunctions() {
851866
get(
852867
"/sfn/describeactivity/:name",
853868
(req, res) -> {
854-
var describeRequest = new DescribeActivityRequest().withActivityArn(finalExistingActivityArn);
869+
var describeRequest =
870+
new DescribeActivityRequest().withActivityArn(finalExistingActivityArn);
855871
stepFunctionsClient.describeActivity(describeRequest);
856872
return "";
857873
});
@@ -860,12 +876,19 @@ private static void setupStepFunctions() {
860876
"/sfn/error",
861877
(req, res) -> {
862878
setMainStatus(400);
863-
var errorClient = AWSStepFunctionsClient.builder().withCredentials(CREDENTIALS_PROVIDER)
864-
.withEndpointConfiguration(new EndpointConfiguration("http://error.test:8080", Regions.US_WEST_2.getName()))
865-
.build();
879+
var errorClient =
880+
AWSStepFunctionsClient.builder()
881+
.withCredentials(CREDENTIALS_PROVIDER)
882+
.withEndpointConfiguration(
883+
new EndpointConfiguration(
884+
"http://error.test:8080", Regions.US_WEST_2.getName()))
885+
.build();
866886

867887
try {
868-
var describeRequest = new DescribeActivityRequest().withActivityArn("arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity");
888+
var describeRequest =
889+
new DescribeActivityRequest()
890+
.withActivityArn(
891+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity");
869892
errorClient.describeActivity(describeRequest);
870893
} catch (Exception e) {
871894
logger.info("Error caught in Sample App", e);
@@ -877,18 +900,24 @@ private static void setupStepFunctions() {
877900
"/sfn/fault",
878901
(req, res) -> {
879902
setMainStatus(500);
880-
var faultClient = AWSStepFunctionsClient.builder().withCredentials(CREDENTIALS_PROVIDER)
881-
.withEndpointConfiguration(new EndpointConfiguration("http://fault.test:8080", Regions.US_WEST_2.getName()))
882-
.build();
903+
var faultClient =
904+
AWSStepFunctionsClient.builder()
905+
.withCredentials(CREDENTIALS_PROVIDER)
906+
.withEndpointConfiguration(
907+
new EndpointConfiguration(
908+
"http://fault.test:8080", Regions.US_WEST_2.getName()))
909+
.build();
883910

884911
try {
885-
var describeRequest = new DescribeActivityRequest()
886-
.withActivityArn("arn:aws:states:us-west-2:000000000000:activity:fault-activity");
912+
var describeRequest =
913+
new DescribeActivityRequest()
914+
.withActivityArn(
915+
"arn:aws:states:us-west-2:000000000000:activity:fault-activity");
887916
faultClient.describeActivity(describeRequest);
888917
} catch (Exception e) {
889918
logger.info("Error caught in Sample App", e);
890919
}
891-
return"";
920+
return "";
892921
});
893922
}
894923
}

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

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -715,15 +715,18 @@ private static void setupSecretsManager() {
715715
"/secretsmanager/error",
716716
(req, res) -> {
717717
setMainStatus(400);
718-
var errorClient = SecretsManagerClient.builder()
719-
.endpointOverride(URI.create("http://error.test:8080"))
720-
.credentialsProvider(CREDENTIALS_PROVIDER)
721-
.build();
718+
var errorClient =
719+
SecretsManagerClient.builder()
720+
.endpointOverride(URI.create("http://error.test:8080"))
721+
.credentialsProvider(CREDENTIALS_PROVIDER)
722+
.build();
722723

723724
try {
724-
var describeRequest = DescribeSecretRequest.builder()
725-
.secretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id")
726-
.build();
725+
var describeRequest =
726+
DescribeSecretRequest.builder()
727+
.secretId(
728+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:nonexistent-secret-id")
729+
.build();
727730
errorClient.describeSecret(describeRequest);
728731
} catch (Exception e) {
729732
logger.info("Error describing secret", e);
@@ -741,9 +744,11 @@ private static void setupSecretsManager() {
741744
.build();
742745

743746
try {
744-
var describeRequest = DescribeSecretRequest.builder()
745-
.secretId("arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id")
746-
.build();
747+
var describeRequest =
748+
DescribeSecretRequest.builder()
749+
.secretId(
750+
"arn:aws:secretsmanager:us-west-2:000000000000:secret:fault-secret-id")
751+
.build();
747752
faultClient.describeSecret(describeRequest);
748753
} catch (Exception e) {
749754
logger.info("Fault caught in Sample App", e);
@@ -854,11 +859,12 @@ private static void setupStepFunctions() {
854859
try {
855860
var listRequest = ListActivitiesRequest.builder().build();
856861
var listResponse = sfnClient.listActivities(listRequest);
857-
existingActivityArn = listResponse.activities().stream()
858-
.filter(activity -> activity.name().equals(activityName))
859-
.findFirst()
860-
.map(ActivityListItem::activityArn)
861-
.orElse(null);
862+
existingActivityArn =
863+
listResponse.activities().stream()
864+
.filter(activity -> activity.name().equals(activityName))
865+
.findFirst()
866+
.map(ActivityListItem::activityArn)
867+
.orElse(null);
862868
} catch (Exception e) {
863869
logger.error("Error listing activities", e);
864870
}
@@ -887,7 +893,8 @@ private static void setupStepFunctions() {
887893
get(
888894
"/sfn/describeactivity/:name",
889895
(req, res) -> {
890-
var describeRequest = DescribeActivityRequest.builder().activityArn(finalExistingActivityArn).build();
896+
var describeRequest =
897+
DescribeActivityRequest.builder().activityArn(finalExistingActivityArn).build();
891898
sfnClient.describeActivity(describeRequest);
892899
return "";
893900
});
@@ -896,15 +903,18 @@ private static void setupStepFunctions() {
896903
"/sfn/error",
897904
(req, res) -> {
898905
setMainStatus(400);
899-
var errorClient = SfnClient.builder()
900-
.endpointOverride(URI.create("http://error.test:8080"))
901-
.credentialsProvider(CREDENTIALS_PROVIDER)
902-
.build();
906+
var errorClient =
907+
SfnClient.builder()
908+
.endpointOverride(URI.create("http://error.test:8080"))
909+
.credentialsProvider(CREDENTIALS_PROVIDER)
910+
.build();
903911

904912
try {
905-
var describeRequest = DescribeActivityRequest.builder()
906-
.activityArn("arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")
907-
.build();
913+
var describeRequest =
914+
DescribeActivityRequest.builder()
915+
.activityArn(
916+
"arn:aws:states:us-west-2:000000000000:activity:nonexistent-activity")
917+
.build();
908918
errorClient.describeActivity(describeRequest);
909919
} catch (Exception e) {
910920
logger.info("Error caught in Sample App", e);
@@ -916,15 +926,17 @@ private static void setupStepFunctions() {
916926
"/sfn/fault",
917927
(req, res) -> {
918928
setMainStatus(500);
919-
var faultClient = SfnClient.builder()
920-
.endpointOverride(URI.create("http://fault.test:8080"))
921-
.credentialsProvider(CREDENTIALS_PROVIDER)
922-
.build();
929+
var faultClient =
930+
SfnClient.builder()
931+
.endpointOverride(URI.create("http://fault.test:8080"))
932+
.credentialsProvider(CREDENTIALS_PROVIDER)
933+
.build();
923934

924935
try {
925-
var describeRequest = DescribeActivityRequest.builder()
926-
.activityArn("arn:aws:states:us-west-2:000000000000:activity:fault-activity")
927-
.build();
936+
var describeRequest =
937+
DescribeActivityRequest.builder()
938+
.activityArn("arn:aws:states:us-west-2:000000000000:activity:fault-activity")
939+
.build();
928940
faultClient.describeActivity(describeRequest);
929941
} catch (Exception e) {
930942
logger.info("Fault caught in Sample App", e);

0 commit comments

Comments
 (0)