internal/config: remove dependency on MonitoredResource proto

For golang/go#61399

Change-Id: I90070de1c2fcde2bb4056c30637d4ff4fdf100f5
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/515376
kokoro-CI: kokoro <[email protected]>
Run-TryBot: Michael Matloob <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Jamal Carvalho <[email protected]>

Author: matloob

cmd/internal/cmdconfig/cmdconfig.go

@@ -25,12 +25,16 @@ import (
 	"golang.org/x/pkgsite/internal/log/stackdriverlogger"
 	"golang.org/x/pkgsite/internal/middleware"
 	"golang.org/x/pkgsite/internal/postgres"
+	mrpb "google.golang.org/genproto/googleapis/api/monitoredres"
 )
 
 // Logger configures a middleware.Logger.
 func Logger(ctx context.Context, cfg *config.Config, logName string) middleware.Logger {
 	if cfg.OnGCP() {
-		opts := []logging.LoggerOption{logging.CommonResource(cfg.MonitoredResource)}
+		opts := []logging.LoggerOption{logging.CommonResource(&mrpb.MonitoredResource{
+			Type:   cfg.MonitoredResource.Type,
+			Labels: cfg.MonitoredResource.Labels,
+		})}
 		if cfg.OnGKE() {
 			opts = append(opts, logging.CommonLabels(map[string]string{
 				"k8s-pod/env": cfg.DeploymentEnvironment(),

internal/config/config.go

@@ -28,7 +28,6 @@ import (
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/log"
 	"golang.org/x/pkgsite/internal/secrets"
-	mrpb "google.golang.org/genproto/googleapis/api/monitoredres"
 	"gopkg.in/yaml.v3"
 )
 
@@ -151,7 +150,7 @@ type Config struct {
 	// "An object representing a resource that can be used for monitoring, logging,
 	// billing, or other purposes. Examples include virtual machine instances,
 	// databases, and storage devices such as disks.""
-	MonitoredResource *mrpb.MonitoredResource
+	MonitoredResource *MonitoredResource
 
 	// FallbackVersionLabel is used as the VersionLabel when not hosting on
 	// AppEngine.
@@ -193,6 +192,19 @@ type Config struct {
 	VulnDB string
 }
 
+// MonitoredResource represents the resource that is running the current binary.
+// It might be a Google AppEngine app, a Cloud Run service, or a Kubernetes pod.
+// See https://cloud.google.com/monitoring/api/resources for more
+// details:
+// "An object representing a resource that can be used for monitoring, logging,
+// billing, or other purposes. Examples include virtual machine instances,
+// databases, and storage devices such as disks."
+type MonitoredResource struct {
+	Type string `yaml:"type,omitempty"`
+
+	Labels map[string]string `yaml:"labels,omitempty"`
+}
+
 // AppVersionLabel returns the version label for the current instance.  This is
 // the AppVersionID available, otherwise a string constructed using the
 // timestamp of process start.
@@ -444,7 +456,7 @@ func Init(ctx context.Context) (_ *Config, err error) {
 			// Use the gae_app monitored resource. It would be better to use the
 			// gae_instance monitored resource, but that's not currently supported:
 			// https://cloud.google.com/logging/docs/api/v2/resource-list#resource-types
-			cfg.MonitoredResource = &mrpb.MonitoredResource{
+			cfg.MonitoredResource = &MonitoredResource{
 				Type: "gae_app",
 				Labels: map[string]string{
 					"project_id": cfg.ProjectID,
@@ -454,7 +466,7 @@ func Init(ctx context.Context) (_ *Config, err error) {
 				},
 			}
 		case cfg.OnCloudRun():
-			cfg.MonitoredResource = &mrpb.MonitoredResource{
+			cfg.MonitoredResource = &MonitoredResource{
 				Type: "cloud_run_revision",
 				Labels: map[string]string{
 					"project_id":         cfg.ProjectID,
@@ -464,7 +476,7 @@ func Init(ctx context.Context) (_ *Config, err error) {
 				},
 			}
 		case cfg.OnGKE():
-			cfg.MonitoredResource = &mrpb.MonitoredResource{
+			cfg.MonitoredResource = &MonitoredResource{
 				Type: "k8s_container",
 				Labels: map[string]string{
 					"project_id":     cfg.ProjectID,
@@ -486,7 +498,7 @@ func Init(ctx context.Context) (_ *Config, err error) {
 			cfg.InstanceID = id
 		}
 	} else { // running locally, perhaps
-		cfg.MonitoredResource = &mrpb.MonitoredResource{
+		cfg.MonitoredResource = &MonitoredResource{
 			Type:   "global",
 			Labels: map[string]string{"project_id": cfg.ProjectID},
 		}

internal/dcensus/dcensus.go

@@ -23,7 +23,6 @@ import (
 	"golang.org/x/pkgsite/internal/config"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/log"
-	mrpb "google.golang.org/genproto/googleapis/api/monitoredres"
 )
 
 // KeyStatus is a tag key named "status".
@@ -109,7 +108,7 @@ func NewServer() (http.Handler, error) {
 
 // monitoredResource wraps a *mrpb.MonitoredResource to implement the
 // monitoredresource.MonitoredResource interface.
-type monitoredResource mrpb.MonitoredResource
+type monitoredResource config.MonitoredResource
 
 func (r *monitoredResource) MonitoredResource() (resType string, labels map[string]string) {
 	return r.Type, r.Labels