Skip to content

[Python] Renaming files and folders associated with Python SigV4 logs Release Testing #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2025
Merged

[Python] Renaming files and folders associated with Python SigV4 logs Release Testing #414

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cccac45
refactor: standardize Python SigV4 test file naming convention
Jun 10, 2025
3dd3d26
Reverting the changes added to make the workflow run
Jun 10, 2025
b21b628
Testing after making some formatting changes
Jun 10, 2025
a1c8d33
Reverting back the changes made to run the workflow
Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-ec2-adot-sigv4-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ jobs:
--rollup'

- name: Validate generated otlp logs
id: log-validation-1
run: ./gradlew validator:run --args='-c python/ec2/adot-aws-otlp/logs/log-validation.yml
id: application-log-validation
run: ./gradlew validator:run --args='-c python/ec2/adot-aws-otlp/logs/application-log-validation.yml
--testing-id ${{ env.TESTING_ID }}
--endpoint http://localhost:8000
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
Expand Down
30 changes: 15 additions & 15 deletions validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,26 +222,26 @@ public enum PredefinedExpectedTemplate implements FileConfig {

/** Python EC2 ADOT SigV4 (Stand Alone ADOT) Test Case Validations */
PYTHON_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_LOG(
"/expected-data-template/python/ec2/adot-aws-otlp/traces/outgoing-http-call-log.mustache"),
"/expected-data-template/python/ec2/adot-aws-otlp/outgoing-http-call-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_METRIC(
"/expected-data-template/python/ec2/adot-aws-otlp/traces/outgoing-http-call-metric.mustache"),
"/expected-data-template/python/ec2/adot-aws-otlp/outgoing-http-call-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_TRACE(
"/expected-data-template/python/ec2/adot-aws-otlp/traces/outgoing-http-call-trace.mustache"),
"/expected-data-template/python/ec2/adot-aws-otlp/outgoing-http-call-trace.mustache"),

PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_LOG("/expected-data-template/python/ec2/adot-aws-otlp/traces/aws-sdk-call-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/traces/aws-sdk-call-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/traces/aws-sdk-call-trace.mustache"),
PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_LOG("/expected-data-template/python/ec2/adot-aws-otlp/aws-sdk-call-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/aws-sdk-call-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_AWS_SDK_CALL_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/aws-sdk-call-trace.mustache"),

PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_LOG("/expected-data-template/python/ec2/adot-aws-otlp/traces/remote-service-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/traces/remote-service-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/traces/remote-service-trace.mustache"),
PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_LOG("/expected-data-template/python/ec2/adot-aws-otlp/remote-service-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/remote-service-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_REMOTE_SERVICE_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/remote-service-trace.mustache"),

PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_LOG("/expected-data-template/python/ec2/adot-aws-otlp/traces/client-call-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/traces/client-call-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/traces/client-call-trace.mustache"),
PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_LOG("/expected-data-template/python/ec2/adot-aws-otlp/client-call-log.mustache"),
PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_METRIC("/expected-data-template/python/ec2/adot-aws-otlp/client-call-metric.mustache"),
PYTHON_EC2_ADOT_SIGV4_CLIENT_CALL_TRACE("/expected-data-template/python/ec2/adot-aws-otlp/client-call-trace.mustache"),

/** Python EC2 ADOT SigV4 Log Exporter Test Case Validation */
PYTHON_EC2_ADOT_OTLP_LOG("/expected-data-template/python/ec2/adot-aws-otlp/logs/log.mustache"),
PYTHON_EC2_ADOT_OTLP_LOG("/expected-data-template/python/ec2/adot-aws-otlp/logs/application-log.mustache"),

