chore: bump otel to 128

CHANGELOG.md

@@ -44,7 +44,7 @@ Main (unreleased)
 
 - Mark `pyroscope.receive_http` and `pyroscope.relabel` components as GA. (@marcsanmi)
 
-- Upgrade `otelcol` components from OpenTelemetry v0.126.0 to v0.127.0 (@korniltsev)
+- Upgrade `otelcol` components from OpenTelemetry v0.126.0 to v0.128.0 (@korniltsev)
 
 v1.9.1
 -----------------

docs/sources/_index.md

@@ -5,10 +5,10 @@ description: Grafana Alloy is a vendor-neutral distribution of the OTel Collecto
 weight: 350
 cascade:
   ALLOY_RELEASE: v1.10.0
-  OTEL_VERSION: v0.125.0
+  OTEL_VERSION: v0.128.0
   PROM_WIN_EXP_VERSION: v0.30.7
   SNMP_VERSION: v0.29.0
-  BEYLA_VERSION: v2.1
+  BEYLA_VERSION: v2.2.5
   FULL_PRODUCT_NAME: Grafana Alloy
   PRODUCT_NAME: Alloy
 hero:

docs/sources/_index.md.t

@@ -5,10 +5,10 @@ description: Grafana Alloy is a vendor-neutral distribution of the OTel Collecto
 weight: 350
 cascade:
   ALLOY_RELEASE: $ALLOY_VERSION
-  OTEL_VERSION: v0.125.0
+  OTEL_VERSION: v0.128.0
   PROM_WIN_EXP_VERSION: v0.30.7
   SNMP_VERSION: v0.29.0
-  BEYLA_VERSION: v2.1
+  BEYLA_VERSION: v2.2.5
   FULL_PRODUCT_NAME: Grafana Alloy
   PRODUCT_NAME: Alloy
 hero:

internal/component/otelcol/auth/oauth2/oauth2.go

@@ -39,7 +39,7 @@ type Arguments struct {
 	TokenURL         string                     `alloy:"token_url,attr"`
 	EndpointParams   url.Values                 `alloy:"endpoint_params,attr,optional"`
 	Scopes           []string                   `alloy:"scopes,attr,optional"`
-	TLSSetting       otelcol.TLSClientArguments `alloy:"tls,block,optional"`
+	TLS              otelcol.TLSClientArguments `alloy:"tls,block,optional"`
 	Timeout          time.Duration              `alloy:"timeout,attr,optional"`
 	// DebugMetrics configures component internal metrics. Optional.
 	DebugMetrics otelcolCfg.DebugMetricsArguments `alloy:"debug_metrics,block,optional"`
@@ -62,7 +62,7 @@ func (args Arguments) ConvertClient() (otelcomponent.Config, error) {
 		TokenURL:         args.TokenURL,
 		EndpointParams:   args.EndpointParams,
 		Scopes:           args.Scopes,
-		TLSSetting:       *args.TLSSetting.Convert(),
+		TLS:              *args.TLS.Convert(),
 		Timeout:          args.Timeout,
 	}, nil
 }

internal/component/otelcol/config_grpc.go

@@ -62,7 +62,7 @@ func (args *GRPCServerArguments) Convert() (*otelconfiggrpc.ServerConfig, error)
 			Transport: confignet.TransportType(args.Transport),
 		},
 
-		TLSSetting: args.TLS.Convert(),
+		TLS: args.TLS.Convert(),
 
 		MaxRecvMsgSizeMiB:    int(args.MaxRecvMsgSize / units.Mebibyte),
 		MaxConcurrentStreams: args.MaxConcurrentStreams,
@@ -208,8 +208,8 @@ func (args *GRPCClientArguments) Convert() (*otelconfiggrpc.ClientConfig, error)
 
 		Compression: args.Compression.Convert(),
 
-		TLSSetting: *args.TLS.Convert(),
-		Keepalive:  args.Keepalive.Convert(),
+		TLS:       *args.TLS.Convert(),
+		Keepalive: args.Keepalive.Convert(),
 
 		ReadBufferSize:  int(args.ReadBufferSize),
 		WriteBufferSize: int(args.WriteBufferSize),

