Merge branch 'main' into chore/apache-kafka

open-telemetry · Mar 26, 2024 · 0e593c3 · 0e593c3
2 parents c8a12ab + 9ffee33
commit 0e593c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: "Add Label: docs-update-required"
         if: steps.file_changes.outputs.docsUpdateRequired == 'true'
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -46,7 +46,7 @@ jobs:
 
       - name: "Add Label: helm-update-required"
         if: steps.file_changes.outputs.helmUpdateRequired == 'true'
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

diff --git a/src/adservice/src/main/java/oteldemo/AdService.java b/src/adservice/src/main/java/oteldemo/AdService.java
@@ -182,7 +182,7 @@ public void getAds(AdRequest req, StreamObserver<AdResponse> responseObserver) {
                 adRequestTypeKey, adRequestType.name(), adResponseTypeKey, adResponseType.name()));
 
         if (getFeatureFlagEnabled(ADSERVICE_FAILURE)) {
-          throw new StatusRuntimeException(Status.RESOURCE_EXHAUSTED);
+          throw new StatusRuntimeException(Status.UNAVAILABLE);
         }
 
         if (getFeatureFlagEnabled(ADSERVICE_MANUAL_GC_FEATURE_FLAG)) {