upgrade OCB components to v0.113.0

amazon-contributing · Nov 15, 2024 · 78a0930 · 78a0930
1 parent 6a72ed9
commit 78a0930
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 150 deletions.
diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go
@@ -60,7 +60,7 @@ func createMetricsExporter(ctx context.Context, params exporter.Settings, config
 		return nil, err
 	}
 
-	exporter, err := exporterhelper.NewMetricsExporter(
+	exporter, err := exporterhelper.NewMetrics(
 		ctx,
 		params,
 		config,

diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -26,7 +26,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 	assert.NotNil(t, cfg.(*Config).logger)
 }
 
-func TestCreateTracesExporter(t *testing.T) {
+func TestCreateTraces(t *testing.T) {
 	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
 	factory := NewFactory()
@@ -37,12 +37,12 @@ func TestCreateTracesExporter(t *testing.T) {
 	require.NoError(t, sub.Unmarshal(cfg))
 
 	ctx := context.Background()
-	exporter, err := factory.CreateTracesExporter(ctx, exportertest.NewNopSettings(), cfg)
+	exporter, err := factory.CreateTraces(ctx, exportertest.NewNopSettings(), cfg)
 	assert.Error(t, err)
 	assert.Nil(t, exporter)
 }
 
-func TestCreateMetricsExporter(t *testing.T) {
+func TestCreateMetrics(t *testing.T) {
 	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
 	require.NoError(t, err)
 	factory := NewFactory()
@@ -53,7 +53,7 @@ func TestCreateMetricsExporter(t *testing.T) {
 	require.NoError(t, sub.Unmarshal(cfg))
 
 	ctx := context.Background()
-	exporter, err := factory.CreateMetricsExporter(ctx, exportertest.NewNopSettings(), cfg)
+	exporter, err := factory.CreateMetrics(ctx, exportertest.NewNopSettings(), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, exporter)
 }
diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -7,20 +7,20 @@ require (
 	github.com/aws/aws-sdk-go v1.53.11
 	github.com/google/uuid v1.6.0
 	github.com/jellydator/ttlcache/v3 v3.2.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.112.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.112.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.112.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.112.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.112.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.113.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.113.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.113.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.113.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.113.0
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/component v0.112.0
-	go.opentelemetry.io/collector/confmap v1.18.0
-	go.opentelemetry.io/collector/consumer/consumererror v0.112.0
-	go.opentelemetry.io/collector/exporter v0.112.0
-	go.opentelemetry.io/collector/exporter/exportertest v0.112.0
-	go.opentelemetry.io/collector/featuregate v1.18.0
-	go.opentelemetry.io/collector/pdata v1.18.0
-	go.opentelemetry.io/collector/semconv v0.112.0
+	go.opentelemetry.io/collector/component v0.113.0
+	go.opentelemetry.io/collector/confmap v1.19.0
+	go.opentelemetry.io/collector/consumer/consumererror v0.113.0
+	go.opentelemetry.io/collector/exporter v0.113.0
+	go.opentelemetry.io/collector/exporter/exportertest v0.113.0
+	go.opentelemetry.io/collector/featuregate v1.19.0
+	go.opentelemetry.io/collector/pdata v1.19.0
+	go.opentelemetry.io/collector/semconv v0.113.0
 	go.opentelemetry.io/otel/metric v1.31.0
 	go.opentelemetry.io/otel/trace v1.31.0
 	go.uber.org/multierr v1.11.0
@@ -50,18 +50,19 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	go.opentelemetry.io/collector/config/configretry v1.18.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.112.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumerprofiles v0.112.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumertest v0.112.0 // indirect
-	go.opentelemetry.io/collector/exporter/exporterprofiles v0.112.0 // indirect
-	go.opentelemetry.io/collector/extension v0.112.0 // indirect
-	go.opentelemetry.io/collector/extension/experimental/storage v0.112.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.112.0 // indirect
-	go.opentelemetry.io/collector/pipeline v0.112.0 // indirect
-	go.opentelemetry.io/collector/receiver v0.112.0 // indirect
-	go.opentelemetry.io/collector/receiver/receiverprofiles v0.112.0 // indirect
+	go.opentelemetry.io/collector/config/configretry v1.19.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect
+	go.opentelemetry.io/collector/consumer v0.113.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumertest v0.113.0 // indirect
+	go.opentelemetry.io/collector/exporter/exporterprofiles v0.113.0 // indirect
+	go.opentelemetry.io/collector/extension v0.113.0 // indirect
+	go.opentelemetry.io/collector/extension/experimental/storage v0.113.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.113.0 // indirect
+	go.opentelemetry.io/collector/pipeline v0.113.0 // indirect
+	go.opentelemetry.io/collector/receiver v0.113.0 // indirect
+	go.opentelemetry.io/collector/receiver/receiverprofiles v0.113.0 // indirect
+	go.opentelemetry.io/collector/receiver/receivertest v0.113.0 // indirect
 	go.opentelemetry.io/otel v1.31.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod
@@ -5,7 +5,7 @@ go 1.22.4
 require (
 	github.com/aws/aws-sdk-go v1.53.11
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/component v0.112.0
+	go.opentelemetry.io/collector/component v0.113.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 )
@@ -16,8 +16,8 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
-	go.opentelemetry.io/collector/pdata v1.18.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.19.0 // indirect
 	go.opentelemetry.io/otel v1.31.0 // indirect
 	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.31.0 // indirect

diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum
-Original file line number
+Diff line change
@@ Expand Up @@
     		return nil, err
     	}
-    	exporter, err := exporterhelper.NewMetricsExporter(
+    	exporter, err := exporterhelper.NewMetrics(
     		ctx,
     		params,
     		config,
@@ Expand Down @@