chore: bump otel to 127

CHANGELOG.md

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

internal/component/otelcol/exporter/awss3/awss3.go

@@ -155,6 +155,10 @@ func (args *S3Uploader) Convert() awss3exporter.S3UploaderConfig {
 		Compression:       args.Compression,
 		ACL:               args.ACL,
 		StorageClass:      args.StorageClass,
+		// todo: allow configuring retries https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/39509
+		RetryMode:        awss3exporter.DefaultRetryMode,
+		RetryMaxAttempts: awss3exporter.DefaultRetryMaxAttempts,
+		RetryMaxBackoff:  awss3exporter.DefaultRetryMaxBackoff,
 	}
 }
 

internal/component/otelcol/exporter/awss3/awss3_test.go

@@ -215,6 +215,9 @@ func TestConfig(t *testing.T) {
 					Region:            "us-east-1",
 					ACL:               "",
 					StorageClass:      "STANDARD",
+					RetryMode:         "standard",
+					RetryMaxAttempts:  3,
+					RetryMaxBackoff:   20 * time.Second,
 				},
 				MarshalerName: "otlp_json",
 				QueueSettings: exporterhelper.QueueBatchConfig{
@@ -259,6 +262,9 @@ func TestConfig(t *testing.T) {
 					Region:            "us-east-2",
 					ACL:               "",
 					StorageClass:      "STANDARD",
+					RetryMode:         "standard",
+					RetryMaxAttempts:  3,
+					RetryMaxBackoff:   20 * time.Second,
 				},
 				MarshalerName: "otlp_json",
 				QueueSettings: exporterhelper.QueueBatchConfig{

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

@@ -68,9 +68,9 @@ func (args *HTTPConfigArguments) Convert() (*otlpreceiver.HTTPConfig, error) {
 
 	return &otlpreceiver.HTTPConfig{
 		ServerConfig:   *httpServerArgs,
-		TracesURLPath:  args.TracesURLPath,
-		MetricsURLPath: args.MetricsURLPath,
-		LogsURLPath:    args.LogsURLPath,
+		TracesURLPath:  otlpreceiver.SanitizedURLPath(args.TracesURLPath),
+		MetricsURLPath: otlpreceiver.SanitizedURLPath(args.MetricsURLPath),
+		LogsURLPath:    otlpreceiver.SanitizedURLPath(args.LogsURLPath),
 	}, nil
 }
 

internal/converter/internal/otelcolconvert/converter_otlpreceiver.go

@@ -161,9 +161,9 @@ func toHTTPConfigArguments(cfg *otlpreceiver.HTTPConfig) *otlp.HTTPConfigArgumen
 	return &otlp.HTTPConfigArguments{
 		HTTPServerArguments: toHTTPServerArguments(&cfg.ServerConfig),
 
-		TracesURLPath:  cfg.TracesURLPath,
-		MetricsURLPath: cfg.MetricsURLPath,
-		LogsURLPath:    cfg.LogsURLPath,
+		TracesURLPath:  string(cfg.TracesURLPath),
+		MetricsURLPath: string(cfg.MetricsURLPath),
+		LogsURLPath:    string(cfg.LogsURLPath),
 	}
 }
 

internal/static/traces/config.go

@@ -13,6 +13,9 @@ import (
 	"strings"
 	"time"
 
+	"go.uber.org/multierr"
+	"gopkg.in/yaml.v2"
+
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling"
@@ -38,8 +41,6 @@ import (
 	"go.opentelemetry.io/collector/processor/batchprocessor"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
-	"go.uber.org/multierr"
-	"gopkg.in/yaml.v2"
 
 	promsdconsumer "github.com/grafana/alloy/internal/static/traces/promsdprocessor/consumer"
 
@@ -714,11 +715,17 @@ func (c *InstanceConfig) OtelConfig() (*otelcol.Config, error) {
 				"metrics_instance": c.SpanMetrics.MetricsInstance,
 			}
 		} else if len(c.SpanMetrics.MetricsInstance) == 0 && len(c.SpanMetrics.HandlerEndpoint) != 0 {
+			constLabels := map[string]string{}
+			if c.SpanMetrics.ConstLabels != nil {
+				// Temporary workaround for https://github.com/open-telemetry/opentelemetry-collector/issues/13117
+				// Remove after upgrade to otel 128
+				constLabels = *c.SpanMetrics.ConstLabels
+			}
 			exporterName = "prometheus"
 			exporters[exporterName] = map[string]interface{}{
 				"endpoint":     c.SpanMetrics.HandlerEndpoint,
 				"namespace":    namespace,
-				"const_labels": c.SpanMetrics.ConstLabels,
+				"const_labels": constLabels,
 			}
 		} else {
 			return nil, fmt.Errorf("must specify a prometheus instance or a metrics handler endpoint to export the metrics")

internal/static/traces/config_test.go

@@ -6,13 +6,14 @@ import (
 	"strings"
 	"testing"
 
+	"gopkg.in/yaml.v2"
+
 	"github.com/grafana/alloy/internal/static/traces/pushreceiver"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/otelcol"
 	"go.opentelemetry.io/collector/pipeline"
-	"gopkg.in/yaml.v2"
 )
 
 func tmpFile(t *testing.T, content string) (*os.File, func()) {
@@ -1742,10 +1743,13 @@ load_balancing:
 				if len(tc.expectedProcessors[componentID]) > 0 {
 					assert.NotNil(t, tc.expectedProcessors)
 					var p pipeline.ID
+					signal := pipeline.Signal{}
+					err = signal.UnmarshalText([]byte(componentID.Type().String()))
+					require.NoError(t, err)
 					if componentID.Name() != "" {
-						p = pipeline.MustNewIDWithName(componentID.Type().String(), componentID.Name())
+						p = pipeline.NewIDWithName(signal, componentID.Name())
 					} else {
-						p = pipeline.MustNewID(componentID.Type().String())
+						p = pipeline.NewID(signal)
 					}
 
 					assert.NotNil(t, actualConfig.Service.Pipelines[p])