Merge branch 'main' into add_profiles_to_profiles_forward_connector

Author: rogercoll

.chloggen/builder-default-cgo-disabled.yaml

@@ -0,0 +1,25 @@
+# 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: cmd/builder
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Set CGO_ENABLED=0 by default, add the `cgo_enabled` configuration to enable it."
+
+# One or more tracking issues or pull requests related to the change
+issues: [10028]
+
+# (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:
+
+# 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: [user]

.chloggen/codeboten_add-queue-debug.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: exporter/debug
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add queue configuration
+
+# One or more tracking issues or pull requests related to the change
+issues: [14101]
+
+# (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:
+
+# 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: []

cmd/builder/README.md

@@ -222,3 +222,14 @@ file for the following things after `go get`ing all components and calling
 The `--skip-strict-versioning` flag disables these versioning checks.
 This flag is available temporarily and
 **will be removed in a future minor version**.
+
+### Cgo disabled by default
+
+By default, the OpenTelemetry Collector binary is built with `CGO_ENABLED=0` in accordance with
+how the official OpenTelemetry Collector releases are built. This can be overridden by adding
+the following configuration option to the `dist` section of the builder configuration file:
+
+```yaml
+dist:
+  cgo_enabled: true
+```

cmd/builder/internal/builder/config.go

@@ -73,6 +73,7 @@ type Distribution struct {
 	Version          string `mapstructure:"version"`
 	BuildTags        string `mapstructure:"build_tags"`
 	DebugCompilation bool   `mapstructure:"debug_compilation"`
+	CGoEnabled       bool   `mapstructure:"cgo_enabled"`
 }
 
 // Module represents a receiver, exporter, processor or extension for the distribution

cmd/builder/internal/builder/main.go

@@ -40,6 +40,13 @@ func runGoCommand(cfg *Config, args ...string) ([]byte, error) {
 	cmd := exec.Command(cfg.Distribution.Go, args...)
 	cmd.Dir = cfg.Distribution.OutputPath
 
+	cmd.Env = os.Environ()
+	if cfg.Distribution.CGoEnabled {
+		cmd.Env = append(cmd.Env, "CGO_ENABLED=1")
+	} else {
+		cmd.Env = append(cmd.Env, "CGO_ENABLED=0")
+	}
+
 	var stdout, stderr bytes.Buffer
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
@@ -127,6 +134,9 @@ func Compile(cfg *Config) error {
 			gcflags = cfg.GCFlags
 		}
 	}
+	if cfg.Distribution.CGoEnabled {
+		cfg.Logger.Info("Building with cgo enabled")
+	}
 
 	args = append(args, "-ldflags="+ldflags, "-gcflags="+gcflags)
 

cmd/builder/internal/builder/main_test.go

@@ -327,6 +327,16 @@ func TestGenerateAndCompile(t *testing.T) {
 				return cfg
 			},
 		},
+		{
+			name: "CGoEnabled set to true",
+			cfgBuilder: func(t *testing.T) *Config {
+				cfg := newTestConfig(t)
+				cfg.Distribution.OutputPath = t.TempDir()
+				cfg.Replaces = append(cfg.Replaces, replaces...)
+				cfg.Distribution.CGoEnabled = true
+				return cfg
+			},
+		},
 	}
 
 	for _, tt := range testCases {

exporter/debugexporter/exporter_test.go

@@ -58,7 +58,7 @@ func TestMetricsNoErrors(t *testing.T) {
 func TestLogsNoErrors(t *testing.T) {
 	for _, tc := range createTestCases() {
 		t.Run(tc.name, func(t *testing.T) {
-			lle, err := createLogs(context.Background(), exportertest.NewNopSettings(metadata.Type), createDefaultConfig())
+			lle, err := createLogs(context.Background(), exportertest.NewNopSettings(metadata.Type), tc.config)
 			require.NotNil(t, lle)
 			assert.NoError(t, err)
 
@@ -73,7 +73,7 @@ func TestLogsNoErrors(t *testing.T) {
 func TestProfilesNoErrors(t *testing.T) {
 	for _, tc := range createTestCases() {
 		t.Run(tc.name, func(t *testing.T) {
-			lle, err := createProfiles(context.Background(), exportertest.NewNopSettings(metadata.Type), createDefaultConfig())
+			lle, err := createProfiles(context.Background(), exportertest.NewNopSettings(metadata.Type), tc.config)
 			require.NotNil(t, lle)
 			assert.NoError(t, err)
 
@@ -110,13 +110,16 @@ func createTestCases() []testCase {
 		{
 			name: "default config",
 			config: func() *Config {
-				return createDefaultConfig().(*Config)
+				c := createDefaultConfig().(*Config)
+				c.QueueConfig.QueueSize = 10
+				return c
 			}(),
 		},
 		{
 			name: "don't use internal logger",
 			config: func() *Config {
 				cfg := createDefaultConfig().(*Config)
+				cfg.QueueConfig.QueueSize = 10
 				cfg.UseInternalLogger = false
 				return cfg
 			}(),

exporter/debugexporter/factory.go

@@ -61,6 +61,7 @@ func createTraces(ctx context.Context, set exporter.Settings, config component.C
 	return exporterhelper.NewTraces(ctx, set, config,
 		debug.pushTraces,
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
+		exporterhelper.WithQueue(cfg.QueueConfig),
 		exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
 		exporterhelper.WithShutdown(otlptext.LoggerSync(exporterLogger)),
 	)
@@ -73,6 +74,7 @@ func createMetrics(ctx context.Context, set exporter.Settings, config component.
 	return exporterhelper.NewMetrics(ctx, set, config,
 		debug.pushMetrics,
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
+		exporterhelper.WithQueue(cfg.QueueConfig),
 		exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
 		exporterhelper.WithShutdown(otlptext.LoggerSync(exporterLogger)),
 	)
@@ -85,6 +87,7 @@ func createLogs(ctx context.Context, set exporter.Settings, config component.Con
 	return exporterhelper.NewLogs(ctx, set, config,
 		debug.pushLogs,
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
+		exporterhelper.WithQueue(cfg.QueueConfig),
 		exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
 		exporterhelper.WithShutdown(otlptext.LoggerSync(exporterLogger)),
 	)
@@ -97,6 +100,7 @@ func createProfiles(ctx context.Context, set exporter.Settings, config component
 	return xexporterhelper.NewProfiles(ctx, set, config,
 		debug.pushProfiles,
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
+		exporterhelper.WithQueue(cfg.QueueConfig),
 		exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
 		exporterhelper.WithShutdown(otlptext.LoggerSync(exporterLogger)),
 	)