Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

detectors/gcp: support Cloud Run jobs #465

Merged
merged 13 commits into from
Jun 15, 2023
Merged

detectors/gcp: support Cloud Run jobs #465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
92a8897
detectors/gcp: support Cloud Run jobs
zchee Jul 29, 2022
b1e33e8
detectors/gcp: remove CloudRunJobs constant
zchee Jul 29, 2022
7920ef8
detectors/gcp: use CLOUD_RUN_TASK_INDEX
zchee Sep 13, 2022
68b1cff
detectors/gcp: revert sort CloudPlatform switch order
zchee Jun 9, 2023
a3a31da
detectors/gcp: fix correct env constants names and fix ref url
zchee Jun 11, 2023
11dc231
detectors/gcp: fix function order to correspond enum order
zchee Jun 11, 2023
5e26da3
detectors/gcp: add onCloudRunJob func and CloudRunJob constants
zchee Jun 12, 2023
3755862
detectors/gcp: add FaaSJobExecution and FaaSJobTaskIndex
zchee Jun 12, 2023
d6f9c04
detectors/gcp: fix documentation for service names and reference urls
zchee Jun 12, 2023
72a42ba
detectors/gcp: add testcase for Cloud Run jobs
zchee Jun 12, 2023
6442c45
detectors/gcp: fix FaaSID test function name
zchee Jun 12, 2023
fff21cb
detectors/gcp: unifiy Cloud Run jobs related funcs to otel spec
zchee Jun 13, 2023
d0c31de
detectors/gcp: fix typo of CloudRunJobExecution
zchee Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions detectors/gcp/faas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ const (
cloudRunJobsEnv = "CLOUD_RUN_JOB"
faasServiceEnv = "K_SERVICE"
faasRevisionEnv = "K_REVISION"
jobsExecutionEnv = "CLOUD_RUN_EXECUTION"
jobsTaskIndexEnv = "CLOUD_RUN_TASK_INDEX"
cloudRunJobExecutionEnv = "CLOUD_RUN_EXECUTION"
cloudRunJobTaskIndexEnv = "CLOUD_RUN_TASK_INDEX"
regionMetadataAttr = "instance/region"
)

Expand Down Expand Up @@ -71,17 +71,17 @@ func (d *Detector) FaaSVersion() (string, error) {
return "", errEnvVarNotFound
}

// FaaSJobExecution returns the execution id of the Cloud Run jobs.
func (d *Detector) FaaSJobExecution() (string, error) {
if version, found := d.os.LookupEnv(jobsExecutionEnv); found {
// CloudRunJobbExecution returns the execution id of the Cloud Run jobs.
func (d *Detector) CloudRunJobbExecution() (string, error) {
damemi marked this conversation as resolved.
Show resolved Hide resolved
if version, found := d.os.LookupEnv(cloudRunJobExecutionEnv); found {
return version, nil
}
return "", errEnvVarNotFound
}

// FaaSJobTaskIndex returns the task index for the execution of the Cloud Run jobs.
func (d *Detector) FaaSJobTaskIndex() (string, error) {
if version, found := d.os.LookupEnv(jobsTaskIndexEnv); found {
// CloudRunJobTaskIndex returns the task index for the execution of the Cloud Run jobs.
func (d *Detector) CloudRunJobTaskIndex() (string, error) {
if version, found := d.os.LookupEnv(cloudRunJobTaskIndexEnv); found {
return version, nil
}
return "", errEnvVarNotFound
Expand Down
12 changes: 6 additions & 6 deletions detectors/gcp/faas_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ func TestFaaSVersionErr(t *testing.T) {
func TestFaaSJobExecution(t *testing.T) {
d := NewTestDetector(&FakeMetadataProvider{}, &FakeOSProvider{
Vars: map[string]string{
jobsExecutionEnv: "version-123",
cloudRunJobExecutionEnv: "version-123",
},
})
version, err := d.FaaSJobExecution()
version, err := d.CloudRunJobbExecution()
assert.NoError(t, err)
assert.Equal(t, version, "version-123")
}
Expand All @@ -87,18 +87,18 @@ func TestFaaSJobExecutionErr(t *testing.T) {
d := NewTestDetector(&FakeMetadataProvider{}, &FakeOSProvider{
Vars: map[string]string{},
})
name, err := d.FaaSJobExecution()
name, err := d.CloudRunJobbExecution()
assert.Error(t, err)
assert.Equal(t, name, "")
}

func TestFaaSJobTaskIndex(t *testing.T) {
d := NewTestDetector(&FakeMetadataProvider{}, &FakeOSProvider{
Vars: map[string]string{
jobsTaskIndexEnv: "5",
cloudRunJobTaskIndexEnv: "5",
},
})
version, err := d.FaaSJobTaskIndex()
version, err := d.CloudRunJobTaskIndex()
assert.NoError(t, err)
assert.Equal(t, version, "5")
}
Expand All @@ -107,7 +107,7 @@ func TestFaaSJobTaskIndexErr(t *testing.T) {
d := NewTestDetector(&FakeMetadataProvider{}, &FakeOSProvider{
Vars: map[string]string{},
})
name, err := d.FaaSJobTaskIndex()
name, err := d.CloudRunJobTaskIndex()
assert.Error(t, err)
assert.Equal(t, name, "")
}
Expand Down