internal/component/otelcol/config_http.go

@@ -64,7 +64,7 @@ func (args *HTTPServerArguments) Convert() (*otelconfighttp.ServerConfig, error)
 
 	return &otelconfighttp.ServerConfig{
 		Endpoint:              args.Endpoint,
-		TLSSetting:            args.TLS.Convert(),
+		TLS:                   args.TLS.Convert(),
 		CORS:                  args.CORS.Convert(),
 		MaxRequestBodySize:    int64(args.MaxRequestBodySize),
 		IncludeMetadata:       args.IncludeMetadata,
@@ -170,7 +170,7 @@ func (args *HTTPClientArguments) Convert() (*otelconfighttp.ClientConfig, error)
 
 		Compression: args.Compression.Convert(),
 
-		TLSSetting: *args.TLS.Convert(),
+		TLS: *args.TLS.Convert(),
 
 		ReadBufferSize:       int(args.ReadBufferSize),
 		WriteBufferSize:      int(args.WriteBufferSize),
@@ -213,12 +213,14 @@ type Cookies struct {
 	Enabled bool `alloy:"enabled,attr,optional"`
 }
 
-func (c *Cookies) Convert() *otelconfighttp.CookiesConfig {
+func (c *Cookies) Convert() otelconfighttp.CookiesConfig {
 	if c == nil {
-		return nil
+		return otelconfighttp.CookiesConfig{
+			Enabled: false,
+		}
 	}
 
-	return &otelconfighttp.CookiesConfig{
+	return otelconfighttp.CookiesConfig{
 		Enabled: c.Enabled,
 	}
 }

internal/component/otelcol/exporter/datadog/config/config_datadog.go

@@ -44,7 +44,7 @@ func (args *DatadogClientArguments) Convert() *confighttp.ClientConfig {
 		MaxConnsPerHost:     args.MaxConnsPerHost,
 		IdleConnTimeout:     args.IdleConnTimeout,
 		DisableKeepAlives:   args.DisableKeepAlives,
-		TLSSetting: configtls.ClientConfig{
+		TLS: configtls.ClientConfig{
 			InsecureSkipVerify: args.InsecureSkipVerify,
 		},
 	}

internal/component/otelcol/exporter/loadbalancing/loadbalancing.go

@@ -430,8 +430,8 @@ func (args *GRPCClientArguments) Convert() (*otelconfiggrpc.ClientConfig, error)
 	return &otelconfiggrpc.ClientConfig{
 		Compression: args.Compression.Convert(),
 
-		TLSSetting: *args.TLS.Convert(),
-		Keepalive:  args.Keepalive.Convert(),
+		TLS:       *args.TLS.Convert(),
+		Keepalive: args.Keepalive.Convert(),
 
 		ReadBufferSize:  int(args.ReadBufferSize),
 		WriteBufferSize: int(args.WriteBufferSize),

internal/component/otelcol/exporter/splunkhec/config/splunkhec.go

@@ -200,7 +200,7 @@ func (args *SplunkHecClientArguments) Convert() *confighttp.ClientConfig {
 		MaxConnsPerHost:     args.MaxConnsPerHost,
 		IdleConnTimeout:     args.IdleConnTimeout,
 		DisableKeepAlives:   args.DisableKeepAlives,
-		TLSSetting: configtls.ClientConfig{
+		TLS: configtls.ClientConfig{
 			InsecureSkipVerify: args.InsecureSkipVerify,
 		},
 	}

internal/component/otelcol/exporter/splunkhec/splunkhec_test.go

@@ -20,7 +20,7 @@ func TestConfigConversion(t *testing.T) {
 	expectedCustomise := splunkhecexporter.Config{
 		ClientConfig: confighttp.ClientConfig{
 			Endpoint: "http://localhost:8088", ProxyURL: "",
-			TLSSetting: configtls.ClientConfig{
+			TLS: configtls.ClientConfig{
 				Config: configtls.Config{
 					CAFile:                   "",
 					CAPem:                    "",
@@ -50,7 +50,7 @@ func TestConfigConversion(t *testing.T) {
 			DisableKeepAlives:    false,
 			HTTP2ReadIdleTimeout: 0,
 			HTTP2PingTimeout:     0,
-			Cookies:              (*confighttp.CookiesConfig)(nil),
+			Cookies:              confighttp.CookiesConfig{},
 		},
 		QueueSettings: exporterhelper.QueueBatchConfig{
 			Enabled:      true,
@@ -110,7 +110,7 @@ func TestConfigConversion(t *testing.T) {
 		ClientConfig: confighttp.ClientConfig{
 			Endpoint: "http://localhost:8088",
 			ProxyURL: "",
-			TLSSetting: configtls.ClientConfig{
+			TLS: configtls.ClientConfig{
 				Config: configtls.Config{
 					CAFile:                   "",
 					CAPem:                    "",
@@ -140,7 +140,7 @@ func TestConfigConversion(t *testing.T) {
 			DisableKeepAlives:    false,
 			HTTP2ReadIdleTimeout: 0,
 			HTTP2PingTimeout:     0,
-			Cookies:              (*confighttp.CookiesConfig)(nil)},
+			Cookies:              confighttp.CookiesConfig{}},
 		QueueSettings: exporterhelper.QueueBatchConfig{
 			Enabled:      true,
 			NumConsumers: 10,

internal/component/otelcol/exporter/syslog/syslog.go

@@ -85,7 +85,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
 		Port:                args.Port,
 		Network:             args.Network,
 		Protocol:            string(args.Protocol),
-		TLSSetting:          *args.TLS.Convert(),
+		TLS:                 *args.TLS.Convert(),
 		EnableOctetCounting: args.EnableOctetCounting,
 	}, nil
 }

internal/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension_test.go

@@ -12,15 +12,16 @@ import (
 	"testing"
 	"time"
 
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
+
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
 	"go.opentelemetry.io/collector/config/configtls"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
 )
 
 func TestNewExtension(t *testing.T) {
@@ -102,7 +103,7 @@ func TestRemote(t *testing.T) {
 			cfg.Source.ReloadInterval = tc.reloadInterval
 			cfg.Source.Remote = &configgrpc.ClientConfig{
 				Endpoint: fmt.Sprintf("127.0.0.1:%d", lis.Addr().(*net.TCPAddr).Port),
-				TLSSetting: configtls.ClientConfig{
+				TLS: configtls.ClientConfig{
 					Insecure: true, // test only
 				},
 				WaitForReady: true,

internal/component/otelcol/receiver/otlp/otlp.go

@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/alloy/internal/component/otelcol/receiver"
 	"github.com/grafana/alloy/internal/featuregate"
 	otelcomponent "go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/pipeline"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 )
@@ -97,8 +98,8 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
 
 	return &otlpreceiver.Config{
 		Protocols: otlpreceiver.Protocols{
-			GRPC: grpcProtocolArgs,
-			HTTP: httpProtocolArgs,
+			GRPC: convertOptional(grpcProtocolArgs),
+			HTTP: convertOptional(httpProtocolArgs),
 		},
 	}, nil
 }
@@ -200,3 +201,10 @@ func (args *HTTPConfigArguments) SetToDefault() {
 func (args Arguments) DebugMetricsConfig() otelcolCfg.DebugMetricsArguments {
 	return args.DebugMetrics
 }
+
+func convertOptional[T any](it *T) configoptional.Optional[T] {
+	if it == nil {
+		return configoptional.None[T]()
+	}
+	return configoptional.Some[T](*it)
+}

internal/component/otelcol/receiver/otlp/otlp_test.go

@@ -8,6 +8,8 @@ import (
 	"testing"
 	"time"
 
+	"gotest.tools/assert"
+
 	"github.com/grafana/alloy/internal/component/otelcol"
 	otelcolCfg "github.com/grafana/alloy/internal/component/otelcol/config"
 	"github.com/grafana/alloy/internal/component/otelcol/internal/fakeconsumer"
@@ -21,9 +23,9 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
-	"gotest.tools/assert"
 )
 
 // Test performs a basic integration test which runs the otelcol.receiver.otlp
@@ -133,7 +135,7 @@ func TestUnmarshalDefault(t *testing.T) {
 
 	expected := otlpreceiver.Config{
 		Protocols: otlpreceiver.Protocols{
-			GRPC: &configgrpc.ServerConfig{
+			GRPC: configoptional.Some[configgrpc.ServerConfig](configgrpc.ServerConfig{
 				NetAddr: confignet.AddrConfig{
 					Endpoint:  "0.0.0.0:4317",
 					Transport: "tcp",
@@ -143,8 +145,8 @@ func TestUnmarshalDefault(t *testing.T) {
 					ServerParameters:  &configgrpc.KeepaliveServerParameters{},
 					EnforcementPolicy: &configgrpc.KeepaliveEnforcementPolicy{},
 				},
-			},
-			HTTP: &otlpreceiver.HTTPConfig{
+			}),
+			HTTP: configoptional.Some[otlpreceiver.HTTPConfig](otlpreceiver.HTTPConfig{
 				ServerConfig: confighttp.ServerConfig{
 					Endpoint:              "0.0.0.0:4318",
 					CompressionAlgorithms: []string{"", "gzip", "zstd", "zlib", "snappy", "deflate", "lz4"},
@@ -153,7 +155,7 @@ func TestUnmarshalDefault(t *testing.T) {
 				TracesURLPath:  "/v1/traces",
 				MetricsURLPath: "/v1/metrics",
 				LogsURLPath:    "/v1/logs",
-			},
+			}),
 		},
 	}
 

internal/converter/internal/otelcolconvert/converter_datadogexporter.go

@@ -82,7 +82,7 @@ func toDatadogHTTPClientArguments(cfg confighttp.ClientConfig) datadog_config.Da
 		MaxConnsPerHost:     cfg.MaxConnsPerHost,
 		IdleConnTimeout:     cfg.IdleConnTimeout,
 		DisableKeepAlives:   cfg.DisableKeepAlives,
-		InsecureSkipVerify:  cfg.TLSSetting.Insecure,
+		InsecureSkipVerify:  cfg.TLS.Insecure,
 	}
 }
 

internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go

@@ -98,7 +98,7 @@ func toProtocol(cfg loadbalancingexporter.Protocol) loadbalancing.Protocol {
 			Client: loadbalancing.GRPCClientArguments{
 				Compression: otelcol.CompressionType(cfg.OTLP.ClientConfig.Compression),
 
-				TLS:       toTLSClientArguments(cfg.OTLP.ClientConfig.TLSSetting),
+				TLS:       toTLSClientArguments(cfg.OTLP.ClientConfig.TLS),
 				Keepalive: toKeepaliveClientArguments(cfg.OTLP.ClientConfig.Keepalive),
 
 				ReadBufferSize:  units.Base2Bytes(cfg.OTLP.ClientConfig.ReadBufferSize),

internal/converter/internal/otelcolconvert/converter_oauth2clientauthextension.go

@@ -48,7 +48,7 @@ func toOAuth2ClientAuthExtension(cfg *oauth2clientauthextension.Config) *oauth2.
 		TokenURL:       cfg.TokenURL,
 		EndpointParams: cfg.EndpointParams,
 		Scopes:         cfg.Scopes,
-		TLSSetting:     toTLSClientArguments(cfg.TLSSetting),
+		TLS:            toTLSClientArguments(cfg.TLS),
 		Timeout:        cfg.Timeout,
 		DebugMetrics:   common.DefaultValue[oauth2.Arguments]().DebugMetrics,
 	}

internal/converter/internal/otelcolconvert/converter_otlpexporter.go

@@ -125,7 +125,7 @@ func toGRPCClientArguments(cfg configgrpc.ClientConfig) otelcol.GRPCClientArgume
 
 		Compression: otelcol.CompressionType(cfg.Compression),
 
-		TLS:       toTLSClientArguments(cfg.TLSSetting),
+		TLS:       toTLSClientArguments(cfg.TLS),
 		Keepalive: toKeepaliveClientArguments(cfg.Keepalive),
 
 		ReadBufferSize:  units.Base2Bytes(cfg.ReadBufferSize),

internal/converter/internal/otelcolconvert/converter_otlphttpexporter.go

@@ -79,7 +79,7 @@ func toHTTPClientArguments(cfg confighttp.ClientConfig) otelcol.HTTPClientArgume
 		Endpoint:        cfg.Endpoint,
 		ProxyUrl:        cfg.ProxyURL,
 		Compression:     otelcol.CompressionType(cfg.Compression),
-		TLS:             toTLSClientArguments(cfg.TLSSetting),
+		TLS:             toTLSClientArguments(cfg.TLS),
 		ReadBufferSize:  units.Base2Bytes(cfg.ReadBufferSize),
 		WriteBufferSize: units.Base2Bytes(cfg.WriteBufferSize),
 

internal/converter/internal/otelcolconvert/converter_otlpreceiver.go

@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/pipeline"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
@@ -53,7 +54,7 @@ func toOtelcolReceiverOTLP(state *State, id componentstatus.InstanceID, cfg *otl
 	)
 
 	return &otlp.Arguments{
-		GRPC: (*otlp.GRPCServerArguments)(toGRPCServerArguments(cfg.GRPC)),
+		GRPC: (*otlp.GRPCServerArguments)(toGRPCServerArguments(cfg.GRPC.Get())),
 		HTTP: toHTTPConfigArguments(cfg.HTTP),
 
 		DebugMetrics: common.DefaultValue[otlp.Arguments]().DebugMetrics,
@@ -75,7 +76,7 @@ func toGRPCServerArguments(cfg *configgrpc.ServerConfig) *otelcol.GRPCServerArgu
 		Endpoint:  cfg.NetAddr.Endpoint,
 		Transport: string(cfg.NetAddr.Transport),
 
-		TLS: toTLSServerArguments(cfg.TLSSetting),
+		TLS: toTLSServerArguments(cfg.TLS),
 
 		MaxRecvMsgSize:       units.Base2Bytes(cfg.MaxRecvMsgSizeMiB) * units.MiB,
 		MaxConcurrentStreams: cfg.MaxConcurrentStreams,
@@ -153,10 +154,11 @@ func toKeepaliveEnforcementPolicy(cfg *configgrpc.KeepaliveEnforcementPolicy) *o
 	}
 }
 
-func toHTTPConfigArguments(cfg *otlpreceiver.HTTPConfig) *otlp.HTTPConfigArguments {
-	if cfg == nil {
+func toHTTPConfigArguments(ocfg configoptional.Optional[otlpreceiver.HTTPConfig]) *otlp.HTTPConfigArguments {
+	if !ocfg.HasValue() {
 		return nil
 	}
+	cfg := ocfg.Get()
 
 	return &otlp.HTTPConfigArguments{
 		HTTPServerArguments: toHTTPServerArguments(&cfg.ServerConfig),
@@ -182,7 +184,7 @@ func toHTTPServerArguments(cfg *confighttp.ServerConfig) *otelcol.HTTPServerArgu
 	return &otelcol.HTTPServerArguments{
 		Endpoint: cfg.Endpoint,
 
-		TLS: toTLSServerArguments(cfg.TLSSetting),
+		TLS: toTLSServerArguments(cfg.TLS),
 
 		CORS: toCORSArguments(cfg.CORS),
 

internal/converter/internal/otelcolconvert/converter_service_telemetry.go

@@ -114,10 +114,6 @@ func convertMetrics(_ *builder.File, tel otel_tel.MetricsConfig) diag.Diagnostic
 		diags.Add(diag.SeverityLevelWarn, "the service/telemetry/metrics/readers configuration is not supported - to gather Alloy's own telemetry refer to: https://grafana.com/docs/alloy/latest/collect/metamonitoring/")
 	}
 
-	if len(tel.Address) > 0 { //nolint:staticcheck //TODO: remove this check once the field is removed from upstream.
-		diags.Add(diag.SeverityLevelWarn, "the service/telemetry/metrics/address configuration is not supported - use the `--server.http.listen-addr` cmd argument or the `prometheus.exporter.self` component instead")
-	}
-
 	return diags
 }