From f8f82aa1f4ee163c6082c3c09e869d072fb71b9c Mon Sep 17 00:00:00 2001 From: averikitsch Date: Fri, 15 Apr 2022 11:20:01 -0700 Subject: [PATCH 1/2] fix: Update env var and log filter --- run/jobs/src/main/java/com/example/JobsExample.java | 12 +++++++----- .../test/java/com/example/JobsIntegrationTests.java | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/run/jobs/src/main/java/com/example/JobsExample.java b/run/jobs/src/main/java/com/example/JobsExample.java index 7b5c1488c48..a9a1db38282 100644 --- a/run/jobs/src/main/java/com/example/JobsExample.java +++ b/run/jobs/src/main/java/com/example/JobsExample.java @@ -14,13 +14,14 @@ * limitations under the License. */ +// [START cloudrun_jobs_quickstart] package com.example; abstract class JobsExample { // [START cloudrun_jobs_env_vars] // These values are provided automatically by the Cloud Run Jobs runtime. - private static String TASK_NUM = System.getenv().getOrDefault("TASK_NUM", "0"); - private static String ATTEMPT_NUM = System.getenv().getOrDefault("ATTEMPT_NUM", "0"); + private static String CLOUD_RUN_TASK_INDEX = System.getenv().getOrDefault("CLOUD_RUN_TASK_INDEX", "0"); + private static String CLOUD_RUN_TASK_ATTEMPT = System.getenv().getOrDefault("CLOUD_RUN_TASK_ATTEMPT", "0"); // User-provided environment variables private static int SLEEP_MS = Integer.parseInt(System.getenv().getOrDefault("SLEEP_MS", "0")); @@ -30,11 +31,11 @@ abstract class JobsExample { // Start script public static void main(String[] args) { - System.out.println(String.format("Starting Task #%s, Attempt #%s...", TASK_NUM, ATTEMPT_NUM)); + System.out.println(String.format("Starting Task #%s, Attempt #%s...", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); try { runTask(SLEEP_MS, FAIL_RATE); } catch (RuntimeException | InterruptedException e) { - System.err.println(String.format("Task #%s, Attempt #%s failed.", TASK_NUM, ATTEMPT_NUM)); + System.err.println(String.format("Task #%s, Attempt #%s failed.", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); // [START cloudrun_jobs_exit_process] // Catch error and denote process-level failure to retry Task System.exit(1); @@ -59,6 +60,7 @@ static void runTask(int sleepTime, float failureRate) throws InterruptedExceptio if (Math.random() < failureRate) { throw new RuntimeException("Task Failed."); } - System.out.println(String.format("Completed Task #%s", TASK_NUM)); + System.out.println(String.format("Completed Task #%s", CLOUD_RUN_TASK_INDEX)); } } +// [END cloudrun_jobs_quickstart] \ No newline at end of file diff --git a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java index 4d9ded0e1e6..41ade762402 100644 --- a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java +++ b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java @@ -95,8 +95,8 @@ public void generatesLogs() throws Exception { calendar.add(Calendar.MINUTE, -5); DateFormat rfc3339 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); String logFilter = - "resource.type = \"cloud_run_revision\"" - + " resource.labels.service_name = \"" + "resource.type = \"cloud_run_job\"" + + " resource.labels.job_name = \"" + service + "\" resource.labels.location = \"us-central1\"" + " timestamp>=\"" From 412435597e5e2a074f63db46ebf271c049594e20 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Fri, 15 Apr 2022 11:25:54 -0700 Subject: [PATCH 2/2] lint --- .../src/main/java/com/example/JobsExample.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/run/jobs/src/main/java/com/example/JobsExample.java b/run/jobs/src/main/java/com/example/JobsExample.java index a9a1db38282..e81dad0e8fa 100644 --- a/run/jobs/src/main/java/com/example/JobsExample.java +++ b/run/jobs/src/main/java/com/example/JobsExample.java @@ -15,13 +15,16 @@ */ // [START cloudrun_jobs_quickstart] + package com.example; abstract class JobsExample { // [START cloudrun_jobs_env_vars] // These values are provided automatically by the Cloud Run Jobs runtime. - private static String CLOUD_RUN_TASK_INDEX = System.getenv().getOrDefault("CLOUD_RUN_TASK_INDEX", "0"); - private static String CLOUD_RUN_TASK_ATTEMPT = System.getenv().getOrDefault("CLOUD_RUN_TASK_ATTEMPT", "0"); + private static String CLOUD_RUN_TASK_INDEX = + System.getenv().getOrDefault("CLOUD_RUN_TASK_INDEX", "0"); + private static String CLOUD_RUN_TASK_ATTEMPT = + System.getenv().getOrDefault("CLOUD_RUN_TASK_ATTEMPT", "0"); // User-provided environment variables private static int SLEEP_MS = Integer.parseInt(System.getenv().getOrDefault("SLEEP_MS", "0")); @@ -31,11 +34,15 @@ abstract class JobsExample { // Start script public static void main(String[] args) { - System.out.println(String.format("Starting Task #%s, Attempt #%s...", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); + System.out.println( + String.format( + "Starting Task #%s, Attempt #%s...", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); try { runTask(SLEEP_MS, FAIL_RATE); } catch (RuntimeException | InterruptedException e) { - System.err.println(String.format("Task #%s, Attempt #%s failed.", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); + System.err.println( + String.format( + "Task #%s, Attempt #%s failed.", CLOUD_RUN_TASK_INDEX, CLOUD_RUN_TASK_ATTEMPT)); // [START cloudrun_jobs_exit_process] // Catch error and denote process-level failure to retry Task System.exit(1); @@ -63,4 +70,4 @@ static void runTask(int sleepTime, float failureRate) throws InterruptedExceptio System.out.println(String.format("Completed Task #%s", CLOUD_RUN_TASK_INDEX)); } } -// [END cloudrun_jobs_quickstart] \ No newline at end of file +// [END cloudrun_jobs_quickstart]