/** Python K8S Test Case Validations */
PYTHON_K8S_OUTGOING_HTTP_CALL_LOG("/expected-data-template/python/k8s/outgoing-http-call-log.mustache"),
Expand Down Expand Up @@ -326,7 +326,7 @@ public enum PredefinedExpectedTemplate implements FileConfig {
DOTNET_EC2_ASG_CLIENT_CALL_METRIC("/expected-data-template/dotnet/ec2/asg/client-call-metric.mustache"),
DOTNET_EC2_ASG_CLIENT_CALL_TRACE("/expected-data-template/dotnet/ec2/asg/client-call-trace.mustache"),

/** Python EC2 ADOT SigV4 (Stand Alone ADOT) Test Case Validations */
/** DotNet EC2 ADOT SigV4 (Stand Alone ADOT) Test Case Validations */
DOTNET_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_LOG(
"/expected-data-template/dotnet/ec2/adot-sigv4/outgoing-http-call-log.mustache"),
DOTNET_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_METRIC(
Expand Down Expand Up @@ -449,7 +449,7 @@ public enum PredefinedExpectedTemplate implements FileConfig {
NODE_K8S_CLIENT_CALL_METRIC("/expected-data-template/node/k8s/client-call-metric.mustache"),
NODE_K8S_CLIENT_CALL_TRACE("/expected-data-template/node/k8s/client-call-trace.mustache"),

/** Python EC2 ADOT SigV4 (Stand Alone ADOT) Test Case Validations */
/** Node EC2 ADOT SigV4 (Stand Alone ADOT) Test Case Validations */
NODE_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_LOG(
"/expected-data-template/node/ec2/adot-sigv4/outgoing-http-call-log.mustache"),
NODE_EC2_ADOT_SIGV4_OUTGOING_HTTP_CALL_METRIC(
Expand Down
0 ...aws-otlp/traces/aws-sdk-call-log.mustache → ...2/adot-aws-otlp/aws-sdk-call-log.mustache
View file
Open in desktop
File renamed without changes.
0 ...-otlp/traces/aws-sdk-call-metric.mustache → ...dot-aws-otlp/aws-sdk-call-metric.mustache
View file
Open in desktop
File renamed without changes.
0 ...s-otlp/traces/aws-sdk-call-trace.mustache → ...adot-aws-otlp/aws-sdk-call-trace.mustache
View file
Open in desktop
File renamed without changes.
0 ...-aws-otlp/traces/client-call-log.mustache → ...c2/adot-aws-otlp/client-call-log.mustache
View file
Open in desktop
File renamed without changes.
0 ...s-otlp/traces/client-call-metric.mustache → ...adot-aws-otlp/client-call-metric.mustache
View file
Open in desktop
File renamed without changes.
0 ...ws-otlp/traces/client-call-trace.mustache → .../adot-aws-otlp/client-call-trace.mustache
View file
Open in desktop
File renamed without changes.
0 ...ython/ec2/adot-aws-otlp/logs/log.mustache → ...ot-aws-otlp/logs/application-log.mustache
View file
Open in desktop
File renamed without changes.
0 ...lp/traces/outgoing-http-call-log.mustache → ...-aws-otlp/outgoing-http-call-log.mustache
View file
Open in desktop
File renamed without changes.
0 ...traces/outgoing-http-call-metric.mustache → ...s-otlp/outgoing-http-call-metric.mustache
View file
Open in desktop
File renamed without changes.
0 .../traces/outgoing-http-call-trace.mustache → ...ws-otlp/outgoing-http-call-trace.mustache
View file
Open in desktop
File renamed without changes.
0 ...s-otlp/traces/remote-service-log.mustache → ...adot-aws-otlp/remote-service-log.mustache
View file
Open in desktop
File renamed without changes.
0 ...tlp/traces/remote-service-metric.mustache → ...t-aws-otlp/remote-service-metric.mustache
View file
Open in desktop
File renamed without changes.
0 ...otlp/traces/remote-service-trace.mustache → ...ot-aws-otlp/remote-service-trace.mustache
View file
Open in desktop
File renamed without changes.
0 ...ec2/adot-aws-otlp/logs/log-validation.yml → ...-otlp/logs/application-log-validation.yml
View file
Open in desktop
File renamed without changes.
Loading