Update usage of deprecated core modules

open-telemetry · Jan 7, 2025 · c443795 · c443795
1 parent c107a97
commit c443795
Show file tree

Hide file tree

Showing 307 changed files with 293 additions and 373 deletions.
diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum
diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum
diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum
diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum
diff --git a/connector/signaltometricsconnector/go.sum b/connector/signaltometricsconnector/go.sum
diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum
diff --git a/connector/sumconnector/go.sum b/connector/sumconnector/go.sum
diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -344,7 +344,6 @@ require (
 	go.opentelemetry.io/collector/exporter/xexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae // indirect
-	go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect

diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum
diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod
@@ -160,7 +160,6 @@ require (
 	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/exporter/xexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae // indirect
-	go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect

diff --git a/exporter/elasticsearchexporter/integrationtest/go.sum b/exporter/elasticsearchexporter/integrationtest/go.sum
diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum
diff --git a/extension/storage/dbstorage/client.go b/extension/storage/dbstorage/client.go
@@ -13,7 +13,7 @@ import (
 	_ "github.com/jackc/pgx/v5/stdlib"
 	// SQLite driver
 	_ "github.com/mattn/go-sqlite3"
-	"go.opentelemetry.io/collector/extension/experimental/storage"
+	"go.opentelemetry.io/collector/extension/xextension/storage"
 )
 
 const (
@@ -88,7 +88,7 @@ func (c *dbStorageClient) Delete(ctx context.Context, key string) error {
 }
 
 // Batch executes the specified operations in order. Get operation results are updated in place
-func (c *dbStorageClient) Batch(ctx context.Context, ops ...storage.Operation) error {
+func (c *dbStorageClient) Batch(ctx context.Context, ops ...*storage.Operation) error {
 	var err error
 	for _, op := range ops {
 		switch op.Type {

diff --git a/extension/storage/dbstorage/extension.go b/extension/storage/dbstorage/extension.go
@@ -11,7 +11,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
-	"go.opentelemetry.io/collector/extension/experimental/storage"
+	"go.opentelemetry.io/collector/extension/xextension/storage"
 	"go.uber.org/zap"
 )
 

diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go
@@ -19,8 +19,8 @@ import (
 	"github.com/testcontainers/testcontainers-go/wait"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/extension/experimental/storage"
 	"go.opentelemetry.io/collector/extension/extensiontest"
+	"go.opentelemetry.io/collector/extension/xextension/storage"
 )
 
 func TestExtensionIntegrityWithSqlite(t *testing.T) {

diff --git a/extension/storage/dbstorage/go.mod b/extension/storage/dbstorage/go.mod
@@ -13,8 +13,8 @@ require (
 	go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae
 	go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae
 	go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae
-	go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae
 	go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae
+	go.opentelemetry.io/collector/extension/xextension v0.116.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 )
@@ -68,7 +68,6 @@ require (
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect
-	go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel v1.32.0 // indirect

diff --git a/extension/storage/dbstorage/go.sum b/extension/storage/dbstorage/go.sum
diff --git a/extension/storage/filestorage/client.go b/extension/storage/filestorage/client.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"go.etcd.io/bbolt"
-	"go.opentelemetry.io/collector/extension/experimental/storage"
+	"go.opentelemetry.io/collector/extension/xextension/storage"
 	"go.uber.org/zap"
 )
 
@@ -94,7 +94,7 @@ func (c *fileStorageClient) Delete(ctx context.Context, key string) error {
 }
 
 // Batch executes the specified operations in order. Get operation results are updated in place
-func (c *fileStorageClient) Batch(_ context.Context, ops ...storage.Operation) error {
+func (c *fileStorageClient) Batch(_ context.Context, ops ...*storage.Operation) error {
 	batch := func(tx *bbolt.Tx) error {
 		bucket := tx.Bucket(defaultBucket)
 		if bucket == nil {