Skip to content

Commit c8adccf

Browse files
author
Jeel Mehta
committed
Test run
1 parent 59b897c commit c8adccf

File tree

2 files changed

+53
-62
lines changed

2 files changed

+53
-62
lines changed

‎.github/workflows/python-ec2-adot-sigv4-test.yml‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -171,57 +171,57 @@ jobs:
171171
max_retry: 3
172172
sleep_time: 60
173173

174-
# Validation for pulse telemetry data
175-
# - name: Validate generated EMF logs
176-
# id: log-validation
177-
# run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/log-validation.yml
178-
# --testing-id ${{ env.TESTING_ID }}
179-
# --endpoint http://localhost:8000
180-
# --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
181-
# --region ${{ env.E2E_TEST_AWS_REGION }}
182-
# --metric-namespace ${{ env.METRIC_NAMESPACE }}
183-
# --log-group ${{ env.LOG_GROUP_NAME }}
184-
# --service-name python-sample-application-${{ env.TESTING_ID }}
185-
# --remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
186-
# --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
187-
# --instance-ami ${{ env.EC2_INSTANCE_AMI }}
188-
# --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
189-
# --rollup'
174+
Validation for pulse telemetry data
175+
- name: Validate generated EMF logs
176+
id: log-validation
177+
run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/log-validation.yml
178+
--testing-id ${{ env.TESTING_ID }}
179+
--endpoint http://localhost:8000
180+
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
181+
--region ${{ env.E2E_TEST_AWS_REGION }}
182+
--metric-namespace ${{ env.METRIC_NAMESPACE }}
183+
--log-group ${{ env.LOG_GROUP_NAME }}
184+
--service-name python-sample-application-${{ env.TESTING_ID }}
185+
--remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
186+
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
187+
--instance-ami ${{ env.EC2_INSTANCE_AMI }}
188+
--instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
189+
--rollup'
190190

191-
# - name: Validate generated metrics
192-
# id: metric-validation
193-
# if: (success() || steps.log-validation.outcome == 'failure') && !cancelled()
194-
# run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/metric-validation.yml
195-
# --testing-id ${{ env.TESTING_ID }}
196-
# --endpoint http://localhost:8000
197-
# --remote-service-deployment-name python-sample-remote-application-${{ env.TESTING_ID }}
198-
# --region ${{ env.E2E_TEST_AWS_REGION }}
199-
# --metric-namespace ${{ env.METRIC_NAMESPACE }}
200-
# --log-group ${{ env.LOG_GROUP_NAME }}
201-
# --service-name python-sample-application-${{ env.TESTING_ID }}
202-
# --remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
203-
# --query-string ip=${{ env.REMOTE_SERVICE_IP }}
204-
# --instance-ami ${{ env.EC2_INSTANCE_AMI }}
205-
# --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
206-
# --rollup'
191+
- name: Validate generated metrics
192+
id: metric-validation
193+
if: (success() || steps.log-validation.outcome == 'failure') && !cancelled()
194+
run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/metric-validation.yml
195+
--testing-id ${{ env.TESTING_ID }}
196+
--endpoint http://localhost:8000
197+
--remote-service-deployment-name python-sample-remote-application-${{ env.TESTING_ID }}
198+
--region ${{ env.E2E_TEST_AWS_REGION }}
199+
--metric-namespace ${{ env.METRIC_NAMESPACE }}
200+
--log-group ${{ env.LOG_GROUP_NAME }}
201+
--service-name python-sample-application-${{ env.TESTING_ID }}
202+
--remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
203+
--query-string ip=${{ env.REMOTE_SERVICE_IP }}
204+
--instance-ami ${{ env.EC2_INSTANCE_AMI }}
205+
--instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
206+
--rollup'
207207

208-
# - name: Validate generated traces
209-
# id: trace-validation
210-
# if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled()
211-
# run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/trace-validation.yml
212-
# --testing-id ${{ env.TESTING_ID }}
213-
# --endpoint http://localhost:8000
214-
# --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
215-
# --region ${{ env.E2E_TEST_AWS_REGION }}
216-
# --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
217-
# --metric-namespace ${{ env.METRIC_NAMESPACE }}
218-
# --log-group ${{ env.LOG_GROUP_NAME }}
219-
# --service-name python-sample-application-${{ env.TESTING_ID }}
220-
# --remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
221-
# --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
222-
# --instance-ami ${{ env.EC2_INSTANCE_AMI }}
223-
# --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
224-
# --rollup'
208+
- name: Validate generated traces
209+
id: trace-validation
210+
if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled()
211+
run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/trace-validation.yml
212+
--testing-id ${{ env.TESTING_ID }}
213+
--endpoint http://localhost:8000
214+
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
215+
--region ${{ env.E2E_TEST_AWS_REGION }}
216+
--account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
217+
--metric-namespace ${{ env.METRIC_NAMESPACE }}
218+
--log-group ${{ env.LOG_GROUP_NAME }}
219+
--service-name python-sample-application-${{ env.TESTING_ID }}
220+
--remote-service-name python-sample-remote-application-${{ env.TESTING_ID }}
221+
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
222+
--instance-ami ${{ env.EC2_INSTANCE_AMI }}
223+
--instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
224+
--rollup'
225225

226226
- name: Validate generated SigV4 logs
227227
id: log-validation-1
@@ -230,6 +230,7 @@ jobs:
230230
--endpoint http://localhost:8000
231231
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
232232
--region ${{ env.E2E_TEST_AWS_REGION }}
233+
--account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
233234
--metric-namespace ${{ env.METRIC_NAMESPACE }}
234235
--log-group ${{ env.TEST_LOG_GROUP_NAME }}
235236
--service-name python-sample-application-${{ env.TESTING_ID }}

‎validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public void validate() throws Exception {
6868
Map<String, Object> actualLog;
6969

7070
if (isOtlpSigV4Log(expectedAttributes)) {
71-
String traceId = (String) expectedAttributes.get("traceId");
72-
actualLog = this.getActualOtlpSigV4Log(traceId);
71+
actualLog = this.getActualOtlpSigV4Log();
7372
} else {
7473
String operation = (String) expectedAttributes.get("Operation");
7574
String remoteService = (String) expectedAttributes.get("RemoteService");
@@ -235,20 +234,11 @@ private Map<String, Object> getActualOtelSpanLog(String operation, String remote
235234
return JsonFlattener.flattenAsMap(retrievedLogs.get(0).getMessage());
236235
}
237236

238-
private Map<String, Object> getActualOtlpSigV4Log(String traceId) throws Exception {
239-
String filterPattern;
240-
if (traceId != null && !traceId.isEmpty()) {
241-
filterPattern = String.format(
242-
"{ ($.attributes.otelServiceName = \"%s\") && ($.traceId = \"%s\") && ($.body = \"This is a custom log for validation testing\") }",
243-
context.getServiceName(),
244-
traceId
245-
);
246-
} else {
247-
filterPattern = String.format(
237+
private Map<String, Object> getActualOtlpSigV4Log() throws Exception {
238+
String filterPattern= String.format(
248239
"{ ($.attributes.otelServiceName = \"%s\") && ($.body = \"This is a custom log for validation testing\") }",
249240
context.getServiceName()
250241
);
251-
}
252242
log.info("Filter Pattern for OTLP SigV4 Log Search: " + filterPattern);
253243

254244
List<FilteredLogEvent> retrievedLogs =

0 commit comments

Comments
 (0)