Merge branch 'main' into main

.chloggen/addretrysetvalidation.yaml

@@ -0,0 +1,13 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: "enhancement"
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: "exporterhelper"
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add RetrySettings validation function"
+
+# One or more tracking issues or pull requests related to the change
+issues: [9089]

.chloggen/codeboten_make-otel-default.yaml

@@ -0,0 +1,29 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Enable `telemetry.useOtelForInternalMetrics` by updating the flag to beta"
+
+# One or more tracking issues or pull requests related to the change
+issues: [7454]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  The metrics generated should be consistent with the metrics generated
+  previously with OpenCensus. Users can disable the behaviour
+  by setting `--feature-gates -telemetry.useOtelForInternalMetrics` at
+  collector start.
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

exporter/exporterhelper/obsexporter_test.go

@@ -180,6 +180,11 @@ type testParams struct {
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt obsreporttest.TestTelemetry, useOtel bool)) {
 	t.Run("WithOC", func(t *testing.T) {
+		originalValue := obsreportconfig.UseOtelForInternalMetricsfeatureGate.IsEnabled()
+		require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), false))
+		defer func() {
+			require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
+		}()
 		tt, err := obsreporttest.SetupTelemetry(id)
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
@@ -188,11 +193,6 @@ func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt
 	})
 
 	t.Run("WithOTel", func(t *testing.T) {
-		originalValue := obsreportconfig.UseOtelForInternalMetricsfeatureGate.IsEnabled()
-		require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), true))
-		defer func() {
-			require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
-		}()
 		tt, err := obsreporttest.SetupTelemetry(id)
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })

exporter/exporterhelper/obsreport_test.go

@@ -11,6 +11,8 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter"
+	"go.opentelemetry.io/collector/featuregate"
+	"go.opentelemetry.io/collector/internal/obsreportconfig"
 	"go.opentelemetry.io/collector/obsreport/obsreporttest"
 )
 
@@ -26,6 +28,12 @@ func TestExportEnqueueFailure(t *testing.T) {
 	})
 	require.NoError(t, err)
 
+	originalValue := obsreportconfig.UseOtelForInternalMetricsfeatureGate.IsEnabled()
+	require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), false))
+	defer func() {
+		require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
+	}()
+
 	logRecords := int64(7)
 	obsrep.recordEnqueueFailureWithOC(context.Background(), component.DataTypeLogs, logRecords)
 	require.NoError(t, tt.CheckExporterEnqueueFailedLogs(logRecords))

exporter/exporterhelper/queue_sender_test.go

