Skip to content

Commit

Permalink
Merge branch 'main' into prometheus_bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
dashpole committed Aug 31, 2023
2 parents 80ce130 + 84de4d2 commit 3803ef3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report_detector_gcp.md
@@ -1,8 +1,8 @@
---
name: '[detector: aws:gcp] Bug report'
name: '[detector: gcp] Bug report'
about: Create a report of invalid behavior about the gcp package to help us improve
title: ''
labels: 'bug, area: detector, detector: aws:gcp'
labels: 'bug, area: detector, detector: gcp'

---

Expand Down
1 change: 1 addition & 0 deletions detectors/gcp/cloud-function.go
Expand Up @@ -28,6 +28,7 @@ const (
)

// NewCloudFunction will return a GCP Cloud Function resource detector.
//
// Deprecated: Use gcp.NewDetector() instead, which sets the same resource attributes.
func NewCloudFunction() resource.Detector {
return &cloudFunction{
Expand Down
2 changes: 2 additions & 0 deletions detectors/gcp/cloud-run.go
Expand Up @@ -38,6 +38,7 @@ type metadataClient interface {
}

// CloudRun collects resource information of Cloud Run instance.
//
// Deprecated: Use gcp.NewDetector() instead. Note that it sets faas.* resource attributes instead of service.* attributes.
type CloudRun struct {
mc metadataClient
Expand All @@ -50,6 +51,7 @@ type CloudRun struct {
var _ resource.Detector = (*CloudRun)(nil)

// NewCloudRun creates a CloudRun detector.
//
// Deprecated: Use gcp.NewDetector() instead. Note that it sets faas.* resource attributes instead of service.* attributes.
func NewCloudRun() *CloudRun {
return &CloudRun{
Expand Down
1 change: 1 addition & 0 deletions detectors/gcp/gce.go
Expand Up @@ -28,6 +28,7 @@ import (
)

// GCE collects resource information of GCE computing instances.
//
// Deprecated: Use gcp.NewDetector() instead, which sets the same resource attributes on GCE.
type GCE struct{}

Expand Down
1 change: 1 addition & 0 deletions detectors/gcp/gke.go
Expand Up @@ -27,6 +27,7 @@ import (
)

// GKE collects resource information of GKE computing instances.
//
// Deprecated: Use gcp.NewDetector() instead, which does NOT detect container, pod, and namespace attributes.
// Set those using name using the OTEL_RESOURCE_ATTRIBUTES env var instead.
type GKE struct{}
Expand Down

0 comments on commit 3803ef3

Please sign in to comment.