diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b1bc6fa270..d771ff183c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 🛑 Breaking changes 🛑 + +- Remove service/defaultcomponents deprecated package (#5019) + ## v0.47.0 Beta ### 🛑 Breaking changes 🛑 diff --git a/Makefile b/Makefile index 19bc35672f8..e6701755cee 100644 --- a/Makefile +++ b/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=cmd/otelcorecol/components.go MOD_NAME=go.opentelemetry.io/collector ADDLICENSE=addlicense diff --git a/service/defaultcomponents/defaults.go b/service/defaultcomponents/defaults.go deleted file mode 100644 index 69f187f84be..00000000000 --- a/service/defaultcomponents/defaults.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package defaultcomponents composes the default set of components used by the otel service -package defaultcomponents // import "go.opentelemetry.io/collector/service/defaultcomponents" - -import ( - "go.uber.org/multierr" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/loggingexporter" - "go.opentelemetry.io/collector/exporter/otlpexporter" - "go.opentelemetry.io/collector/exporter/otlphttpexporter" - "go.opentelemetry.io/collector/extension/ballastextension" - "go.opentelemetry.io/collector/extension/zpagesextension" - "go.opentelemetry.io/collector/processor/batchprocessor" - "go.opentelemetry.io/collector/processor/memorylimiterprocessor" - "go.opentelemetry.io/collector/receiver/otlpreceiver" -) - -// Deprecated: [v0.45.0] Will be removed soon. -func Components() ( - component.Factories, - error, -) { - var errs error - - extensions, err := component.MakeExtensionFactoryMap( - zpagesextension.NewFactory(), - ballastextension.NewFactory(), - ) - errs = multierr.Append(errs, err) - - receivers, err := component.MakeReceiverFactoryMap( - otlpreceiver.NewFactory(), - ) - errs = multierr.Append(errs, err) - - exporters, err := component.MakeExporterFactoryMap( - loggingexporter.NewFactory(), - otlpexporter.NewFactory(), - otlphttpexporter.NewFactory(), - ) - errs = multierr.Append(errs, err) - - processors, err := component.MakeProcessorFactoryMap( - batchprocessor.NewFactory(), - memorylimiterprocessor.NewFactory(), - ) - errs = multierr.Append(errs, err) - - factories := component.Factories{ - Extensions: extensions, - Receivers: receivers, - Processors: processors, - Exporters: exporters, - } - - return factories, errs -}