Skip to content

Commit e108f4f

Browse files
authored
Export OT components via performance.json (#168)
1 parent a87b2cc commit e108f4f

File tree

7 files changed

+31
-4
lines changed

7 files changed

+31
-4
lines changed

terraform/ec2/outputs.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ output "sample_app_instance_id" {
2121
output "testing_id" {
2222
value = module.common.testing_id
2323
}
24+
25+
output "otconfig_content" {
26+
value = module.basic_components.otconfig_content
27+
}

terraform/ec2_setup/outputs.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ output "launch_date" {
4949
value = local.launch_date
5050
}
5151

52+
output "otconfig_content" {
53+
value = module.ec2_setup.otconfig_content
54+
}

terraform/performance/main.tf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ module "ec2_setup" {
4848
locals{
4949
validation_config_file = "performance_validation.yml"
5050
ami_family = module.ec2_setup.ami_family
51+
otconfig = yamldecode(module.ec2_setup.otconfig_content)
52+
ot_components = lookup(local.otconfig["service"]["pipelines"], "${var.soaking_data_mode}s", {})
53+
ot_receivers = lookup(local.ot_components, "receivers", [])
54+
ot_processors = lookup(local.ot_components, "processors", [])
55+
ot_exporters = lookup(local.ot_components, "exporters", [])
5156
}
5257

5358
data "template_file" "validation_config" {
@@ -58,8 +63,11 @@ data "template_file" "validation_config" {
5863
memoryMetricName = local.ami_family["soaking_mem_metric_name"]
5964
collectionPeriod = var.collection_period
6065
dataType = var.data_type
61-
dataRate = var.data_rate
6266
dataMode = var.soaking_data_mode
67+
dataRate = var.data_rate
68+
otReceivers = join(", ", local.ot_receivers)
69+
otProcessors = join(", ", local.ot_processors)
70+
otExporters = join(", ", local.ot_exporters)
6371
testcase = split("/", var.testcase)[2]
6472
commitId = module.ec2_setup.commit_id
6573
instanceId = module.ec2_setup.collector_instance_id

terraform/templates/defaults/performance_validation.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
dataType: "${dataType}"
88
dataMode: "${dataMode}"
99
dataRate: ${dataRate}
10+
otReceivers: [${otReceivers}]
11+
otProcessors: [${otProcessors}]
12+
otExporters: [${otExporters}]
1013
testcase: "${testcase}"
1114
commitId: "${commitId}"
1215
instanceId: "${instanceId}"

validator/src/main/java/com/amazon/aoc/models/PerformanceResult.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
public class PerformanceResult implements Serializable {
2525
@NonNull private String testcase;
2626
@NonNull private String instanceType;
27-
@NonNull private String testingAmi;
27+
@NonNull private String[] receivers;
28+
@NonNull private String[] processors;
29+
@NonNull private String[] exporters;
2830

2931
@NonNull private String dataType;
3032
@NonNull private String dataMode;
@@ -37,4 +39,5 @@ public class PerformanceResult implements Serializable {
3739
// Metadata
3840
@NonNull private String commitId;
3941
@NonNull private Integer collectionPeriod;
42+
@NonNull private String testingAmi;
4043
}

validator/src/main/java/com/amazon/aoc/models/ValidationConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class ValidationConfig {
4949
String dataType;
5050
String dataMode;
5151
Integer dataRate;
52+
String[] otReceivers;
53+
String[] otProcessors;
54+
String[] otExporters;
5255

5356
// Dimensions
5457
String testcase;

validator/src/main/java/com/amazon/aoc/validators/PerformanceValidator.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,17 @@ public void validate() throws Exception {
110110
final PerformanceResult result = new PerformanceResult(
111111
validationConfig.getTestcase(),
112112
validationConfig.getInstanceType(),
113-
validationConfig.getTestingAmi(),
113+
validationConfig.getOtReceivers(),
114+
validationConfig.getOtProcessors(),
115+
validationConfig.getOtExporters(),
114116
validationConfig.getDataType(),
115117
validationConfig.getDataMode(),
116118
validationConfig.getDataRate(),
117119
avgCpu,
118120
avgMemory,
119121
validationConfig.getCommitId(),
120-
validationConfig.getCollectionPeriod()
122+
validationConfig.getCollectionPeriod(),
123+
validationConfig.getTestingAmi()
121124
);
122125

123126
try {

0 commit comments

Comments
 (0)