Remove reference to defaultcomponents in core and deprecate include_core flag

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - Remove `defaultcomponents` from core (#4087)
 
+## 🧰 Bug fixes 🧰
+
+- Fix handling of corrupted records by persistent buffer (experimental) (#4475)
+
+## v0.40.0 Beta
+
 ## 🛑 Breaking changes 🛑
 
 - Package `client` refactored (#4416) and auth data included in it (#4422). Final PR to be merged in the next release (#4423)

cmd/builder/README.md

@@ -73,7 +73,6 @@ dist:
     module: github.com/open-telemetry/opentelemetry-collector # the module name for the new distribution, following Go mod conventions. Optional, but recommended.
     name: otelcol-custom # the binary name. Optional.
     description: "Custom OpenTelemetry Collector distribution" # a long name for the application. Optional.
-    include_core: true # whether the core components should be included in the distribution. Optional.
     otelcol_version: "0.37.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
     output_path: /tmp/otelcol-distributionNNN # the path to write the output (sources and binary). Optional.
     version: "1.0.0" # the version for your custom OpenTelemetry Collector. Optional.

cmd/builder/internal/builder/config.go

@@ -54,7 +54,6 @@ type Distribution struct {
 	Go             string `mapstructure:"go"`
 	Description    string `mapstructure:"description"`
 	OtelColVersion string `mapstructure:"otelcol_version"`
-	IncludeCore    bool   `mapstructure:"include_core"`
 	OutputPath     string `mapstructure:"output_path"`
 	Version        string `mapstructure:"version"`
 }

cmd/builder/internal/builder/templates/components.go.tmpl

@@ -5,9 +5,6 @@ package main
 import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer/consumererror"
-	{{- if .Distribution.IncludeCore}}
-	"go.opentelemetry.io/collector/service/defaultcomponents"
-	{{- end}}
 
 	// extensions
 	{{- range .Extensions}}
@@ -35,15 +32,6 @@ func components() (component.Factories, error) {
 	var err error
 	var factories component.Factories
 
-	{{- if .Distribution.IncludeCore}}
-	factories, err = defaultcomponents.Components()
-	if err != nil {
-		return component.Factories{}, err
-	}
-	{{- else}}
-	factories = component.Factories{}
-	{{- end}}
-
 	extensions := []component.ExtensionFactory{
 		{{- range .Extensions}}
 		{{.Name}}.NewFactory(),

cmd/builder/internal/command.go

@@ -61,7 +61,6 @@ func Command() (*cobra.Command, error) {
 	cmd.Flags().StringVar(&cfg.Distribution.Name, "name", "otelcol-custom", "The executable name for the OpenTelemetry Collector distribution")
 	cmd.Flags().StringVar(&cfg.Distribution.Description, "description", "Custom OpenTelemetry Collector distribution", "A descriptive name for the OpenTelemetry Collector distribution")
 	cmd.Flags().StringVar(&cfg.Distribution.Version, "version", "1.0.0", "The version for the OpenTelemetry Collector distribution")
-	cmd.Flags().BoolVar(&cfg.Distribution.IncludeCore, "include-core", true, "Whether the core components should be included in the distribution")
 	cmd.Flags().StringVar(&cfg.Distribution.OtelColVersion, "otelcol-version", cfg.Distribution.OtelColVersion, "Which version of OpenTelemetry Collector to use as base")
 	cmd.Flags().StringVar(&cfg.Distribution.OutputPath, "output-path", cfg.Distribution.OutputPath, "Where to write the resulting files")
 	cmd.Flags().StringVar(&cfg.Distribution.Go, "go", "", "The Go binary to use during the compilation phase. Default: go from the PATH")

cmd/builder/test/nocore.builder.yaml

@@ -1,7 +1,6 @@
 dist:
   module: go.opentelemetry.io/collector/builder/test/nocore
   otelcol_version: 0.38.0
-  include_core: false
 
 receivers:
   - import: go.opentelemetry.io/collector/receiver/otlpreceiver

cmd/builder/test/replaces.builder.yaml

@@ -2,6 +2,15 @@ dist:
   module: go.opentelemetry.io/collector/builder/test/replaces
   otelcol_version: 0.38.0
 
+receivers:
+  - import: go.opentelemetry.io/collector/receiver/otlpreceiver
+    gomod: go.opentelemetry.io/collector v0.38.0
+exporters:
+  - import: go.opentelemetry.io/collector/exporter/loggingexporter
+    gomod: go.opentelemetry.io/collector v0.38.0
+extensions:
+  - import: go.opentelemetry.io/collector/extension/zpagesextension
+    gomod: go.opentelemetry.io/collector v0.38.0
 processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.38.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.38.0

exporter/doc.go

@@ -16,7 +16,4 @@
 //
 // To implement a custom exporter you will need to implement component.ExporterFactory
 // interface and component.Exporter interface.
-//
-// To make the custom exporter part of the Collector build the factory must be added
-// to defaultcomponents.Components() function.
 package exporter // import "go.opentelemetry.io/collector/exporter"