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.

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

Added google cloud function resource detector #1584

Merged
merged 20 commits into from Mar 4, 2022
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -14,6 +14,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- DynamoDB spans created with the `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws` package will now have the appropriate database attributes added for the operation being performed.
These attributes are detected automatically, but it is also now possible to provide a custom function to set attributes using `WithAttributeSetter`. (#1582)

MrAlias marked this conversation as resolved.
Show resolved Hide resolved
- Add resource detector for GCP cloud function.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Add resource detector for GCP cloud function.
- Add resource detector for GCP cloud function. (#1584)


### Fixed

- Fix the `echo` middleware by using `SpanKind.SERVER` when deciding the `SpanStatus`.
Expand Down
71 changes: 71 additions & 0 deletions detectors/gcp/cloud-function.go
@@ -0,0 +1,71 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package gcp

import (
"context"
"os"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
)

const (
gcpFunctionNameKey = "K_SERVICE"
)

// NewCloudFunction will return a GCP Cloud Function resource detector.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// NewCloudFunction will return a GCP Cloud Function resource detector.
// NewCloudFunction returns a GCP Cloud Function resource detector.

func NewCloudFunction() resource.Detector {
return &cloudFunction{
cloudRun: NewCloudRun(),
}
}

// CloudFunction collects resource information of GCP Cloud Function
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
type cloudFunction struct {
cloudRun *CloudRun
}

// Detect detects associated resources when running in GCP Cloud Function.
func (f *cloudFunction) Detect(ctx context.Context) (*resource.Resource, error) {
functionName, ok := f.googleCloudFunctionName()
if !ok {
return nil, nil
}

projectID, err := f.cloudRun.mc.ProjectID()
if err != nil {
return nil, err
}
region, err := f.cloudRun.cloudRegion(ctx)
if err != nil {
return nil, err
}

attributes := []attribute.KeyValue{
semconv.CloudProviderGCP,
semconv.CloudPlatformGCPCloudFunctions,
semconv.FaaSNameKey.String(functionName),
semconv.CloudAccountIDKey.String(projectID),
semconv.CloudRegionKey.String(region),
}
return resource.NewWithAttributes(semconv.SchemaURL, attributes...), nil

}

func (f *cloudFunction) googleCloudFunctionName() (string, bool) {
return os.LookupEnv(gcpFunctionNameKey)
}
175 changes: 175 additions & 0 deletions detectors/gcp/cloud-function_test.go
@@ -0,0 +1,175 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package gcp
MrAlias marked this conversation as resolved.
Show resolved Hide resolved

import (
"context"
"errors"
"os"
"testing"

"github.com/google/go-cmp/cmp"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
)

var (
errTest = errors.New("testError")
)

const (
projectIDValue = "some-projectID"
regionValue = "some-region"
functionName = "sample-function"
)

type metaDataClientImpl struct {
projectID func() (string, error)
get func(string) (string, error)
instanceID func() (string, error)
}

func (mock *metaDataClientImpl) ProjectID() (string, error) {
if mock.projectID != nil {
return mock.projectID()
}
return "", nil
}

func (mock *metaDataClientImpl) Get(key string) (string, error) {
if mock.get != nil {
return mock.get(key)
}
return "", nil
}

func (mock *metaDataClientImpl) InstanceID() (string, error) {
if mock.instanceID != nil {
return mock.instanceID()
}
return "", nil
}

type want struct {
res *resource.Resource
err error
}

func TestCloudFunctionDetect(t *testing.T) {
oldValue, ok := os.LookupEnv(gcpFunctionNameKey)
if !ok {
err := os.Setenv(gcpFunctionNameKey, functionName)
if err != nil {
t.Error("unable to set environment variable ", err)
}
}
defer func() {
if !ok {
os.Unsetenv(gcpFunctionNameKey)
} else {
os.Setenv(gcpFunctionNameKey, oldValue)
}
}()
Aneurysm9 marked this conversation as resolved.
Show resolved Hide resolved
tests := []struct {
name string
cr *CloudRun
expected want
}{
{
name: "error in reading ProjectID",
cr: &CloudRun{
mc: &metaDataClientImpl{
projectID: func() (string, error) {
return "", errTest
},
},
},
expected: want{
res: nil,
err: errTest,
},
},
{
name: "error in reading region",
cr: &CloudRun{
mc: &metaDataClientImpl{
get: func(key string) (string, error) {
return "", errTest
},
},
},
expected: want{
res: nil,
err: errTest,
},
},
{
name: "success",
cr: &CloudRun{
mc: &metaDataClientImpl{
projectID: func() (string, error) {
return projectIDValue, nil
},
get: func(key string) (string, error) {
return regionValue, nil
},
},
},
expected: want{
res: resource.NewSchemaless([]attribute.KeyValue{
semconv.CloudProviderGCP,
semconv.CloudPlatformGCPCloudFunctions,
semconv.FaaSNameKey.String(functionName),
semconv.CloudAccountIDKey.String(projectIDValue),
semconv.CloudRegionKey.String(regionValue),
}...),
err: nil,
},
},
}

for _, test := range tests {
detector := cloudFunction{
cloudRun: test.cr,
}
res, err := detector.Detect(context.Background())
if err != test.expected.err {
t.Fatalf("got unexpected failure: %v", err)
} else if diff := cmp.Diff(test.expected.res, res); diff != "" {
t.Errorf("detected resource differ from expected (-want, +got)\n%s", diff)
}
}
}

func TestNotOnCloudFunction(t *testing.T) {
oldValue, ok := os.LookupEnv(gcpFunctionNameKey)
if ok {
os.Unsetenv(gcpFunctionNameKey)
}
defer func() {
if ok {
os.Setenv(gcpFunctionNameKey, oldValue)
}
}()
detector := NewCloudFunction()
res, err := detector.Detect(context.Background())
if err != nil {
t.Errorf("expected cloud function detector to return error as nil, but returned %v", err)
} else if res != nil {
t.Errorf("expected cloud function detector to return resource as nil, but returned %v", res)
}
}