[chore] upgrade to core v0.58.0 (#13124)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Aug 11, 2022 · 002c643 · 002c643
1 parent 0dc13fa
commit 002c643
Show file tree

Hide file tree

Showing 482 changed files with 2,091 additions and 1,916 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib v0.57.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.57.2
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
-	go.opentelemetry.io/collector/pdata v0.57.2
+	go.opentelemetry.io/collector v0.58.0
+	go.opentelemetry.io/collector/pdata v0.58.0
 	go.uber.org/multierr v1.8.0
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 	golang.org/x/text v0.3.7
@@ -542,10 +542,10 @@ require (
 	go.mongodb.org/atlas v0.16.0 // indirect
 	go.mongodb.org/mongo-driver v1.10.1 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.57.2 // indirect
+	go.opentelemetry.io/collector/semconv v0.58.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
-	go.opentelemetry.io/contrib/zpages v0.33.0 // indirect
+	go.opentelemetry.io/contrib/zpages v0.34.0 // indirect
 	go.opentelemetry.io/otel v1.9.0 // indirect
 	go.opentelemetry.io/otel/metric v0.31.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.9.0 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/go-playground/universal-translator v0.18.0
 	github.com/go-playground/validator/v10 v10.11.0
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
-	go.opentelemetry.io/collector/pdata v0.57.2
+	go.opentelemetry.io/collector v0.58.0
+	go.opentelemetry.io/collector/pdata v0.58.0
 )
 
 require (

diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/cmd/mdatagen/main_test.go b/cmd/mdatagen/main_test.go
@@ -58,7 +58,7 @@ func Test_runContents(t *testing.T) {
 		args                  args
 		expectedDocumentation string
 		want                  string
-		wantErr               string
+		wantErr               bool
 	}{
 		{
 			name:                  "valid metadata",
@@ -76,7 +76,7 @@ func Test_runContents(t *testing.T) {
 			name:    "invalid yaml",
 			args:    args{"invalid", false},
 			want:    "",
-			wantErr: "cannot unmarshal",
+			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
@@ -87,29 +87,28 @@ func Test_runContents(t *testing.T) {
 			require.NoError(t, os.WriteFile(metadataFile, []byte(tt.args.yml), 0600))
 
 			err := run(metadataFile, tt.args.useExpGen)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
 
-			if tt.wantErr != "" {
-				require.Regexp(t, tt.wantErr, err)
-			} else {
-				require.NoError(t, err)
-
-				genFilePath := filepath.Join(tmpdir, "internal/metadata/generated_metrics.go")
-				if tt.args.useExpGen {
-					genFilePath = filepath.Join(tmpdir, "internal/metadata/generated_metrics_v2.go")
-				}
-				require.FileExists(t, genFilePath)
+			genFilePath := filepath.Join(tmpdir, "internal/metadata/generated_metrics.go")
+			if tt.args.useExpGen {
+				genFilePath = filepath.Join(tmpdir, "internal/metadata/generated_metrics_v2.go")
+			}
+			require.FileExists(t, genFilePath)
 
-				actualDocumentation := filepath.Join(tmpdir, "documentation.md")
-				require.FileExists(t, actualDocumentation)
-				if tt.expectedDocumentation != "" {
-					expectedFileBytes, err := os.ReadFile(tt.expectedDocumentation)
-					require.NoError(t, err)
+			actualDocumentation := filepath.Join(tmpdir, "documentation.md")
+			require.FileExists(t, actualDocumentation)
+			if tt.expectedDocumentation != "" {
+				expectedFileBytes, err := os.ReadFile(tt.expectedDocumentation)
+				require.NoError(t, err)
 
-					actualFileBytes, err := os.ReadFile(actualDocumentation)
-					require.NoError(t, err)
+				actualFileBytes, err := os.ReadFile(actualDocumentation)
+				require.NoError(t, err)
 
-					require.Equal(t, expectedFileBytes, actualFileBytes)
-				}
+				require.Equal(t, expectedFileBytes, actualFileBytes)
 			}
 		})
 	}

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
-	go.opentelemetry.io/collector/pdata v0.57.2
-	go.opentelemetry.io/collector/semconv v0.57.2
+	go.opentelemetry.io/collector v0.58.0
+	go.opentelemetry.io/collector/pdata v0.58.0
+	go.opentelemetry.io/collector/semconv v0.58.0
 	go.uber.org/zap v1.22.0
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go
@@ -36,9 +36,10 @@ func newLogsExporter(set component.ExporterCreateSettings, cfg config.Exporter)
 		return nil, err
 	}
 
-	return exporterhelper.NewLogsExporter(
-		cfg,
+	return exporterhelper.NewLogsExporterWithContext(
+		context.TODO(),
 		set,
+		cfg,
 		l.pushLogsData)
 }
 

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go
@@ -36,9 +36,10 @@ func newMetricsExporter(set component.ExporterCreateSettings, cfg config.Exporte
 		return nil, err
 	}
 
-	return exporterhelper.NewMetricsExporter(
-		cfg,
+	return exporterhelper.NewMetricsExporterWithContext(
+		context.TODO(),
 		set,
+		cfg,
 		l.pushMetricsData)
 }
 

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go
@@ -36,9 +36,10 @@ func newTracesExporter(set component.ExporterCreateSettings, cfg config.Exporter
 		return nil, err
 	}
 
-	return exporterhelper.NewTracesExporter(
-		cfg,
+	return exporterhelper.NewTracesExporterWithContext(
+		context.TODO(),
 		set,
+		cfg,
 		l.pushTraceData)
 }
 

diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go
@@ -84,9 +84,10 @@ func newCwLogsExporter(config config.Exporter, params component.ExporterCreateSe
 	if err != nil {
 		return nil, err
 	}
-	return exporterhelper.NewLogsExporter(
-		config,
+	return exporterhelper.NewLogsExporterWithContext(
+		context.TODO(),
 		params,
+		config,
 		logsExporter.ConsumeLogs,
 		exporterhelper.WithQueue(expConfig.enforcedQueueSettings()),
 		exporterhelper.WithRetry(expConfig.RetrySettings),

diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.57.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.57.2
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
-	go.opentelemetry.io/collector/pdata v0.57.2
+	go.opentelemetry.io/collector v0.58.0
+	go.opentelemetry.io/collector/pdata v0.58.0
 	go.uber.org/zap v1.22.0
 )
 

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go
@@ -104,9 +104,10 @@ func newEmfExporter(
 		return nil, err
 	}
 
-	exporter, err := exporterhelper.NewMetricsExporter(
-		config,
+	exporter, err := exporterhelper.NewMetricsExporterWithContext(
+		context.TODO(),
 		set,
+		config,
 		exp.(*emfExporter).pushMetricsData,
 		exporterhelper.WithShutdown(exp.(*emfExporter).Shutdown),
 	)

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -13,9 +13,9 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.57.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.57.2
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
-	go.opentelemetry.io/collector/pdata v0.57.2
-	go.opentelemetry.io/collector/semconv v0.57.2
+	go.opentelemetry.io/collector v0.58.0
+	go.opentelemetry.io/collector/pdata v0.58.0
+	go.opentelemetry.io/collector/semconv v0.58.0
 	go.uber.org/zap v1.22.0
 	google.golang.org/protobuf v1.28.1
 )

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go
@@ -69,9 +69,10 @@ func NewTracesExporter(ctx context.Context, params component.ExporterCreateSetti
 		return nil, err
 	}
 	c := conf.(*Config)
-	return exporterhelper.NewTracesExporter(
-		conf,
+	return exporterhelper.NewTracesExporterWithContext(
+		ctx,
 		params,
+		conf,
 		exp.ConsumeTraces,
 		exporterhelper.WithTimeout(c.TimeoutSettings),
 		exporterhelper.WithRetry(c.RetrySettings),
@@ -85,9 +86,10 @@ func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSett
 		return nil, err
 	}
 	c := conf.(*Config)
-	return exporterhelper.NewMetricsExporter(
-		c,
+	return exporterhelper.NewMetricsExporterWithContext(
+		ctx,
 		params,
+		c,
 		exp.ConsumeMetrics,
 		exporterhelper.WithTimeout(c.TimeoutSettings),
 		exporterhelper.WithRetry(c.RetrySettings),
@@ -101,9 +103,10 @@ func NewLogsExporter(ctx context.Context, params component.ExporterCreateSetting
 		return nil, err
 	}
 	c := conf.(*Config)
-	return exporterhelper.NewLogsExporter(
-		c,
+	return exporterhelper.NewLogsExporterWithContext(
+		ctx,
 		params,
+		c,
 		exp.ConsumeLogs,
 		exporterhelper.WithTimeout(c.TimeoutSettings),
 		exporterhelper.WithRetry(c.RetrySettings),

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -7,15 +7,15 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.57.2
 	github.com/stretchr/testify v1.8.0
-	go.opentelemetry.io/collector v0.57.2
+	go.opentelemetry.io/collector v0.58.0
 	go.uber.org/zap v1.22.0
 )
 
 require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.3.0
 	github.com/jaegertracing/jaeger v1.37.0
-	go.opentelemetry.io/collector/pdata v0.57.2
+	go.opentelemetry.io/collector/pdata v0.58.0
 	go.uber.org/multierr v1.8.0
 )
 
@@ -40,7 +40,7 @@ require (
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.57.2 // indirect
+	go.opentelemetry.io/collector/semconv v0.58.0 // indirect
 	go.opentelemetry.io/otel v1.9.0 // indirect
 	go.opentelemetry.io/otel/metric v0.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.9.0 // indirect