Skip to content

Java sig v4 test #396

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 9 commits into from
May 5, 2025
+10 −10
Merged

Java sig v4 test #396

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7e5835
Testing ADOT JAVA SigV4 Standalone test
Apr 28, 2025
3e856ec
end
Apr 28, 2025
49010af
Fixing the env variables for java-version and cpu since it is include…
Apr 29, 2025
af617ab
Fixing the operation names to be consistent with the changes in the b…
Apr 30, 2025
55451a6
Test 1
May 1, 2025
eaa9fe0
Final changes
May 1, 2025
047b9c4
Testing with changing variable value in logs and traces
May 1, 2025
132d536
Reverting the changes
May 2, 2025
9cfe823
Merge branch 'main' into Java_SigV4_Test
harrryr May 5, 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
23 changes: 13 additions & 10 deletions .github/workflows/java-ec2-adot-sigv4-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
# This test case validates ADOT used on its own to send traces to the X-Ray OTLP endpoint with SigV4 authentication
name: Java EC2 ADOT SigV4 (Stand-Alone ADOT) Use Case
on:
push:
branches:
- Java_SigV4_Test
workflow_call:
inputs:
caller-workflow-name:
Expand Down Expand Up @@ -37,8 +40,8 @@ env:
E2E_TEST_AWS_REGION: 'us-west-2' # Test uses us-west-2 in the us-east-1 accoun
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
METRIC_NAMESPACE: ApplicationSignals
JAVA_VERSION: ${{ inputs.java-version }}
CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }}
JAVA_VERSION: ${{ inputs.java-version || '11' }}
CPU_ARCHITECTURE: ${{ inputs.cpu-architecture || 'x86_64' }}
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }} # us-east-1 test account
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
LOG_GROUP_NAME: aws/spans
Expand Down Expand Up @@ -86,11 +89,11 @@ jobs:

- name: Set ADOT getter command environment variable
run: |
if [ "${{ github.event.repository.name }}" = "aws-otel-java-instrumentation" ]; then
echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV
else
echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" >> $GITHUB_ENV
fi
# if [ "${{ github.event.repository.name }}" = "aws-otel-java-instrumentation" ]; then
echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV
# else
# echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" >> $GITHUB_ENV
# fi

- name: Set up terraform
uses: ./.github/workflows/actions/execute_and_retry
Expand Down Expand Up @@ -181,7 +184,7 @@ jobs:
run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/log-validation.yml
--testing-id ${{ env.TESTING_ID }}
--endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
--remote-service-deployment-name sample-remote-application-${{ env.TESTING_ID }}
--region ${{ env.E2E_TEST_AWS_REGION }}
--account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
--metric-namespace ${{ env.METRIC_NAMESPACE }}
Expand All @@ -199,7 +202,7 @@ jobs:
run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/metric-validation.yml
--testing-id ${{ env.TESTING_ID }}
--endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
--remote-service-deployment-name sample-remote-application-${{ env.TESTING_ID }}
--region ${{ env.E2E_TEST_AWS_REGION }}
--account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
--metric-namespace ${{ env.METRIC_NAMESPACE }}
Expand All @@ -217,7 +220,7 @@ jobs:
run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/trace-validation.yml
--testing-id ${{ env.TESTING_ID }}
--endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
--remote-service-deployment-name sample-remote-application-${{ env.TESTING_ID }}
--region ${{ env.E2E_TEST_AWS_REGION }}
--account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
--metric-namespace ${{ env.METRIC_NAMESPACE }}
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/resources/expected-data-template/java/ec2/adot-sigv4/aws-sdk-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -94,7 +94,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -170,7 +170,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down
6 changes: 3 additions & 3 deletions ...n/resources/expected-data-template/java/ec2/adot-sigv4/outgoing-http-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -94,7 +94,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -170,7 +170,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down
22 changes: 11 additions & 11 deletions .../main/resources/expected-data-template/java/ec2/adot-sigv4/remote-service-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /remote-service
-
name: Service
value: {{serviceName}}
Expand All @@ -30,7 +30,7 @@
value: GET /healthcheck
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Latency
Expand Down Expand Up @@ -80,7 +80,7 @@
value: ec2:default
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Latency
Expand All @@ -97,15 +97,15 @@
value: GET /healthcheck
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Latency
namespace: {{metricNamespace}}
dimensions:
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Error
Expand All @@ -127,7 +127,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /remote-service
-
name: Service
value: {{serviceName}}
Expand All @@ -139,7 +139,7 @@
value: GET /healthcheck
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Error
Expand Down Expand Up @@ -189,7 +189,7 @@
value: ec2:default
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Error
Expand All @@ -206,15 +206,15 @@
value: GET /healthcheck
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Error
namespace: {{metricNamespace}}
dimensions:
-
name: RemoteService
value: {{remoteServiceDeploymentName}}
value: {{remoteServiceName}}

-
metricName: Fault
Expand All @@ -236,7 +236,7 @@
dimensions:
-
name: Operation
value: UnmappedOperation
value: GET /remote-service
-
name: Service
value: {{serviceName}}
Expand Down
Loading