detectors/gcp: use CLOUD_RUN_TASK_INDEX

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
GoogleCloudPlatform · Apr 10, 2023 · e852ece · e852ece
1 parent afeb1ea
commit e852ece
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/detectors/gcp/faas.go b/detectors/gcp/faas.go
@@ -15,6 +15,7 @@
 package gcp
 
 import (
+	"fmt"
 	"strings"
 )
 
@@ -29,6 +30,7 @@ const (
 	faasServiceEnv         = "K_SERVICE"
 	faasRevisionEnv        = "K_REVISION"
 	jobsRevisionEnv        = "CLOUD_RUN_EXECUTION"
+	jobsTaskIndexEnv       = "CLOUD_RUN_TASK_INDEX"
 	regionMetadataAttr     = "instance/region"
 )
 
@@ -63,7 +65,9 @@ func (d *Detector) FaaSVersion() (string, error) {
 		return version, nil
 	}
 	if version, found := d.os.LookupEnv(jobsRevisionEnv); found {
-		return version, nil
+		if index, found := d.os.LookupEnv(jobsTaskIndexEnv); found {
+			return fmt.Sprintf("%s/%s", version, index), nil
+		}
 	}
 	return "", errEnvVarNotFound
 }

diff --git a/detectors/gcp/faas_test.go b/detectors/gcp/faas_test.go
@@ -66,12 +66,13 @@ func TestFaaSVersion(t *testing.T) {
 func TestFaaSJobsVersion(t *testing.T) {
 	d := NewTestDetector(&FakeMetadataProvider{}, &FakeOSProvider{
 		Vars: map[string]string{
-			jobsRevisionEnv: "version-123",
+			jobsRevisionEnv:  "version-123",
+			jobsTaskIndexEnv: "0",
 		},
 	})
 	version, err := d.FaaSVersion()
 	assert.NoError(t, err)
-	assert.Equal(t, version, "version-123")
+	assert.Equal(t, version, "version-123/0")
 }
 
 func TestFaaSVersionErr(t *testing.T) {