diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 074b375d..da41e6dc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,8 +28,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -47,7 +45,7 @@ jobs: - name: Set agent version env run: | - echo "AGENT_VERSION=$(cd agent/build/libs && unzip -p solarwinds-apm-agent.jar META-INF/MANIFEST.MF | grep Implementation-Version | awk '{ print $2 }')" >> $GITHUB_ENV + echo "AGENT_VERSION=$(cd agent/build/libs && unzip -p solarwinds-apm-agent.jar META-INF/MANIFEST.MF | grep Implementation-Version | awk '{ print $2 }' | sed 's/[^a-z0-9.-]//g')" >> $GITHUB_ENV - name: Copy to S3 run: | @@ -94,8 +92,6 @@ jobs: - s3-stage-upload steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Docker login run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_USERNAME --password-stdin @@ -119,8 +115,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -161,7 +155,6 @@ jobs: done exit $lambda - lambda-release-test: runs-on: ubuntu-latest needs: @@ -170,8 +163,6 @@ jobs: LAMBDA: "true" steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -192,10 +183,11 @@ jobs: cd smoke-tests ./gradlew test -s - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: path: smoke-tests/build/reports/tests/test + name: lambda-release-test - name: Docker logout run: docker logout @@ -204,8 +196,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -303,6 +293,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: arns.txt + name: arns smoke-test-linux: runs-on: ubuntu-latest @@ -310,8 +301,6 @@ jobs: - s3-stage-upload steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -332,8 +321,6 @@ jobs: - s3-stage-upload steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -347,3 +334,50 @@ jobs: .\gradlew.bat :netty-test:run env: SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }}:smoke-test-windows + + release-test: + runs-on: ubuntu-latest + env: + LAMBDA: "false" + needs: + - s3-stage-upload + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Docker login + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_USERNAME --password-stdin + + - name: Build smoke-test + run: | + cd smoke-tests + ./gradlew build -x test + + - name: Build webmvc jar + run: | + cd smoke-tests + ./gradlew :spring-boot-webmvc:build + + - name: Build webmvc image + run: | + cd smoke-tests/spring-boot-webmvc + docker image build --tag smt:webmvc . + + - name: Execute smoke tests + run: | + cd smoke-tests + ./gradlew test + + - uses: actions/upload-artifact@v4 + if: always() + with: + path: smoke-tests/build/reports/tests/test + name: release-test + + - name: Docker logout + run: docker logout diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml deleted file mode 100644 index 668c6331..00000000 --- a/.github/workflows/release-test.yml +++ /dev/null @@ -1,136 +0,0 @@ -name: Release-test - -on: - workflow_dispatch: - push: - -permissions: - packages: write - contents: read - id-token: write - -env: - SW_APM_DEBUG_LEVEL: trace - AGENT_DOWNLOAD_URL: https://agent-binaries.global.st-ssp.solarwinds.com/apm/java/latest/solarwinds-apm-agent.jar - SW_APM_COLLECTOR: ${{ secrets.SW_APM_COLLECTOR }} - OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }} - SW_APM_SERVICE_KEY_AO: ${{ secrets.SW_APM_SERVICE_KEY_AO }} - SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }} - GITHUB_USERNAME: ${{ github.actor }} - SWO_LOGIN_URL: ${{ secrets.SWO_LOGIN_URL }} - SWO_HOST_URL: ${{ secrets.SWO_HOST_URL }} - SWO_EMAIL: ${{ secrets.SWO_EMAIL }} - SWO_PWORD: ${{ secrets.SWO_PWORD }} - STAGE_BUCKET: ${{ secrets.STAGE_BUCKET }} - -jobs: - s3-stage-upload: # this job uploads the jar to stage s3 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets.AWS_S3_ROLE_ARN_SSP_STAGE }} - aws-region: "us-east-1" - - - name: Build agent - run: ./gradlew clean build -x test - - - name: Set agent version env - run: | - echo "AGENT_VERSION=$(cd agent/build/libs && unzip -p solarwinds-apm-agent.jar META-INF/MANIFEST.MF | grep Implementation-Version | awk '{ print $2 }')" >> $GITHUB_ENV - - - name: Copy to S3 - run: | - ls -al - aws s3 cp agent/build/libs/solarwinds-apm-agent.jar \ - s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent.jar \ - --acl public-read - - aws s3 cp agent-lambda/build/libs/solarwinds-apm-agent-lambda.jar \ - s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent-lambda.jar \ - --acl public-read - - aws s3 cp custom/shared/src/main/resources/solarwinds-apm-config.json \ - s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-config.json \ - --acl public-read - - - name: Copy to S3(latest) - run: | - aws s3 cp s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent.jar \ - s3://$STAGE_BUCKET/apm/java/latest/solarwinds-apm-agent.jar \ - --acl public-read - - aws s3 cp s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent-lambda.jar \ - s3://$STAGE_BUCKET/apm/java/latest/solarwinds-apm-agent-lambda.jar \ - --acl public-read - - aws s3 cp s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-config.json \ - s3://$STAGE_BUCKET/apm/java/latest/solarwinds-apm-config.json \ - --acl public-read - - touch VERSION - echo "version: $AGENT_VERSION" >> VERSION - SHA256=$(sha256sum agent/build/libs/solarwinds-apm-agent.jar) - echo "sha256: $SHA256" >> VERSION - - aws s3 cp VERSION \ - s3://$STAGE_BUCKET/apm/java/latest/VERSION \ - --acl public-read - - release-test: - runs-on: ubuntu-latest - env: - LAMBDA: "false" - needs: - - s3-stage-upload - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Docker login - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_USERNAME --password-stdin - - - name: Build smoke-test - run: | - cd smoke-tests - ./gradlew build -x test - - - name: Build webmvc jar - run: | - cd smoke-tests - ./gradlew :spring-boot-webmvc:build - - - name: Build webmvc image - run: | - cd smoke-tests/spring-boot-webmvc - docker image build --tag smt:webmvc . - - - name: Execute smoke tests - run: | - cd smoke-tests - ./gradlew test - - - uses: actions/upload-artifact@v3 - if: always() - with: - path: smoke-tests/build/reports/tests/test - - - name: Docker logout - run: docker logout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fd247ca..bf7ede09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,8 +18,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -42,8 +40,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -104,8 +100,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -124,7 +118,7 @@ jobs: - name: Set agent version env run: | - echo "AGENT_VERSION=$(cd agent/build/libs && unzip -p solarwinds-apm-agent.jar META-INF/MANIFEST.MF | grep Implementation-Version | awk '{ print $2 }')" >> $GITHUB_ENV + echo "AGENT_VERSION=$(cd agent/build/libs && unzip -p solarwinds-apm-agent.jar META-INF/MANIFEST.MF | grep Implementation-Version | awk '{ print $2 }' | sed 's/[^a-z0-9.-]//g')" >> $GITHUB_ENV - name: Check version doesn't exist run: | @@ -167,8 +161,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -266,13 +258,12 @@ jobs: - uses: actions/upload-artifact@v4 with: path: arns.txt + name: arns benchmark: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -291,10 +282,12 @@ jobs: - uses: actions/upload-artifact@v4 with: path: benchmark/results/release/summary.txt + name: benchmark-summary - uses: actions/upload-artifact@v4 with: path: benchmark/build/reports/tests/test/ + name: benchmark-test - name: Docker logout run: docker logout diff --git a/benchmark/src/test/java/io/opentelemetry/containers/AOTestCollectorContainer.java b/benchmark/src/test/java/io/opentelemetry/containers/AOTestCollectorContainer.java index febd1360..6c944f75 100644 --- a/benchmark/src/test/java/io/opentelemetry/containers/AOTestCollectorContainer.java +++ b/benchmark/src/test/java/io/opentelemetry/containers/AOTestCollectorContainer.java @@ -27,7 +27,7 @@ public class AOTestCollectorContainer { public static GenericContainer build(Network network) { return new GenericContainer<>( - DockerImageName.parse("ghcr.io/solarwinds-cloud/apm-agent-test-collector:v2.0.4")) + DockerImageName.parse("ghcr.io/solarwinds/apm-agent-test-collector:v2.0.4")) .withNetwork(network) .withNetworkAliases("AOCollector") .withLogConsumer(new Slf4jLogConsumer(logger)) diff --git a/long-running-test-arch/k8s/cronjob.yml b/long-running-test-arch/k8s/cronjob.yml index 044a4228..fff37fb0 100644 --- a/long-running-test-arch/k8s/cronjob.yml +++ b/long-running-test-arch/k8s/cronjob.yml @@ -28,7 +28,7 @@ spec: - name: docker-cred containers: - name: k6-inst - image: ghcr.io/solarwinds-cloud/xk6:latest + image: ghcr.io/solarwinds/xk6:latest imagePullPolicy: Always args: - "--out" @@ -79,7 +79,7 @@ spec: - name: docker-cred containers: - name: k6-inst-rc - image: ghcr.io/solarwinds-cloud/xk6:latest + image: ghcr.io/solarwinds/xk6:latest imagePullPolicy: Always args: - "--out" @@ -130,7 +130,7 @@ spec: - name: docker-cred containers: - name: k6-uninst - image: ghcr.io/solarwinds-cloud/xk6:latest + image: ghcr.io/solarwinds/xk6:latest imagePullPolicy: Always args: - "--out" diff --git a/long-running-test-arch/k8s/deployment-app.yml b/long-running-test-arch/k8s/deployment-app.yml index 12f549c4..9c85378c 100644 --- a/long-running-test-arch/k8s/deployment-app.yml +++ b/long-running-test-arch/k8s/deployment-app.yml @@ -35,7 +35,7 @@ spec: - name: docker-cred containers: - name: petclinic-ins - image: ghcr.io/solarwinds-cloud/petclinic:agent-latest + image: ghcr.io/solarwinds/petclinic:agent-latest imagePullPolicy: Always ports: - containerPort: 8080 @@ -91,7 +91,7 @@ spec: - name: docker-cred containers: - name: petclinic-ins-rc - image: ghcr.io/solarwinds-cloud/petclinic:agent-rc + image: ghcr.io/solarwinds/petclinic:agent-rc imagePullPolicy: Always ports: - containerPort: 8080