Merge branch 'main' into deprecate_adjuster

Author: dashpole

extension/encoding/googlecloudlogentryencodingextension/config.go

@@ -5,10 +5,10 @@ package googlecloudlogentryencodingextension // import "github.com/open-telemetr
 import (
 	"fmt"
 
-	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 )
 
-var _ component.ConfigValidator = (*Config)(nil)
+var _ xconfmap.Validator = (*Config)(nil)
 
 type HandleAs string
 

extension/encoding/googlecloudlogentryencodingextension/config_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/googlecloudlogentryencodingextension/internal/metadata"
 )
@@ -74,7 +75,7 @@ func TestLoadConfig(t *testing.T) {
 			require.NoError(t, err)
 			require.NoError(t, sub.Unmarshal(cfg))
 
-			assert.NoError(t, component.ValidateConfig(cfg))
+			assert.NoError(t, xconfmap.Validate(cfg))
 			assert.Equal(t, tt.expected, cfg)
 		})
 	}
@@ -85,9 +86,9 @@ func TestConfigValidation(t *testing.T) {
 
 	cfg := factory.CreateDefaultConfig().(*Config)
 	cfg.HandleJSONPayloadAs = "invalid"
-	assert.Error(t, component.ValidateConfig(cfg))
+	assert.Error(t, xconfmap.Validate(cfg))
 
 	cfg = factory.CreateDefaultConfig().(*Config)
 	cfg.HandleProtoPayloadAs = "invalid"
-	assert.Error(t, component.ValidateConfig(cfg))
+	assert.Error(t, xconfmap.Validate(cfg))
 }

extension/encoding/googlecloudlogentryencodingextension/generated_component_test.go

@@ -1,16 +1,17 @@
 module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/googlecloudlogentryencodingextension
 
-go 1.22.7
+go 1.23.0
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.119.0
 	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/collector/component v0.119.0
-	go.opentelemetry.io/collector/component/componenttest v0.119.0
-	go.opentelemetry.io/collector/confmap v1.25.0
-	go.opentelemetry.io/collector/extension v0.119.0
-	go.opentelemetry.io/collector/extension/extensiontest v0.119.0
-	go.opentelemetry.io/collector/pdata v1.25.0
+	go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
+	go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
+	go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
+	go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250212161139-9be1b84ff8e5
+	go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c
+	go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c
+	go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c
 	go.uber.org/goleak v1.3.0
 )
 
@@ -31,8 +32,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.119.1-0.20250210123122-44b3eeda354c // indirect
 	go.opentelemetry.io/otel v1.34.0 // indirect
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.34.0 // indirect

extension/encoding/googlecloudlogentryencodingextension/go.mod

@@ -25,8 +25,7 @@ See [Golang database/sql package documentation](https://pkg.go.dev/database/sql)
 
 `datasource`: the url of the database, in the format accepted by the driver.
 
-
-```
+```yaml
 extensions:
   db_storage:
     driver: "sqlite3"
@@ -37,14 +36,11 @@ service:
   pipelines:
     traces:
       receivers: [nop]
-      processors: [nop]
       exporters: [nop]
 
 # Data pipeline is required to load the config.
 receivers:
   nop:
-processors:
-  nop:
 exporters:
   nop:
 ```

extension/encoding/googlecloudlogentryencodingextension/go.sum

@@ -75,10 +75,9 @@ y ├─────XXXXXXXXXXXXXXXXXXXXX..────────────
  . - claimed but no longer used space
 ```
 
-
 ## Example
 
-```
+```yaml
 extensions:
   file_storage:
   file_storage/all_settings:
@@ -95,14 +94,11 @@ service:
   pipelines:
     traces:
       receivers: [nop]
-      processors: [nop]
       exporters: [nop]
 
 # Data pipeline is required to load the config.
 receivers:
   nop:
-processors:
-  nop:
 exporters:
   nop:
 ```

extension/storage/dbstorage/README.md

@@ -24,7 +24,7 @@ The extension requires read and write access to a Redis cluster.
 
 ## Example
 
-```
+```yaml
 extensions:
   redis_storage:
   redis_storage/all_settings:
@@ -38,7 +38,6 @@ service:
   pipelines:
     traces:
       receivers: [nop]
-      processors: [nop]
       exporters: [nop]
 
 # Data pipeline is required to load the config.