diff --git a/.github/workflows/appsignals-e2e-ec2-canary-test.yml b/.github/workflows/appsignals-e2e-ec2-canary-test.yml index 44968e6def..5e4624f865 100644 --- a/.github/workflows/appsignals-e2e-ec2-canary-test.yml +++ b/.github/workflows/appsignals-e2e-ec2-canary-test.yml @@ -14,12 +14,7 @@ permissions: jobs: e2e-canary-test: - strategy: - fail-fast: false - matrix: - aws-region: ['us-east-1', 'us-east-2', 'eu-west-1', 'ap-northeast-1', 'ap-southeast-2'] uses: ./.github/workflows/appsignals-e2e-ec2-test.yml secrets: inherit with: - aws-region: ${{ matrix.aws-region }} caller-workflow-name: 'appsignals-e2e-ec2-canary-test' diff --git a/.github/workflows/appsignals-e2e-ec2-test.yml b/.github/workflows/appsignals-e2e-ec2-test.yml index 6d1334e15c..51f60c76fc 100644 --- a/.github/workflows/appsignals-e2e-ec2-test.yml +++ b/.github/workflows/appsignals-e2e-ec2-test.yml @@ -5,9 +5,6 @@ name: App Signals Enablement E2E Testing - EC2 Use Case on: workflow_call: inputs: - aws-region: - required: true - type: string caller-workflow-name: required: true type: string @@ -17,10 +14,11 @@ permissions: contents: read env: - AWS_DEFAULT_REGION: ${{ inputs.aws-region }} # Used by terraform and AWS CLI commands + AWS_DEFAULT_REGION: us-east-1 TEST_ACCOUNT: ${{ secrets.APP_SIGNALS_E2E_TEST_ACC }} SAMPLE_APP_FRONTEND_SERVICE_JAR: "s3://aws-appsignals-sample-app/main-service.jar" SAMPLE_APP_REMOTE_SERVICE_JAR: "s3://aws-appsignals-sample-app/remote-service.jar" + APP_SIGNALS_CW_AGENT_RPM: "https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm" APP_SIGNALS_ADOT_JAR: "https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" METRIC_NAMESPACE: AppSignals LOG_GROUP_NAME: /aws/appsignals/generic @@ -33,15 +31,6 @@ jobs: with: fetch-depth: 0 - - name: Set CW Agent RPM environment variable - run: | - if [ ${{ env.AWS_DEFAULT_REGION }} == "us-east-1" ]; then - echo APP_SIGNALS_CW_AGENT_RPM="https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV - else - echo APP_SIGNALS_CW_AGENT_RPM="https://amazoncloudwatch-agent-${{ env.AWS_DEFAULT_REGION }}.s3.${{ env.AWS_DEFAULT_REGION }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV - fi - - - name: Generate testing id run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV @@ -52,81 +41,22 @@ jobs: aws-region: ${{ env.AWS_DEFAULT_REGION }} - name: Set up terraform - uses: hashicorp/setup-terraform@v3 + uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false - - name: Deploy sample app via terraform and wait for endpoint to come online + - name: Deploy sample app via terraform working-directory: testing/terraform/ec2 run: | terraform init terraform validate - - # Attempt to deploy the sample app on an EC2 instance and wait for its endpoint to come online. - # There may be occasional failures due to transitivity issues, so try up to 2 times. - # deployment_failed of 0 indicates that both the terraform deployment and the endpoint are running, while 1 indicates - # that it failed at some point - retry_counter=0 - max_retry=2 - while [ $retry_counter -lt $max_retry ]; do - echo "Attempt $retry_counter" - deployment_failed=0 - terraform apply -auto-approve \ - -var="aws_region=${{ env.AWS_DEFAULT_REGION }}" \ - -var="test_id=${{ env.TESTING_ID }}" \ - -var="sample_app_jar=${{ env.SAMPLE_APP_FRONTEND_SERVICE_JAR }}" \ - -var="sample_remote_app_jar=${{ env.SAMPLE_APP_REMOTE_SERVICE_JAR }}" \ - -var="cw_agent_rpm=${{ env.APP_SIGNALS_CW_AGENT_RPM }}" \ - -var="adot_jar=${{ env.APP_SIGNALS_ADOT_JAR }}" \ - || deployment_failed=$? - - if [ $deployment_failed -eq 1 ]; then - echo "Terraform deployment was unsuccessful. Will attempt to retry deployment." - fi - - # If the deployment_failed is still 0, then the terraform deployment succeeded and now try to connect to the endpoint. - # Attempts to connect will be made for up to 10 minutes - if [ $deployment_failed -eq 0 ]; then - echo "Attempting to connect to the endpoint" - sample_app_endpoint=http://$(terraform output sample_app_main_service_public_dns):8080 - attempt_counter=0 - max_attempts=60 - until $(curl --output /dev/null --silent --head --fail $(echo "$sample_app_endpoint" | tr -d '"')); do - if [ ${attempt_counter} -eq ${max_attempts} ];then - echo "Failed to connect to endpoint. Will attempt to redeploy sample app." - deployment_failed=1 - break - fi - - printf '.' - attempt_counter=$(($attempt_counter+1)) - sleep 10 - done - fi - - # If the success is 1 then either the terraform deployment or the endpoint connection failed, so first destroy the - # resources created from terraform and try again. - if [ $deployment_failed -eq 1 ]; then - echo "Destroying terraform" - terraform destroy -auto-approve \ - -var="test_id=${{ env.TESTING_ID }}" - - retry_counter=$(($retry_counter+1)) - else - # If deployment succeeded, then exit the loop - break - fi - - if [ $retry_counter -eq $max_retry ]; then - echo "Max retry reached, failed to deploy terraform and connect to the endpoint. Exiting code" - exit 1 - fi - done - - - name: Get the ec2 instance ami id - run: | - echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV - working-directory: testing/terraform/ec2 + terraform apply -auto-approve \ + -var="aws_region=${{ env.AWS_DEFAULT_REGION }}" \ + -var="test_id=${{ env.TESTING_ID }}" \ + -var="sample_app_jar=${{ env.SAMPLE_APP_FRONTEND_SERVICE_JAR }}" \ + -var="sample_remote_app_jar=${{ env.SAMPLE_APP_REMOTE_SERVICE_JAR }}" \ + -var="cw_agent_rpm=${{ env.APP_SIGNALS_CW_AGENT_RPM }}" \ + -var="adot_jar=${{ env.APP_SIGNALS_ADOT_JAR }}" - name: Get the sample app endpoint run: | @@ -134,6 +64,22 @@ jobs: echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_public_ip)" >> $GITHUB_ENV working-directory: testing/terraform/ec2 + - name: Wait for app endpoint to come online + id: endpoint-check + run: | + attempt_counter=0 + max_attempts=30 + until $(curl --output /dev/null --silent --head --fail http://${{ env.MAIN_SERVICE_ENDPOINT }}); do + if [ ${attempt_counter} -eq ${max_attempts} ];then + echo "Max attempts reached" + exit 1 + fi + + printf '.' + attempt_counter=$(($attempt_counter+1)) + sleep 10 + done + # This steps increases the speed of the validation by creating the telemetry data in advance - name: Call all test APIs continue-on-error: true @@ -157,7 +103,6 @@ jobs: --service-name sample-application-${{ env.TESTING_ID }} --remote-service-name sample-remote-application-${{ env.TESTING_ID }} --request-body ip=${{ env.REMOTE_SERVICE_IP }} - --instance-ami ${{ env.EC2_INSTANCE_AMI }} --rollup' - name: Validate generated metrics @@ -174,7 +119,6 @@ jobs: --service-name sample-application-${{ env.TESTING_ID }} --remote-service-name sample-remote-application-${{ env.TESTING_ID }} --request-body ip=${{ env.REMOTE_SERVICE_IP }} - --instance-ami ${{ env.EC2_INSTANCE_AMI }} --rollup' - name: Validate generated traces @@ -191,7 +135,6 @@ jobs: --service-name sample-application-${{ env.TESTING_ID }} --remote-service-name sample-remote-application-${{ env.TESTING_ID }} --request-body ip=${{ env.REMOTE_SERVICE_IP }} - --instance-ami ${{ env.EC2_INSTANCE_AMI }} --rollup' - name: Publish metric on test result @@ -220,4 +163,4 @@ jobs: working-directory: testing/terraform/ec2 run: | terraform destroy -auto-approve \ - -var="test_id=${{ env.TESTING_ID }}" \ No newline at end of file + -var="test_id=${{ env.TESTING_ID }}" diff --git a/.github/workflows/appsignals-e2e-eks-canary-test.yml b/.github/workflows/appsignals-e2e-eks-canary-test.yml index 7380042cf7..a1415e4413 100644 --- a/.github/workflows/appsignals-e2e-eks-canary-test.yml +++ b/.github/workflows/appsignals-e2e-eks-canary-test.yml @@ -17,14 +17,9 @@ permissions: contents: read jobs: - e2e-test: - strategy: - fail-fast: false - matrix: - aws-region: ['us-east-1', 'us-east-2', 'eu-west-1', 'ap-northeast-1', 'ap-southeast-2'] + e2e-canary-test: uses: ./.github/workflows/appsignals-e2e-eks-test.yml secrets: inherit with: - aws-region: ${{ matrix.aws-region }} test-cluster-name: 'e2e-canary-test' caller-workflow-name: 'appsignals-e2e-eks-canary-test' diff --git a/.github/workflows/appsignals-e2e-eks-test.yml b/.github/workflows/appsignals-e2e-eks-test.yml index adde728c2b..94114e2dfe 100644 --- a/.github/workflows/appsignals-e2e-eks-test.yml +++ b/.github/workflows/appsignals-e2e-eks-test.yml @@ -5,9 +5,6 @@ name: App Signals Enablement E2E Testing - EKS on: workflow_call: inputs: - aws-region: - required: true - type: string test-cluster-name: required: true type: string @@ -23,7 +20,7 @@ permissions: contents: read env: - AWS_DEFAULT_REGION: ${{ inputs.aws-region }} # Used by terraform and AWS CLI commands + AWS_DEFAULT_REGION: us-east-1 TEST_ACCOUNT: ${{ secrets.APP_SIGNALS_E2E_TEST_ACC }} ENABLEMENT_SCRIPT_S3_BUCKET: ${{ secrets.APP_SIGNALS_E2E_ENABLEMENT_SCRIPT }} SAMPLE_APP_NAMESPACE: sample-app-namespace @@ -33,7 +30,7 @@ env: LOG_GROUP_NAME: /aws/appsignals/eks jobs: - e2e-eks-test: + appsignals-e2e-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -41,7 +38,7 @@ jobs: fetch-depth: 0 - name: Generate testing id - run: echo TESTING_ID="${{ env.AWS_DEFAULT_REGION }}-${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV + run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -79,125 +76,48 @@ jobs: --approve - name: Set up terraform - uses: hashicorp/setup-terraform@v3 + uses: hashicorp/setup-terraform@v2 with: terraform_wrapper: false + - name: Deploy sample app via terraform + working-directory: testing/terraform/eks + run: | + terraform init + terraform validate + terraform apply -auto-approve \ + -var="test_id=${{ env.TESTING_ID }}" \ + -var="kube_directory_path=${{ github.workspace }}/.kube" \ + -var="eks_cluster_name=${{ inputs.test-cluster-name }}" \ + -var="eks_cluster_context_name=$(kubectl config current-context)" \ + -var="test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}" \ + -var="service_account_aws_access=service-account-${{ env.TESTING_ID }}" \ + -var="sample_app_image=${{ env.SAMPLE_APP_FRONTEND_SERVICE_IMAGE }}" \ + -var="sample_remote_app_image=${{ env.SAMPLE_APP_REMOTE_SERVICE_IMAGE }}" + # Enable App Signals on the test cluster - name: Pull and unzip enablement script from S3 - working-directory: testing/terraform/eks run: aws s3 cp ${{ env.ENABLEMENT_SCRIPT_S3_BUCKET }} . && unzip -j onboarding.zip - - name: Remove log group deletion command - if: always() - working-directory: testing/terraform/eks - run: | - delete_log_group="aws logs delete-log-group --log-group-name '${{ env.LOG_GROUP_NAME }}' --region \$REGION" - sed -i "s#$delete_log_group##g" clean-app-signals.sh + - name: Change ADOT image if main-build + if: inputs.caller-workflow-name == 'main-build' + run: "sed -i 's#image:.*#image: ${{ inputs.appsignals-adot-image-name }}#g' instrumentation.yaml" - - name: Deploy sample app via terraform and wait for the endpoint to come online - id: deploy-sample-app - working-directory: testing/terraform/eks + - name: Enable App Signals run: | - terraform init - terraform validate - - # Attempt to deploy the sample app on an EKS instance and wait for its endpoint to come online. - # There may be occasional failures due to transitivity issues, so try up to 2 times. - # deployment_failed of 0 indicates that both the terraform deployment and the endpoint are running, while 1 indicates - # that it failed at some point - retry_counter=0 - max_retry=2 - while [ $retry_counter -lt $max_retry ]; do - echo "Attempt $retry_counter" - deployment_failed=0 - terraform apply -auto-approve \ - -var="test_id=${{ env.TESTING_ID }}" \ - -var="aws_region=${{ env.AWS_DEFAULT_REGION }}" \ - -var="kube_directory_path=${{ github.workspace }}/.kube" \ - -var="eks_cluster_name=${{ inputs.test-cluster-name }}" \ - -var="eks_cluster_context_name=$(kubectl config current-context)" \ - -var="test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}" \ - -var="service_account_aws_access=service-account-${{ env.TESTING_ID }}" \ - -var="sample_app_image=${{ env.SAMPLE_APP_FRONTEND_SERVICE_IMAGE }}" \ - -var="sample_remote_app_image=${{ env.SAMPLE_APP_REMOTE_SERVICE_IMAGE }}" \ - || deployment_failed=$? - - if [ $deployment_failed -eq 1 ]; then - echo "Terraform deployment was unsuccessful. Will attempt to retry deployment." - fi + ./enable-app-signals.sh \ + ${{ inputs.test-cluster-name }} \ + ${{ env.AWS_DEFAULT_REGION }} \ + ${{ env.SAMPLE_APP_NAMESPACE }} - # If the deployment_failed is still 0, then the terraform deployment succeeded and now try to connect to the endpoint - # after installing App Signals. Attempts to connect will be made for up to 10 minutes - if [ $deployment_failed -eq 0 ]; then - echo "Installing app signals to the sample app" - ./enable-app-signals.sh \ - ${{ inputs.test-cluster-name }} \ - ${{ env.AWS_DEFAULT_REGION }} \ - ${{ env.SAMPLE_APP_NAMESPACE }} - - # If the workflow provides a specific ADOT image to test, patch the deployment and restart CW agent related pods - if [ ${{ inputs.appsignals-adot-image-name }} != "" ]; then - kubectl patch deploy -namazon-cloudwatch amazon-cloudwatch-observability-controller-manager --type='json' \ - -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/0", "value": "--auto-instrumentation-java-image=${{ inputs.appsignals-adot-image-name }}"}]' - - kubectl delete pods --all -n amazon-cloudwatch - kubectl wait --for=condition=Ready pod --all -n amazon-cloudwatch - fi - - kubectl delete pods --all -n ${{ env.SAMPLE_APP_NAMESPACE }} - kubectl wait --for=condition=Ready pod --all -n ${{ env.SAMPLE_APP_NAMESPACE }} - - echo "Attempting to connect to the endpoint" - sample_app_endpoint=http://$(terraform output sample_app_endpoint) - attempt_counter=0 - max_attempts=60 - until $(curl --output /dev/null --silent --head --fail $(echo "$sample_app_endpoint" | tr -d '"')); do - if [ ${attempt_counter} -eq ${max_attempts} ];then - echo "Failed to connect to endpoint. Will attempt to redeploy sample app." - deployment_failed=1 - break - fi - - printf '.' - attempt_counter=$(($attempt_counter+1)) - sleep 10 - done - fi - - # If the deployment_failed is 1 then either the terraform deployment or the endpoint connection failed, so first destroy the - # resources created from terraform and try again. - if [ $deployment_failed -eq 1 ]; then - echo "Cleaning up App Signal" - ./clean-app-signals.sh \ - ${{ inputs.test-cluster-name }} \ - ${{ env.AWS_DEFAULT_REGION }} \ - ${{ env.SAMPLE_APP_NAMESPACE }} - - # Running clean-app-signal.sh removes the current cluster from the config. Update the cluster again for subsequent runs. - aws eks update-kubeconfig --name ${{ inputs.test-cluster-name }} --region ${{ env.AWS_DEFAULT_REGION }} - - echo "Destroying terraform" - terraform destroy -auto-approve \ - -var="test_id=${{ env.TESTING_ID }}" \ - -var="aws_region=${{ env.AWS_DEFAULT_REGION }}" \ - -var="kube_directory_path=${{ github.workspace }}/.kube" \ - -var="eks_cluster_name=${{ inputs.test-cluster-name }}" \ - -var="test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}" \ - -var="service_account_aws_access=service-account-${{ env.TESTING_ID }}" \ - -var="sample_app_image=${{ env.SAMPLE_APP_IMAGE }}" - - retry_counter=$(($retry_counter+1)) - else - # If deployment succeeded, then exit the loop - break - fi - - if [ $retry_counter -eq $max_retry ]; then - echo "Max retry reached, failed to deploy terraform and connect to the endpoint. Exiting code" - exit 1 - fi - done + # Application pods need to be restarted for the + # app signals instrumentation to take effect + - name: Restart the app pods + run: kubectl delete pods --all -n ${{ env.SAMPLE_APP_NAMESPACE }} + + - name: Wait for sample app pods to come up + run: | + kubectl wait --for=condition=Ready pod --all -n ${{ env.SAMPLE_APP_NAMESPACE }} - name: Get remote service pod name and IP run: | @@ -215,22 +135,30 @@ jobs: jq '.items[0].status.containerStatuses[0].imageID' - name: Get the sample app endpoint - run: echo "APP_ENDPOINT=$(terraform output sample_app_endpoint)" >> $GITHUB_ENV + run: | + echo "APP_ENDPOINT=$(terraform output sample_app_endpoint)" >> $GITHUB_ENV working-directory: testing/terraform/eks - # This steps increases the speed of the validation by creating the telemetry data in advance - - name: Call all test APIs - continue-on-error: true + - name: Wait for app endpoint to come online + id: endpoint-check run: | - curl -S -s -o /dev/null http://${{ env.APP_ENDPOINT }}/outgoing-http-call/ - curl -S -s -o /dev/null http://${{ env.APP_ENDPOINT }}/aws-sdk-call/ - curl -S -s -o /dev/null http://${{ env.APP_ENDPOINT }}/remote-service?ip=${{ env.REMOTE_SERVICE_POD_IP }}/ - curl -S -s -o /dev/null http://${{ env.APP_ENDPOINT }}/client-call/ + attempt_counter=0 + max_attempts=30 + until $(curl --output /dev/null --silent --head --fail http://${{ env.APP_ENDPOINT }}); do + if [ ${attempt_counter} -eq ${max_attempts} ];then + echo "Max attempts reached" + exit 1 + fi + + printf '.' + attempt_counter=$(($attempt_counter+1)) + sleep 10 + done # Validation for app signals telemetry data - name: Call endpoint and validate generated EMF logs id: log-validation - if: steps.deploy-sample-app.outcome == 'success' && !cancelled() + if: steps.endpoint-check.outcome == 'success' && !cancelled() run: ./gradlew testing:validator:run --args='-c eks/log-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.APP_ENDPOINT }} @@ -239,7 +167,7 @@ jobs: --metric-namespace ${{ env.METRIC_NAMESPACE }} --log-group ${{ env.LOG_GROUP_NAME }} --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }} - --platform-info ${{ inputs.test-cluster-name }} + --cluster ${{ inputs.test-cluster-name }} --service-name sample-application-${{ env.TESTING_ID }} --remote-service-deployment-name ${{ env.REMOTE_SERVICE_DEPLOYMENT_NAME }} --request-body ip=${{ env.REMOTE_SERVICE_POD_IP }} @@ -247,7 +175,7 @@ jobs: - name: Call endpoints and validate generated metrics id: metric-validation - if: (steps.deploy-sample-app.outcome == 'success' || steps.log-validation.outcome == 'failure') && !cancelled() + if: (success() || steps.log-validation.outcome == 'failure') && !cancelled() run: ./gradlew testing:validator:run --args='-c eks/metric-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.APP_ENDPOINT }} @@ -256,7 +184,7 @@ jobs: --metric-namespace ${{ env.METRIC_NAMESPACE }} --log-group ${{ env.LOG_GROUP_NAME }} --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }} - --platform-info ${{ inputs.test-cluster-name }} + --cluster ${{ inputs.test-cluster-name }} --service-name sample-application-${{ env.TESTING_ID }} --remote-service-name sample-remote-application-${{ env.TESTING_ID }} --remote-service-deployment-name ${{ env.REMOTE_SERVICE_DEPLOYMENT_NAME }} @@ -265,7 +193,7 @@ jobs: - name: Call endpoints and validate generated traces id: trace-validation - if: (steps.deploy-sample-app.outcome == 'success' || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled() + if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled() run: ./gradlew testing:validator:run --args='-c eks/trace-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.APP_ENDPOINT }} @@ -274,7 +202,7 @@ jobs: --metric-namespace ${{ env.METRIC_NAMESPACE }} --log-group ${{ env.LOG_GROUP_NAME }} --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }} - --platform-info ${{ inputs.test-cluster-name }} + --cluster ${{ inputs.test-cluster-name }} --service-name sample-application-${{ env.TESTING_ID }} --remote-service-deployment-name ${{ env.REMOTE_SERVICE_DEPLOYMENT_NAME }} --request-body ip=${{ env.REMOTE_SERVICE_POD_IP }} @@ -299,10 +227,15 @@ jobs: # Clean up Procedures + - name: Remove log group deletion command + if: always() + run: | + delete_log_group="aws logs delete-log-group --log-group-name '${{ env.LOG_GROUP_NAME }}' --region \$REGION" + sed -i "s#$delete_log_group##g" clean-app-signals.sh + - name: Clean Up App Signals if: always() continue-on-error: true - working-directory: testing/terraform/eks run: | ./clean-app-signals.sh \ ${{ inputs.test-cluster-name }} \ @@ -323,7 +256,6 @@ jobs: run: | terraform destroy -auto-approve \ -var="test_id=${{ env.TESTING_ID }}" \ - -var="aws_region=${{ env.AWS_DEFAULT_REGION }}" \ -var="kube_directory_path=${{ github.workspace }}/.kube" \ -var="eks_cluster_name=${{ inputs.test-cluster-name }}" \ -var="test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}" \ @@ -338,4 +270,4 @@ jobs: --name service-account-${{ env.TESTING_ID }} \ --namespace ${{ env.SAMPLE_APP_NAMESPACE }} \ --cluster ${{ inputs.test-cluster-name }} \ - --region ${{ env.AWS_DEFAULT_REGION }} \ No newline at end of file + --region ${{ env.AWS_DEFAULT_REGION }} \ diff --git a/.github/workflows/docker-build-smoke-tests-fake-backend.yml b/.github/workflows/docker-build-smoke-tests-fake-backend.yml index ddd4be1f0b..78cfa55fb8 100644 --- a/.github/workflows/docker-build-smoke-tests-fake-backend.yml +++ b/.github/workflows/docker-build-smoke-tests-fake-backend.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index a3b01c3054..28b0b1b343 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -28,13 +28,13 @@ jobs: if: ${{ startsWith(github.ref_name, 'release/v') }} steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin # vaadin 14 tests fail with node 18 - name: Set up Node - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: node-version: 16 @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin @@ -255,13 +255,13 @@ jobs: path: aws-otel-java-instrumentation - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '11' - name: Set up terraform - uses: hashicorp/setup-terraform@v3 + uses: hashicorp/setup-terraform@v2 with: terraform_version: "~1.5" @@ -328,7 +328,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin @@ -371,7 +371,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' @@ -402,7 +402,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' @@ -433,7 +433,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' @@ -457,14 +457,10 @@ jobs: VALIDATOR_COMMAND: -c spark-otel-trace-metric-validation.yml --endpoint http://app:4567 --metric-namespace aws-otel-integ-test -t ${{ github.run_id }}-${{ github.run_number }} e2e-test: - concurrency: - group: e2e-adot-test - cancel-in-progress: false needs: build uses: ./.github/workflows/appsignals-e2e-eks-test.yml secrets: inherit with: - aws-region: us-east-1 test-cluster-name: "e2e-adot-test" appsignals-adot-image-name: ${{ needs.build.outputs.staging-image-name }} caller-workflow-name: 'main-build' diff --git a/.github/workflows/nightly-upstream-snapshot-build.yml b/.github/workflows/nightly-upstream-snapshot-build.yml index 4f78c4135b..a5d6e3fcef 100644 --- a/.github/workflows/nightly-upstream-snapshot-build.yml +++ b/.github/workflows/nightly-upstream-snapshot-build.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' @@ -108,14 +108,10 @@ jobs: path: otelagent/build/libs/aws-opentelemetry-agent-*.jar e2e-test: - concurrency: - group: e2e-adot-test - cancel-in-progress: false needs: build uses: ./.github/workflows/appsignals-e2e-eks-test.yml secrets: inherit with: - aws-region: us-east-1 test-cluster-name: "e2e-adot-test" appsignals-adot-image-name: ${{ needs.build.outputs.release-candidate-image }} caller-workflow-name: 'nightly-upstream-snapshot-build' diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index 01fb3fed14..1e42b8282d 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' @@ -38,7 +38,7 @@ jobs: with: repository: "open-telemetry/opentelemetry-java-instrumentation" fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml index fb77ce5a0f..8947ed0f4a 100644 --- a/.github/workflows/patch-release-build.yml +++ b/.github/workflows/patch-release-build.yml @@ -61,7 +61,7 @@ jobs: with: ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }} - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index da45b0c212..8bea654285 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -15,13 +15,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin # vaadin 14 tests fail with node 18 - name: Set up Node - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: node-version: 16 @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 8865805e69..f7aa4b3f78 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' diff --git a/Dockerfile b/Dockerfile index a823338eeb..b6fd975906 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # permissions and limitations under the License. # Stage 1: Build the cp-utility binary -FROM rust:1.74 as builder +FROM rust:1.73 as builder WORKDIR /usr/src/cp-utility COPY ./tools/cp-utility . diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts index 459343f78e..4a46a83e7b 100644 --- a/awsagentprovider/build.gradle.kts +++ b/awsagentprovider/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { // AWS Resource Detectors implementation("io.opentelemetry.contrib:opentelemetry-aws-resources") // Export configuration - compileOnly("io.opentelemetry:opentelemetry-exporter-otlp") + implementation("io.opentelemetry:opentelemetry-exporter-otlp") testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") diff --git a/settings.gradle.kts b/settings.gradle.kts index 3892e26aa8..480cadcc08 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,7 +21,7 @@ pluginManagement { id("com.github.johnrengelman.shadow") version "8.1.1" id("com.google.cloud.tools.jib") version "3.4.0" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" - id("nebula.release") version "18.0.6" + id("nebula.release") version "17.2.2" id("org.springframework.boot") version "2.7.17" id("org.owasp.dependencycheck") version "8.4.0" } diff --git a/testing/terraform/ec2/main.tf b/testing/terraform/ec2/main.tf index a5efa41dea..dff44a04b8 100644 --- a/testing/terraform/ec2/main.tf +++ b/testing/terraform/ec2/main.tf @@ -26,45 +26,14 @@ locals { private_key_content = tls_private_key.ssh_key.private_key_pem } -data "aws_ami" "ami" { - executable_users = ["self"] - most_recent = true - filter { - name = "architecture" - values = ["x86_64"] - } - filter { - name = "image-type" - values = ["machine"] - } - - filter { - name = "root-device-name" - values = ["/dev/xvda"] - } - - filter { - name = "root-device-type" - values = ["ebs"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } -} - resource "aws_instance" "main_service_instance" { - ami = data.aws_ami.ami.id # Amazon Linux 2 (free tier) + ami = "ami-0b021814637c6d457" # Amazon Linux 2 (free tier) instance_type = "t2.micro" key_name = local.ssh_key_name iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE" vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id] associate_public_ip_address = true instance_initiated_shutdown_behavior = "terminate" - metadata_options { - http_tokens = "required" - } tags = { Name = "main-service-${var.test_id}" @@ -116,16 +85,13 @@ resource "null_resource" "main_service_setup" { } resource "aws_instance" "remote_service_instance" { - ami = data.aws_ami.ami.id # Amazon Linux 2 (free tier) + ami = "ami-0b021814637c6d457" # Amazon Linux 2 (free tier) instance_type = "t2.micro" key_name = local.ssh_key_name iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE" vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id] associate_public_ip_address = true instance_initiated_shutdown_behavior = "terminate" - metadata_options { - http_tokens = "required" - } tags = { Name = "remote-service-${var.test_id}" @@ -174,4 +140,4 @@ resource "null_resource" "remote_service_setup" { } depends_on = [aws_instance.remote_service_instance] -} +} \ No newline at end of file diff --git a/testing/terraform/ec2/output.tf b/testing/terraform/ec2/output.tf index 1447d2c854..36cf01601e 100644 --- a/testing/terraform/ec2/output.tf +++ b/testing/terraform/ec2/output.tf @@ -4,8 +4,4 @@ output "sample_app_main_service_public_dns" { output "sample_app_remote_service_public_ip" { value = aws_instance.remote_service_instance.public_ip -} - -output "ec2_instance_ami" { - value = data.aws_ami.ami.id } \ No newline at end of file diff --git a/testing/terraform/eks/main.tf b/testing/terraform/eks/main.tf index dcf18c8375..b81f48594e 100644 --- a/testing/terraform/eks/main.tf +++ b/testing/terraform/eks/main.tf @@ -17,7 +17,7 @@ terraform { } provider "aws" { - region = var.aws_region + region = "us-east-1" } # get eks cluster diff --git a/testing/terraform/eks/variables.tf b/testing/terraform/eks/variables.tf index b54f093a6c..92bb0d47d4 100644 --- a/testing/terraform/eks/variables.tf +++ b/testing/terraform/eks/variables.tf @@ -21,10 +21,6 @@ variable "kube_directory_path" { default = "./.kube" } -variable "aws_region" { - default = "" -} - variable "eks_cluster_name" { default = "" } diff --git a/testing/validator/src/main/java/com/amazon/aoc/App.java b/testing/validator/src/main/java/com/amazon/aoc/App.java index 423c74d12b..c52e55f838 100644 --- a/testing/validator/src/main/java/com/amazon/aoc/App.java +++ b/testing/validator/src/main/java/com/amazon/aoc/App.java @@ -60,9 +60,9 @@ public class App implements Callable { private String appNamespace; @CommandLine.Option( - names = {"--platform-info"}, + names = {"--cluster"}, defaultValue = "demo-cluster") - private String platformInfo; + private String cluster; @CommandLine.Option( names = {"--service-name"}, @@ -133,11 +133,6 @@ public class App implements Callable { defaultValue = "true") private boolean isRollup; - @CommandLine.Option( - names = {"--instance-ami"}, - defaultValue = "") - private String instanceAmi; - private static final String TEST_CASE_DIM_KEY = "testcase"; private static final String CANARY_NAMESPACE = "Otel/Canary"; private static final String CANARY_METRIC_NAME = "Success"; @@ -156,7 +151,7 @@ public Integer call() throws Exception { context.setAvailabilityZone(this.availabilityZone); context.setMetricNamespace(this.metricNamespace); context.setAppNamespace(this.appNamespace); - context.setPlatformInfo(this.platformInfo); + context.setCluster(this.cluster); context.setServiceName(this.serviceName); context.setRemoteServiceName(this.remoteServiceName); context.setRemoteServiceDeploymentName(this.remoteServiceDeploymentName); @@ -171,7 +166,6 @@ public Integer call() throws Exception { context.setCortexInstanceEndpoint(this.cortexInstanceEndpoint); context.setTestcase(testcase); context.setLanguage(language); - context.setInstanceAmi(this.instanceAmi); log.info(context); diff --git a/testing/validator/src/main/java/com/amazon/aoc/models/Context.java b/testing/validator/src/main/java/com/amazon/aoc/models/Context.java index 5d8a13c085..87d7ea953d 100644 --- a/testing/validator/src/main/java/com/amazon/aoc/models/Context.java +++ b/testing/validator/src/main/java/com/amazon/aoc/models/Context.java @@ -39,9 +39,7 @@ public class Context { private String appNamespace; - // Variable containing platform specific information. Ex: For EKS, the cluster where the sample - // app is deployed is needed. - private String platformInfo; + private String cluster; private String serviceName; @@ -55,8 +53,6 @@ public class Context { private String logGroup; - private String instanceAmi; - private ECSContext ecsContext; private CloudWatchContext cloudWatchContext; diff --git a/testing/validator/src/main/java/com/amazon/aoc/services/XRayService.java b/testing/validator/src/main/java/com/amazon/aoc/services/XRayService.java index b96ff3332c..d6b328b1df 100644 --- a/testing/validator/src/main/java/com/amazon/aoc/services/XRayService.java +++ b/testing/validator/src/main/java/com/amazon/aoc/services/XRayService.java @@ -58,10 +58,8 @@ public List searchClientCallTraces(String serviceName) { new GetTraceSummariesRequest() .withStartTime(pastDate) .withEndTime(currentDate) - .withFilterExpression( - "annotation.aws_local_service = \"" - + serviceName - + "\" AND annotation.aws_local_service = \"local-root-client-call\"")); + .withFilterExpression("annotation.aws_local_service = " + serviceName) + .withFilterExpression("annotation.aws_local_service = \"local-root-client-call\"")); return traceSummaryResult.getTraceSummaries(); } } diff --git a/testing/validator/src/main/resources/expected-data-template/ec2/aws-sdk-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/ec2/aws-sdk-call-trace.mustache index bbf708777a..1a871f97c2 100644 --- a/testing/validator/src/main/resources/expected-data-template/ec2/aws-sdk-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/ec2/aws-sdk-call-trace.mustache @@ -20,7 +20,7 @@ "metadata": { "default": { "otel.resource.aws.hostedin.environment": "^EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", + "otel.resource.host.image.id": "^ami-0b021814637c6d457$", "otel.resource.host.type": "^t2.micro$", "aws.span.kind": "^LOCAL_ROOT$" } diff --git a/testing/validator/src/main/resources/expected-data-template/ec2/client-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/ec2/client-call-trace.mustache index 2bf8db0315..45739814b2 100644 --- a/testing/validator/src/main/resources/expected-data-template/ec2/client-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/ec2/client-call-trace.mustache @@ -8,7 +8,7 @@ "metadata": { "default": { "otel.resource.aws.hostedin.environment": "^EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", + "otel.resource.host.image.id": "^ami-0b021814637c6d457$", "otel.resource.host.type": "^t2.micro$" } diff --git a/testing/validator/src/main/resources/expected-data-template/ec2/outgoing-http-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/ec2/outgoing-http-call-trace.mustache index 5079428b8e..3d630acb65 100644 --- a/testing/validator/src/main/resources/expected-data-template/ec2/outgoing-http-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/ec2/outgoing-http-call-trace.mustache @@ -20,7 +20,7 @@ "metadata": { "default": { "otel.resource.aws.hostedin.environment": "^EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", + "otel.resource.host.image.id": "^ami-0b021814637c6d457$", "otel.resource.host.type": "^t2.micro$", "aws.span.kind": "^LOCAL_ROOT$" } diff --git a/testing/validator/src/main/resources/expected-data-template/ec2/remote-service-trace.mustache b/testing/validator/src/main/resources/expected-data-template/ec2/remote-service-trace.mustache index 99a7036053..50dc04c93f 100644 --- a/testing/validator/src/main/resources/expected-data-template/ec2/remote-service-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/ec2/remote-service-trace.mustache @@ -20,7 +20,7 @@ "metadata": { "default": { "otel.resource.aws.hostedin.environment": "^EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", + "otel.resource.host.image.id": "^ami-0b021814637c6d457$", "otel.resource.host.type": "^t2.micro$", "aws.span.kind": "^LOCAL_ROOT$" } @@ -69,7 +69,7 @@ "metadata": { "default": { "otel.resource.aws.hostedin.environment": "^EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", + "otel.resource.host.image.id": "^ami-0b021814637c6d457$", "otel.resource.host.type": "^t2.micro$", "aws.span.kind": "^LOCAL_ROOT$" } diff --git a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-log.mustache b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-log.mustache index 19df678bbe..6aad248dda 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-log.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-log.mustache @@ -1,5 +1,5 @@ [{ - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-(remote-)?app-deployment(-[A-Za-z0-9]*)*$", @@ -10,7 +10,7 @@ "aws.span.kind": "^LOCAL_ROOT$" }, { - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment(-[A-Za-z0-9]*)*$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-metric.mustache b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-metric.mustache index b14fe76b2a..0a27db794f 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-metric.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-metric.mustache @@ -10,7 +10,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -27,7 +27,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -47,7 +47,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -61,7 +61,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -78,7 +78,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -101,7 +101,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -124,7 +124,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -150,7 +150,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -167,7 +167,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -187,7 +187,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -201,7 +201,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -218,7 +218,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -241,7 +241,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -264,7 +264,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -290,7 +290,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -307,7 +307,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -327,7 +327,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -341,7 +341,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -358,7 +358,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -381,7 +381,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -404,7 +404,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} diff --git a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-trace.mustache index a7d92f8785..5f78902c6b 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/aws-sdk-call-trace.mustache @@ -15,7 +15,7 @@ "annotations": { "aws_local_service": "^{{serviceName}}$", "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^GET /aws-sdk-call$" }, "metadata": { @@ -39,7 +39,7 @@ }, "annotations": { "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_service": "^{{serviceName}}$", "aws_local_operation": "^GET /aws-sdk-call$", "aws_remote_service": "^AWS\\.SDK\\.S3$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/client-call-log.mustache b/testing/validator/src/main/resources/expected-data-template/eks/client-call-log.mustache index 663cbcb419..86bd083935 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/client-call-log.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/client-call-log.mustache @@ -1,5 +1,5 @@ [{ - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment-{{testingId}}(-[A-Za-z0-9]*)*$", @@ -10,7 +10,7 @@ "aws.span.kind": "^LOCAL_ROOT$" }, { - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment-{{testingId}}(-[A-Za-z0-9]*)*$", @@ -21,7 +21,7 @@ "aws.span.kind": "^LOCAL_ROOT$" }, { - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment-{{testingId}}(-[A-Za-z0-9]*)*$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/client-call-metric.mustache b/testing/validator/src/main/resources/expected-data-template/eks/client-call-metric.mustache index 1e765267f1..a5e37cf84d 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/client-call-metric.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/client-call-metric.mustache @@ -10,7 +10,7 @@ value: GET /client-call - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -24,7 +24,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -41,7 +41,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -58,7 +58,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -78,7 +78,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -98,7 +98,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -118,7 +118,7 @@ value: GET /client-call - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -132,7 +132,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -149,7 +149,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -166,7 +166,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -186,7 +186,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -206,7 +206,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -226,7 +226,7 @@ value: GET /client-call - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -240,7 +240,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -257,7 +257,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -274,7 +274,7 @@ value: InternalOperation - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -294,7 +294,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -314,7 +314,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} diff --git a/testing/validator/src/main/resources/expected-data-template/eks/client-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/eks/client-call-trace.mustache index bbe92619a2..6e3727a852 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/client-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/client-call-trace.mustache @@ -3,7 +3,7 @@ "annotations": { "aws_local_service": "^{{serviceName}}$", "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^InternalOperation$" }, "metadata": { @@ -24,7 +24,7 @@ }, "annotations": { "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_service": "^{{serviceName}}$", "aws_local_operation": "^InternalOperation$", "aws_remote_service": "^local-root-client-call$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-log.mustache b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-log.mustache index 9aade3d2ad..f17349a9a6 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-log.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-log.mustache @@ -1,5 +1,5 @@ [{ - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment(-[A-Za-z0-9]*)*$", @@ -10,7 +10,7 @@ "aws.span.kind": "^LOCAL_ROOT$" }, { - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment(-[A-Za-z0-9]*)*$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-metric.mustache b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-metric.mustache index e797b8140d..dcb203585d 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-metric.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-metric.mustache @@ -10,7 +10,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -27,7 +27,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -47,7 +47,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -61,7 +61,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -81,7 +81,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -101,7 +101,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -118,7 +118,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -138,7 +138,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -152,7 +152,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -172,7 +172,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -192,7 +192,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -209,7 +209,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -229,7 +229,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -243,7 +243,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -263,7 +263,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} diff --git a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-trace.mustache b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-trace.mustache index 612e795b77..04f5e7c87a 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/outgoing-http-call-trace.mustache @@ -15,7 +15,7 @@ "annotations": { "aws_local_service": "^{{serviceName}}$", "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^GET /outgoing-http-call$" }, "metadata": { @@ -39,7 +39,7 @@ }, "annotations": { "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_service": "^{{serviceName}}$", "aws_local_operation": "^GET /outgoing-http-call$", "aws_remote_service": "^www.amazon.com$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-log.mustache b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-log.mustache index cb65f540a8..7d0193057e 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-log.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-log.mustache @@ -1,5 +1,5 @@ [{ - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", "K8s.Pod": "^sample-app-deployment(-[A-Za-z0-9]*)*$", @@ -10,7 +10,7 @@ "aws.span.kind": "^LOCAL_ROOT$" }, { - "HostedIn.EKS.Cluster": "^{{platformInfo}}$", + "HostedIn.EKS.Cluster": "^{{cluster}}$", "HostedIn.K8s.Namespace": "^{{appNamespace}}$", "K8s.RemoteNamespace": "^{{appNamespace}}$", "K8s.Node": "^i-[A-Za-z0-9]{17}$", diff --git a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-metric.mustache b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-metric.mustache index a69bb49466..526e51459e 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-metric.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-metric.mustache @@ -10,7 +10,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -27,7 +27,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -44,7 +44,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -64,7 +64,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -78,7 +78,7 @@ value: {{remoteServiceDeploymentName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -92,7 +92,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -109,7 +109,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -134,7 +134,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -154,7 +154,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -177,7 +177,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -209,7 +209,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -226,7 +226,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -243,7 +243,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -263,7 +263,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -277,7 +277,7 @@ value: {{remoteServiceDeploymentName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -291,7 +291,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -308,7 +308,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -333,7 +333,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -353,7 +353,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -376,7 +376,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -408,7 +408,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -425,7 +425,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -442,7 +442,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -462,7 +462,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -476,7 +476,7 @@ value: {{remoteServiceDeploymentName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -490,7 +490,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -507,7 +507,7 @@ value: {{serviceName}} - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -532,7 +532,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -552,7 +552,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} @@ -575,7 +575,7 @@ dimensions: - name: HostedIn.EKS.Cluster - value: {{platformInfo}} + value: {{cluster}} - name: HostedIn.K8s.Namespace value: {{appNamespace}} diff --git a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-trace.mustache b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-trace.mustache index ca004a5c40..fd964cd2ee 100644 --- a/testing/validator/src/main/resources/expected-data-template/eks/remote-service-trace.mustache +++ b/testing/validator/src/main/resources/expected-data-template/eks/remote-service-trace.mustache @@ -15,7 +15,7 @@ "annotations": { "aws_local_service": "^{{serviceName}}$", "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^GET /remote-service$" }, "metadata": { @@ -65,7 +65,7 @@ "annotations": { "aws_local_service": "^{{remoteServiceDeploymentName}}$", "HostedIn_K8s_Namespace": "^{{appNamespace}}$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^GET /healthcheck$" }, "metadata": { @@ -81,7 +81,7 @@ "name": "^RemoteServiceController.healthcheck$", "annotations": { "HostedIn_K8s_Namespace": "^sample-app-namespace$", - "HostedIn_EKS_Cluster": "^{{platformInfo}}$", + "HostedIn_EKS_Cluster": "^{{cluster}}$", "aws_local_operation": "^GET /healthcheck$" } } diff --git a/tools/cp-utility/Cargo.lock b/tools/cp-utility/Cargo.lock index 4c3522d80f..cce22a5450 100644 --- a/tools/cp-utility/Cargo.lock +++ b/tools/cp-utility/Cargo.lock @@ -10,9 +10,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "cc" @@ -74,15 +74,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "ppv-lite86" @@ -122,20 +122,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.3.3", "errno", "libc", "linux-raw-sys", @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", diff --git a/tools/cp-utility/Cargo.toml b/tools/cp-utility/Cargo.toml index 5abe0d55fe..93779b631b 100644 --- a/tools/cp-utility/Cargo.toml +++ b/tools/cp-utility/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dev-dependencies] # dependencies only used during tests -tempfile = "3.8.1" +tempfile = "3.8.0" uuid = { version = "1.5.0", features = ["v4", "fast-rng"] } [profile.release]