update otel deps from v0.125.0 to v0.126.0

mar4uk · mar4uk · commit 4e3a6f311122 · 2025-06-05T12:15:54.000+01:00
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/component/otelcol/config_grpc.go b/internal/component/otelcol/config_grpc.go
@@ -44,14 +44,14 @@ func (args *GRPCServerArguments) Convert() (*otelconfiggrpc.ServerConfig, error)
 	}
 
 	// If auth is set add that to the config.
-	var authentication *otelconfigauth.Authentication
+	var authentication *otelconfigauth.Config
 	if args.Authentication != nil {
 		// If a auth plugin does not implement server auth, an error will be returned here.
 		serverExtension, err := args.Authentication.GetExtension(auth.Server)
 		if err != nil {
 			return nil, err
 		}
-		authentication = &otelconfigauth.Authentication{
+		authentication = &otelconfigauth.Config{
 			AuthenticatorID: serverExtension.ID,
 		}
 	}
@@ -187,14 +187,14 @@ func (args *GRPCClientArguments) Convert() (*otelconfiggrpc.ClientConfig, error)
 	}
 
 	// Configure authentication if args.Auth is set.
-	var authentication *otelconfigauth.Authentication
+	var authentication *otelconfigauth.Config
 	if args.Authentication != nil {
 		ext, err := args.Authentication.GetExtension(auth.Client)
 		if err != nil {
 			return nil, err
 		}
 
-		authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}
+		authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}
 	}
 
 	// Set default value for `balancer_name` to sync up with upstream's
diff --git a/internal/component/otelcol/config_http.go b/internal/component/otelcol/config_http.go
@@ -56,7 +56,7 @@ func (args *HTTPServerArguments) Convert() (*otelconfighttp.ServerConfig, error)
 		}
 
 		authentication = &otelconfighttp.AuthConfig{
-			Authentication: otelconfigauth.Authentication{
+			Config: otelconfigauth.Config{
 				AuthenticatorID: ext.ID,
 			},
 		}
@@ -149,13 +149,13 @@ func (args *HTTPClientArguments) Convert() (*otelconfighttp.ClientConfig, error)
 	}
 
 	// Configure the authentication if args.Auth is set.
-	var authentication *otelconfigauth.Authentication
+	var authentication *otelconfigauth.Config
 	if args.Authentication != nil {
 		ext, err := args.Authentication.GetExtension(auth.Client)
 		if err != nil {
 			return nil, err
 		}
-		authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}
+		authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}
 	}
 
 	opaqueHeaders := make(map[string]configopaque.String)
diff --git a/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go b/internal/component/otelcol/exporter/loadbalancing/loadbalancing.go
@@ -412,14 +412,14 @@ func (args *GRPCClientArguments) Convert() (*otelconfiggrpc.ClientConfig, error)
 	}
 
 	// Configure the authentication if args.Auth is set.
-	var authentication *otelconfigauth.Authentication
+	var authentication *otelconfigauth.Config
 	if args.Authentication != nil {
 		ext, err := args.Authentication.GetExtension(auth.Client)
 		if err != nil {
 			return nil, err
 		}
 
-		authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}
+		authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}
 	}
 
 	balancerName := args.BalancerName