@@ -144,6 +144,8 @@ func setFeatureGateForTest(t testing.TB, gate *featuregate.Gate, enabled bool) f
 }
 
 func TestQueuedRetry_QueueMetricsReported(t *testing.T) {
+	resetFlag := setFeatureGateForTest(t, obsreportconfig.UseOtelForInternalMetricsfeatureGate, false)
+	defer resetFlag()
 	tt, err := obsreporttest.SetupTelemetry(defaultID)
 	require.NoError(t, err)
 
@@ -166,9 +168,6 @@ func TestQueuedRetry_QueueMetricsReported(t *testing.T) {
 }
 
 func TestQueuedRetry_QueueMetricsReportedUsingOTel(t *testing.T) {
-	resetFlag := setFeatureGateForTest(t, obsreportconfig.UseOtelForInternalMetricsfeatureGate, true)
-	defer resetFlag()
-
 	tt, err := obsreporttest.SetupTelemetry(defaultID)
 	require.NoError(t, err)
 

exporter/exporterhelper/retry_sender.go

@@ -39,6 +39,28 @@ type RetrySettings struct {
 	MaxElapsedTime time.Duration `mapstructure:"max_elapsed_time"`
 }
 
+func (cfg *RetrySettings) Validate() error {
+	if !cfg.Enabled {
+		return nil
+	}
+	if cfg.InitialInterval < 0 {
+		return errors.New("'initial_interval' must be non-negative")
+	}
+	if cfg.RandomizationFactor < 0 || cfg.RandomizationFactor > 1 {
+		return errors.New("'randomization_factor' must be within [0, 1]")
+	}
+	if cfg.Multiplier <= 0 {
+		return errors.New("'multiplier' must be positive")
+	}
+	if cfg.MaxInterval < 0 {
+		return errors.New("'max_interval' must be non-negative")
+	}
+	if cfg.MaxElapsedTime < 0 {
+		return errors.New("'max_elapsed' time must be non-negative")
+	}
+	return nil
+}
+
 // NewDefaultRetrySettings returns the default settings for RetrySettings.
 func NewDefaultRetrySettings() RetrySettings {
 	return RetrySettings{

exporter/exporterhelper/retry_sender_test.go

@@ -404,3 +404,66 @@ func tagsMatchLabelKeys(tags []tag.Tag, keys []metricdata.LabelKey, labels []met
 	}
 	return true
 }
+
+func TestNewDefaultRetrySettings(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	assert.Equal(t,
+		RetrySettings{
+			Enabled:             true,
+			InitialInterval:     5 * time.Second,
+			RandomizationFactor: 0.5,
+			Multiplier:          1.5,
+			MaxInterval:         30 * time.Second,
+			MaxElapsedTime:      5 * time.Minute,
+		}, cfg)
+}
+
+func TestInvalidInitialInterval(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	cfg.InitialInterval = -1
+	assert.Error(t, cfg.Validate())
+}
+
+func TestInvalidRandomizationFactor(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	cfg.RandomizationFactor = -1
+	assert.Error(t, cfg.Validate())
+	cfg.RandomizationFactor = 2
+	assert.Error(t, cfg.Validate())
+}
+
+func TestInvalidMultiplier(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	cfg.Multiplier = 0
+	assert.Error(t, cfg.Validate())
+}
+
+func TestInvalidMaxInterval(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	cfg.MaxInterval = -1
+	assert.Error(t, cfg.Validate())
+}
+
+func TestInvalidMaxElapsedTime(t *testing.T) {
+	cfg := NewDefaultRetrySettings()
+	assert.NoError(t, cfg.Validate())
+	cfg.MaxElapsedTime = -1
+	assert.Error(t, cfg.Validate())
+}
+
+func TestDisabledWithInvalidValues(t *testing.T) {
+	cfg := RetrySettings{
+		Enabled:             false,
+		InitialInterval:     -1,
+		RandomizationFactor: -1,
+		Multiplier:          0,
+		MaxInterval:         -1,
+		MaxElapsedTime:      -1,
+	}
+	assert.NoError(t, cfg.Validate())
+}

internal/obsreportconfig/obsreportconfig.go

@@ -17,7 +17,7 @@ import (
 // telemetrySettings for internal metrics.
 var UseOtelForInternalMetricsfeatureGate = featuregate.GlobalRegistry().MustRegister(
 	"telemetry.useOtelForInternalMetrics",
-	featuregate.StageAlpha,
+	featuregate.StageBeta,
 	featuregate.WithRegisterDescription("controls whether the collector uses OpenTelemetry for internal metrics"))
 
 // DisableHighCardinalityMetricsfeatureGate is the feature gate that controls whether the collector should enable

internal/obsreportconfig/obsreportconfig_test.go

@@ -7,11 +7,18 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/collector/featuregate"
 )
 
 func TestConfigure(t *testing.T) {
+	originalValue := UseOtelForInternalMetricsfeatureGate.IsEnabled()
+	require.NoError(t, featuregate.GlobalRegistry().Set(UseOtelForInternalMetricsfeatureGate.ID(), false))
+	defer func() {
+		require.NoError(t, featuregate.GlobalRegistry().Set(UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
+	}()
 	tests := []struct {
 		name         string
 		level        configtelemetry.Level

internal/tools/go.mod

@@ -15,7 +15,7 @@ require (
 	go.opentelemetry.io/build-tools/multimod v0.12.0
 	go.opentelemetry.io/build-tools/semconvgen v0.12.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
-	golang.org/x/tools v0.16.0
+	golang.org/x/tools v0.16.1
 	golang.org/x/vuln v1.0.1
 )
 

processor/memorylimiterprocessor/config.go

@@ -6,11 +6,21 @@
 package memorylimiterprocessor // import "go.opentelemetry.io/collector/processor/memorylimiterprocessor"
 
 import (
+	"errors"
 	"time"
 
 	"go.opentelemetry.io/collector/component"
 )
 
+var (
+	errCheckIntervalOutOfRange        = errors.New("'check_interval' must be greater than zero")
+	errLimitOutOfRange                = errors.New("'limit_mib' or 'limit_percentage' must be greater than zero")
+	errSpikeLimitOutOfRange           = errors.New("'spike_limit_mib' must be smaller than 'limit_mib'")
+	errSpikeLimitPercentageOutOfRange = errors.New("'spike_limit_percentage' must be smaller than 'limit_percentage'")
+	errLimitPercentageOutOfRange      = errors.New(
+		"'limit_percentage' and 'spike_limit_percentage' must be greater than zero and less than or equal to hundred")
+)
+
 // Config defines configuration for memory memoryLimiter processor.
 type Config struct {
 	// CheckInterval is the time between measurements of memory usage for the
@@ -46,13 +56,13 @@ func (cfg *Config) Validate() error {
 		return errLimitOutOfRange
 	}
 	if cfg.MemoryLimitPercentage > 100 || cfg.MemorySpikePercentage > 100 {
-		return errPercentageLimitOutOfRange
+		return errLimitPercentageOutOfRange
 	}
 	if cfg.MemoryLimitMiB > 0 && cfg.MemoryLimitMiB <= cfg.MemorySpikeLimitMiB {
-		return errMemSpikeLimitOutOfRange
+		return errSpikeLimitOutOfRange
 	}
 	if cfg.MemoryLimitPercentage > 0 && cfg.MemoryLimitPercentage <= cfg.MemorySpikePercentage {
-		return errMemSpikePercentageLimitOutOfRange
+		return errSpikeLimitPercentageOutOfRange
 	}
 	return nil
 }

processor/memorylimiterprocessor/config_test.go

@@ -77,15 +77,15 @@ func TestConfigValidate(t *testing.T) {
 				MemoryLimitMiB:      10,
 				MemorySpikeLimitMiB: 10,
 			},
-			err: errMemSpikeLimitOutOfRange,
+			err: errSpikeLimitOutOfRange,
 		},
 		{
 			name: "invalid memory percentage limit",
 			cfg: &Config{
 				CheckInterval:         1 * time.Second,
 				MemoryLimitPercentage: 101,
 			},
-			err: errPercentageLimitOutOfRange,
+			err: errLimitPercentageOutOfRange,
 		},
 		{
 			name: "invalid memory spike percentage limit",
@@ -94,7 +94,7 @@ func TestConfigValidate(t *testing.T) {
 				MemoryLimitPercentage: 50,
 				MemorySpikePercentage: 60,
 			},
-			err: errMemSpikePercentageLimitOutOfRange,
+			err: errSpikeLimitPercentageOutOfRange,
 		},
 	}
 	for _, tt := range tests {

processor/memorylimiterprocessor/memorylimiter.go

@@ -32,19 +32,6 @@ var (
 	// that data is being refused due to high memory usage.
 	errDataRefused = errors.New("data refused due to high memory usage")
 
-	// Construction errors
-
-	errCheckIntervalOutOfRange = errors.New("check_interval must be greater than zero")
-
-	errLimitOutOfRange = errors.New("limit_mib or limit_percentage must be greater than zero")
-
-	errMemSpikeLimitOutOfRange = errors.New("spike_limit_mib must be smaller than limit_mib")
-
-	errMemSpikePercentageLimitOutOfRange = errors.New("spike_limit_percentage must be smaller than limit_percentage")
-
-	errPercentageLimitOutOfRange = errors.New(
-		"limit_percentage and spike_limit_percentage must be greater than zero and less than or equal to hundred")
-
 	errShutdownNotStarted = errors.New("no existing monitoring routine is running")
 )
 

processor/processorhelper/obsreport_test.go

@@ -101,6 +101,11 @@ func TestProcessorLogRecords(t *testing.T) {
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt obsreporttest.TestTelemetry, useOtel bool)) {
 	t.Run("WithOC", func(t *testing.T) {
+		originalValue := obsreportconfig.UseOtelForInternalMetricsfeatureGate.IsEnabled()
+		require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), false))
+		defer func() {
+			require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
+		}()
 		tt, err := obsreporttest.SetupTelemetry(id)
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
@@ -109,11 +114,6 @@ func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt
 	})
 
 	t.Run("WithOTel", func(t *testing.T) {
-		originalValue := obsreportconfig.UseOtelForInternalMetricsfeatureGate.IsEnabled()
-		require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), true))
-		defer func() {
-			require.NoError(t, featuregate.GlobalRegistry().Set(obsreportconfig.UseOtelForInternalMetricsfeatureGate.ID(), originalValue))
-		}()
 		tt, err := obsreporttest.SetupTelemetry(id)
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })