diff --git a/.github/workflows/1.dev-test.yml b/.github/workflows/1.dev-test.yml index 2299759..6a68a80 100644 --- a/.github/workflows/1.dev-test.yml +++ b/.github/workflows/1.dev-test.yml @@ -12,6 +12,9 @@ concurrency: jobs: dev-test: runs-on: ubuntu-latest + permissions: # Necessary for workload identity provider + contents: 'read' + id-token: 'write' steps: # 1. Setup - uses: actions/checkout@v4 @@ -23,7 +26,30 @@ jobs: cache: 'maven' # 2. Run tests - - name: Run Unit & Integration Tests - run: mvn clean verify --no-transfer-progress + # - name: Run Unit & Integration Tests + # run: mvn clean verify --no-transfer-progress - # 3. Notify if fails + # 3. Auth + - name: Auth via Workload Identity Federation + id: auth + uses: google-github-actions/auth@v2.1.5 + with: + workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }} + service_account: ${{ secrets.SERVICE_ACCOUNT }} # impersonated SA + audience: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER_AUDIENCE }} + + # 4. Setup gcloud & configure docker to use gcloud + - name: Setup gcloud + uses: google-github-actions/setup-gcloud@v2.1.1 + with: + project_id: ${{ secrets.PROJECT_ID }} + - name: Setup docker to authenticate via gcloud + run: gcloud --quiet auth configure-docker us-docker.pkg.dev + + # 5. Build image + - name: Build image + run: mvn clean package -DskipTests spring-boot:build-image --no-transfer-progress -Dspring-boot.build-image.imageName=$IMAGE_REGISTRY:$IMAGE_TAG + + # 6. Push image + - name: Push image + run: docker push $IMAGE_REGISTRY:$IMAGE_TAG \ No newline at end of file diff --git a/opentelemetry/default.properties b/opentelemetry/default.properties index 800db23..45629d8 100644 --- a/opentelemetry/default.properties +++ b/opentelemetry/default.properties @@ -1,7 +1,7 @@ -# https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md +# https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases # https://opentelemetry.io/docs/languages/java/automatic/configuration/ -# Version 2.4.0 +# Version 2.6.0 otel.javaagent.enabled=true otel.javaagent.logging=application diff --git a/opentelemetry/dev.properties b/opentelemetry/dev.properties index 83dce85..83cf46e 100644 --- a/opentelemetry/dev.properties +++ b/opentelemetry/dev.properties @@ -1,7 +1,7 @@ -# https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md +# https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases # https://opentelemetry.io/docs/languages/java/automatic/configuration/ -# Version 2.4.0 +# Version 2.6.0 otel.javaagent.enabled=true otel.javaagent.logging=application diff --git a/opentelemetry/opentelemetry-javaagent.jar b/opentelemetry/opentelemetry-javaagent.jar index 357d5fe..f93f7ac 100644 Binary files a/opentelemetry/opentelemetry-javaagent.jar and b/opentelemetry/opentelemetry-javaagent.jar differ