collector: upgrade collector to v0.93

This change does the following:
 - Update the OTel collector
 - Use updated Prometheus library with patch: GoogleCloudPlatform/prometheus#132
 - Update unit tests

Change-Id: I1f0a293f496d265c8ef1de7b01a287d5c5c7be71

Makefile

@@ -37,8 +37,6 @@ OTEL_VER ?= latest
 update-components:
 	go list -m -f '{{if not (or .Indirect .Main)}}{{.Path}}{{end}}' all | \
 		grep "^go.opentelemetry.io" | \
-		grep -v "go.opentelemetry.io/collector/featuregate" | \
-		grep -v "go.opentelemetry.io/collector/pdata" | \
 		xargs -t -I '{}' go get {}@$(OTEL_VER)
 	go get -u github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus@latest
 	go list -m -f '{{if not (or .Indirect .Main)}}{{.Path}}{{end}}' all | \

collector/exporter/googlemanagedprometheusexporter/config.go

@@ -19,7 +19,6 @@ type Config struct {
 	// Timeout for all API calls. If not set, defaults to 12 seconds.
 	exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
 	exporterhelper.QueueSettings   `mapstructure:"sending_queue"`
-	exporterhelper.RetrySettings   `mapstructure:"retry_on_failure"`
 }
 
 // GMPConfig is a subset of the collector config applicable to the GMP exporter.

collector/exporter/googlemanagedprometheusexporter/config_test.go

@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cenkalti/backoff/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
@@ -55,14 +54,6 @@ func TestLoadConfig(t *testing.T) {
 					Prefix: "my-metric-domain.com",
 				},
 			},
-			RetrySettings: exporterhelper.RetrySettings{
-				Enabled:             true,
-				InitialInterval:     10 * time.Second,
-				MaxInterval:         1 * time.Minute,
-				MaxElapsedTime:      10 * time.Minute,
-				RandomizationFactor: backoff.DefaultRandomizationFactor,
-				Multiplier:          backoff.DefaultMultiplier,
-			},
 			QueueSettings: exporterhelper.QueueSettings{
 				Enabled:      true,
 				NumConsumers: 2,

collector/exporter/googlemanagedprometheusexporter/factory.go

@@ -33,11 +33,8 @@ func NewFactory() exporter.Factory {
 
 // createDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() component.Config {
-	retrySettings := exporterhelper.NewDefaultRetrySettings()
-	retrySettings.Enabled = false
 	return &Config{
 		TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout},
-		RetrySettings:   retrySettings,
 		QueueSettings:   exporterhelper.NewDefaultQueueSettings(),
 		GMPConfig: GMPConfig{
 			MetricConfig: MetricConfig{
@@ -73,6 +70,5 @@ func createMetricsExporter(
 		// Disable exporterhelper Timeout, since we are using a custom mechanism
 		// within exporter itself
 		exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
-		exporterhelper.WithQueue(eCfg.QueueSettings),
-		exporterhelper.WithRetry(eCfg.RetrySettings))
+		exporterhelper.WithQueue(eCfg.QueueSettings))
 }

collector/exporter/googlemanagedprometheusexporter/testdata/config.yaml

@@ -14,11 +14,6 @@ exporters:
       enabled: true
       num_consumers: 2
       queue_size: 10
-    retry_on_failure:
-      enabled: true
-      initial_interval: 10s
-      max_interval: 60s
-      max_elapsed_time: 10m
     metric:
       prefix: my-metric-domain.com
       add_metric_suffixes: false

collector/internal/env/env_test.go

@@ -27,6 +27,6 @@ import (
 func Test_Create(t *testing.T) {
 	require.NoError(t, Create())
 
-	expectedUserAgentRegex := fmt.Sprintf(`^Google Cloud Metrics Agent/latest \(TargetPlatform=(?i:%v); Framework=OpenTelemetry Collector\) .* \(Cores=\d+; Memory=(?:[0-9]*[.])?[0-9]+GB; Disk=(?:[0-9]*[.])?[0-9]+GB\)$`, runtime.GOOS)
+	expectedUserAgentRegex := fmt.Sprintf(`^Google Cloud Run GMP Sidecar/latest \(TargetPlatform=(?i:%v); Framework=OpenTelemetry Collector\) .* \(Cores=\d+; Memory=(?:[0-9]*[.])?[0-9]+GB; Disk=(?:[0-9]*[.])?[0-9]+GB\)$`, runtime.GOOS)
 	assert.Regexp(t, expectedUserAgentRegex, os.Getenv("USERAGENT"))
 }

confgenerator/confgenerator.go

@@ -63,12 +63,6 @@ func googleManagedPrometheusExporter(userAgent string) otel.Component {
 	return otel.Component{
 		Type: "googlemanagedprometheus",
 		Config: map[string]interface{}{
-			// (b/233372619) Due to a constraint in the Monarch API for retrying successful data points,
-			// leaving this enabled is causing adverse effects for some customers. Google OpenTelemetry team
-			// recommends disabling this.
-			"retry_on_failure": map[string]interface{}{
-				"enabled": false,
-			},
 			"user_agent":            userAgent,
 			"untyped_double_export": true,
 			// The exporter has the config option addMetricSuffixes with default value true. It will add Prometheus

confgenerator/testdata/add-metadata-labels/golden/otel.yaml

@@ -2,8 +2,6 @@ exporters:
   googlemanagedprometheus:
     metric:
       add_metric_suffixes: false
-    retry_on_failure:
-      enabled: false
     untyped_double_export: true
     user_agent: Google-Cloud-Run-GMP-Sidecar/latest; ShortName=run-gmp;ShortVersion=latest
 processors:

confgenerator/testdata/builtin/golden/otel.yaml

@@ -2,8 +2,6 @@ exporters:
   googlemanagedprometheus:
     metric:
       add_metric_suffixes: false
-    retry_on_failure:
-      enabled: false
     untyped_double_export: true
     user_agent: Google-Cloud-Run-GMP-Sidecar/latest; ShortName=run-gmp;ShortVersion=latest
 processors:

confgenerator/testdata/relabel-labels/golden/otel.yaml

@@ -2,8 +2,6 @@ exporters:
   googlemanagedprometheus:
     metric:
       add_metric_suffixes: false
-    retry_on_failure:
-      enabled: false
     untyped_double_export: true
     user_agent: Google-Cloud-Run-GMP-Sidecar/latest; ShortName=run-gmp;ShortVersion=latest
 processors:

confgenerator/testdata/simple-app-scrape/golden/otel.yaml

@@ -2,8 +2,6 @@ exporters:
   googlemanagedprometheus:
     metric:
       add_metric_suffixes: false
-    retry_on_failure:
-      enabled: false
     untyped_double_export: true
     user_agent: Google-Cloud-Run-GMP-Sidecar/latest; ShortName=run-gmp;ShortVersion=latest
 processors: