Remove reference to defaultcomponents in core and deprecate include_core flag

CHANGELOG.md

@@ -8,7 +8,9 @@
 - Rename `configparser.Parser` as `config.Map` (#4075)
 - Rename `component.DefaultBuildInfo()` to `component.NewDefaultBuildInfo()` (#4129)
 - Rename consumererror.Permanent to consumererror.NewPermanent (#4118)
+- Move `extension/storage` to `extension/experimental/storage` (#4082)
 - Rename `config.NewID` to `config.NewComponentID` and `config.NewIDFromString` to `config.NewComponentIDFromString` (#4137)
+- Remove `defaultcomponents` from core (#4087).
 
 ## 💡 Enhancements 💡
 

Makefile

@@ -26,7 +26,7 @@ BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)"
 
 RUN_CONFIG?=examples/local/otel-config.yaml
 CONTRIB_PATH=$(CURDIR)/../opentelemetry-collector-contrib
-COMP_REL_PATH=service/defaultcomponents/defaults.go
+COMP_REL_PATH=internal/collector/defaultcomponents/defaults.go
 MOD_NAME=go.opentelemetry.io/collector
 
 ADDLICENSE=addlicense

cmd/otelcol/main.go

@@ -21,9 +21,9 @@ import (
 	"log"
 
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/internal/collector/defaultcomponents"
 	"go.opentelemetry.io/collector/internal/version"
 	"go.opentelemetry.io/collector/service"
-	"go.opentelemetry.io/collector/service/defaultcomponents"
 )
 
 func main() {

service/defaultcomponents/defaults.go → internal/collector/defaultcomponents/defaults.go

@@ -29,8 +29,7 @@ import (
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 )
 
-// Components returns the default set of components used by the
-// OpenTelemetry collector.
+// Components returns the default set of components used by the OpenTelemetry collector.
 func Components() (
 	component.Factories,
 	error,

service/collector_test.go

@@ -37,8 +37,8 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configunmarshaler"
+	"go.opentelemetry.io/collector/internal/collector/defaultcomponents"
 	"go.opentelemetry.io/collector/internal/testutil"
-	"go.opentelemetry.io/collector/service/defaultcomponents"
 	"go.opentelemetry.io/collector/service/internal/builder"
 	"go.opentelemetry.io/collector/service/parserprovider"
 )

service/collector_windows_test.go

@@ -26,7 +26,7 @@ import (
 	"golang.org/x/sys/windows/svc"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/service/defaultcomponents"
+	"go.opentelemetry.io/collector/internal/collector/defaultcomponents"
 )
 
 func TestWindowsService_Execute(t *testing.T) {

service/configcheck_test.go

@@ -22,7 +22,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/service/defaultcomponents"
+	"go.opentelemetry.io/collector/internal/collector/defaultcomponents"
 )
 
 func TestValidateConfigFromFactories_Success(t *testing.T) {