diff --git a/internal/component/otelcol/exporter/splunkhec/splunkhec_test.go b/internal/component/otelcol/exporter/splunkhec/splunkhec_test.go
@@ -41,7 +41,7 @@ func TestConfigConversion(t *testing.T) {
 			WriteBufferSize:      0,
 			Timeout:              10000000000,
 			Headers:              map[string]configopaque.String(nil),
-			Auth:                 (*configauth.Authentication)(nil),
+			Auth:                 (*configauth.Config)(nil),
 			Compression:          "",
 			MaxIdleConns:         100,
 			MaxIdleConnsPerHost:  0,
@@ -131,7 +131,7 @@ func TestConfigConversion(t *testing.T) {
 			WriteBufferSize:      0,
 			Timeout:              15000000000,
 			Headers:              map[string]configopaque.String(nil),
-			Auth:                 (*configauth.Authentication)(nil),
+			Auth:                 (*configauth.Config)(nil),
 			Compression:          "",
 			MaxIdleConns:         100,
 			MaxIdleConnsPerHost:  0,

Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,14 @@ func (args GRPCServerArguments) Convert() (otelconfiggrpc.ServerConfig, error)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// If auth is set add that to the config.`
`47`		`- var authentication *otelconfigauth.Authentication`
	`47`	`+ var authentication *otelconfigauth.Config`
`48`	`48`	`if args.Authentication != nil {`
`49`	`49`	`// If a auth plugin does not implement server auth, an error will be returned here.`
`50`	`50`	`serverExtension, err := args.Authentication.GetExtension(auth.Server)`
`51`	`51`	`if err != nil {`
`52`	`52`	`return nil, err`
`53`	`53`	`}`
`54`		`- authentication = &otelconfigauth.Authentication{`
	`54`	`+ authentication = &otelconfigauth.Config{`
`55`	`55`	`AuthenticatorID: serverExtension.ID,`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -187,14 +187,14 @@ func (args GRPCClientArguments) Convert() (otelconfiggrpc.ClientConfig, error)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// Configure authentication if args.Auth is set.`
`190`		`- var authentication *otelconfigauth.Authentication`
	`190`	`+ var authentication *otelconfigauth.Config`
`191`	`191`	`if args.Authentication != nil {`
`192`	`192`	`ext, err := args.Authentication.GetExtension(auth.Client)`
`193`	`193`	`if err != nil {`
`194`	`194`	`return nil, err`
`195`	`195`	`}`
`196`	`196`
`197`		`- authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}`
	`197`	`+ authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	// Set default value for `balancer_name` to sync up with upstream's
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (args HTTPServerArguments) Convert() (otelconfighttp.ServerConfig, error)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`authentication = &otelconfighttp.AuthConfig{`
`59`		`- Authentication: otelconfigauth.Authentication{`
	`59`	`+ Config: otelconfigauth.Config{`
`60`	`60`	`AuthenticatorID: ext.ID,`
`61`	`61`	`},`
`62`	`62`	`}`
`@@ -149,13 +149,13 @@ func (args HTTPClientArguments) Convert() (otelconfighttp.ClientConfig, error)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`// Configure the authentication if args.Auth is set.`
`152`		`- var authentication *otelconfigauth.Authentication`
	`152`	`+ var authentication *otelconfigauth.Config`
`153`	`153`	`if args.Authentication != nil {`
`154`	`154`	`ext, err := args.Authentication.GetExtension(auth.Client)`
`155`	`155`	`if err != nil {`
`156`	`156`	`return nil, err`
`157`	`157`	`}`
`158`		`- authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}`
	`158`	`+ authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`opaqueHeaders := make(map[string]configopaque.String)`
Original file line number	Diff line number	Diff line change
`@@ -412,14 +412,14 @@ func (args GRPCClientArguments) Convert() (otelconfiggrpc.ClientConfig, error)`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`// Configure the authentication if args.Auth is set.`
`415`		`- var authentication *otelconfigauth.Authentication`
	`415`	`+ var authentication *otelconfigauth.Config`
`416`	`416`	`if args.Authentication != nil {`
`417`	`417`	`ext, err := args.Authentication.GetExtension(auth.Client)`
`418`	`418`	`if err != nil {`
`419`	`419`	`return nil, err`
`420`	`420`	`}`
`421`	`421`
`422`		`- authentication = &otelconfigauth.Authentication{AuthenticatorID: ext.ID}`
	`422`	`+ authentication = &otelconfigauth.Config{AuthenticatorID: ext.ID}`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`balancerName := args.BalancerName`