Merge of heartbeats branch with master. Needed to add sampler to latt…

…ency attribution in heartbeat builder.

.asf.yaml

@@ -49,6 +49,7 @@ github:
 
   protected_branches:
     master: {}
+    release-2.53.0: {}
     release-2.52.0: {}
     release-2.51.0: {}
     release-2.50.0: {}

.github/REVIEWERS.yml

@@ -60,6 +60,10 @@ labels:
       - igorbernstein2
       - mutianf
     exclusionList: []
+  - name: healthcare
+    reviewers:
+      - svetakvsundhar
+    exclusionList: []
   - name: Build
     reviewers:
       - damccorm

.github/actions/gradle-command-self-hosted-action/action.yml

@@ -35,9 +35,9 @@ runs:
     - name: Run Gradle Command
       shell: bash
       run: |
-        # Removing settings.xml is a workaround to avoid a decryption issue
-        # of Beam's gradle-command-action plugin and github's provided
-        # maven settings.xml file
+        # This step is a workaround to avoid a decryption issue of Beam's
+        # net.linguica.gradle.maven.settings plugin and github's provided maven
+        # settings.xml file
         if [ -f ~/.m2/settings.xml ]; then
           rm ~/.m2/settings.xml
         fi

.github/actions/setup-action/action.yml

@@ -36,8 +36,10 @@ runs:
       shell: bash
       if: github.event_name == 'issue_comment' && github.event.comment.body != inputs.comment_phrase
       run: |
-        echo "The comment ${{ github.event.comment.body }} does not match the phrase for this instance:  ${{ inputs.comment_phrase }}. Exiting."
+        echo "The comment $PHRASE does not match the phrase for this instance:  ${{ inputs.comment_phrase }}. Exiting."
         exit 1
+      env:
+        PHRASE: "${{ github.event.comment.body }}"
     - name: Check out repository code if pull request commit
       shell: bash
       if: ${{ github.event_name == 'pull_request_target' }}
@@ -69,4 +71,4 @@ runs:
     - name: expose gcloud path
       shell: bash
       run: |
-        echo KUBELET_GCLOUD_CONFIG_PATH=/var/lib/kubelet/pods/$POD_UID/volumes/kubernetes.io~empty-dir/gcloud >> $GITHUB_ENV
+        echo KUBELET_GCLOUD_CONFIG_PATH=/var/lib/kubelet/pods/$POD_UID/volumes/kubernetes.io~empty-dir/gcloud >> $GITHUB_ENV

.github/autolabeler.yml

@@ -57,6 +57,7 @@ io:  ["sdks/go/pkg/beam/io/**/*", "sdks/java/io/**/*", "sdks/python/apache_beam/
 "hadoop":  ["sdks/java/io/hadoop-common/**/*", "sdks/java/io/hadoop-file-system/**/*", "sdks/java/io/hadoop-format/**/*"]
 "hbase":  ["sdks/java/io/hbase/**/*"]
 "hcatalog":  ["sdks/java/io/hcatalog/**/*"]
+"healthcare":  ["sdks/python/apache_beam/io/gcp/healthcare/**/*", "sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/**/*"]
 "jdbc":  ["sdks/java/io/jdbc/**/*"]
 "jms":  ["sdks/java/io/jms/**/*"]
 "kafka":  ["sdks/java/io/kafka/**/*"]

.github/build.gradle

@@ -28,6 +28,7 @@ buildscript {
 /** check that yml are valid */
 task check {
   doLast {
+    List<String> errors = []
     fileTree("${project.projectDir}/workflows").matching {
       include "*.yml"
       include "*.yaml"
@@ -36,23 +37,41 @@ task check {
       // attempt load yml to make sure its valid
       def workflow = new org.yaml.snakeyaml.Yaml().load(it.newInputStream())
 
-      // additional guards for running all tests functionality
-      // TODO(yathu) expand this also to post commits prior teardown Jenkins postcommits
-      if ( fname.startsWith("beam_PreCommit")) {
+      // additional guards to ensure tests configured in same way
+      if ( fname.startsWith("beam_PreCommit") || fname.startsWith("beam_PostCommit") ) {
         List paths
         try {
           paths = workflow.getAt(true).pull_request_target.paths as List
         } catch (Exception e) {
-          throw new GradleException("Fail to get the trigger path for ${fname}. " +
-                  "Make sure precommit has a pull_request_target trigger.", e)
+          errors.add("Fail to get the trigger path for ${fname}. " +
+                  "Make sure it has a pull_request_target trigger.")
+          return
         }
-        // precommit should triggered by this specific file
+
+        // precommit and postcommit should triggered by this specific file
+        // this is to ensure not missing test during release branch verification
         if (paths != null && !paths.contains('release/trigger_all_tests.json')) {
-          throw new GradleException("Error validating ${fname}: " +
-                  "Please add 'release/trigger_all_tests.json' to the trigger path for release verification run properly")
+          errors.add("Error validating ${fname}: " +
+                  "Please add 'release/trigger_all_tests.json' to the trigger path")
+          return
+        }
+
+        // postcommit should triggered by a specific file so that there is a way to exercise post for open PR
+        // TODO(https://github.com/apache/beam/issues/28909)
+        //  remove file match trigger once a better trigger (e.g. comment trigger) is implemented
+        if (fname.startsWith("beam_PostCommit")) {
+          String triggerFile = '.github/trigger_files/' + fname.take(fname.lastIndexOf('.')) + '.json'
+          if (paths != null && !paths.contains(triggerFile)) {
+            errors.add("Error validating ${fname}: " +
+                    "Please add ${triggerFile} to the trigger path")
+            return
+          }
         }
       }
     }
+    if (!errors.isEmpty()) {
+      throw new GradleException("Check failed: " + errors.join('\n'))
+    }
   }
 }
 

.github/gh-actions-self-hosted-runners/arc/locals.tf

@@ -20,6 +20,8 @@
 
 locals {
         arc_values = {
+            #fix dind issue
+            "image.dindSidecarRepositoryAndTag" = "docker:24.0.7-dind-alpine3.18"
             "githubWebhookServer.enabled" = "${var.deploy_webhook}"
             "authSecret.create" = "true"
             "authSecret.github_app_id" = data.google_secret_manager_secret_version.github_app_id.secret_data