Skip to content

Commit 41bbc09

Browse files
author
Jeel Mehta
committed
Temporary disabling the validation, EMF logs, traces and metrics
1 parent a5adf6b commit 41bbc09

File tree

2 files changed

+49
-49
lines changed

2 files changed

+49
-49
lines changed

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

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -172,56 +172,56 @@ jobs:
172172
sleep_time: 60
173173

174174
# 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'
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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private Map<String, Object> getActualOtelSpanLog(String operation, String remote
237237
private Map<String, Object> getActualOtlpSigV4Log() throws Exception {
238238
// Filter pattern to match OTLP SigV4 logs
239239
String filterPattern = String.format(
240-
"{ ($.resource.attributes.[\"service.name\"] = \"%s\") && $.body EXISTS && $.severityNumber EXISTS && $.severityText EXISTS }",
240+
"{ ($.attributes.[\'service.name\'] = \"%s\") && $.body EXISTS && $.severityNumber EXISTS && $.severityText EXISTS }",
241241
context.getServiceName()
242242
);
243243
log.info("Filter Pattern for OTLP SigV4 Log Search: " + filterPattern);

0 commit comments

Comments
 (0)