Remove deprecated funcs/types from service related to Config (#5755)

Signed-off-by: Bogdan <bogdandrutu@gmail.com>
open-telemetry · Jul 27, 2022 · de51f9e · de51f9e
1 parent 73b7320
commit de51f9e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### 🛑 Breaking changes 🛑
 
+- Remove deprecated funcs/types from service related to `Config` (#5755)
 - Change`confighttp.ToClient` to accept a `component.Host` (#5737)
 - Remove deprecated funcs from pdata related to mutable slices (#5754)
 

diff --git a/service/config.go b/service/config.go
@@ -16,20 +16,10 @@ package service // import "go.opentelemetry.io/collector/service"
 
 import (
 	"go.opentelemetry.io/collector/config"
-	"go.opentelemetry.io/collector/service/telemetry"
 )
 
 type Config = config.Config
 
 type ConfigService = config.Service
 
-// Deprecated: [v0.54.0] use telemetry.Config
-type ConfigServiceTelemetry = telemetry.Config
-
-// Deprecated: [v0.54.0] use telemetry.Config
-type ConfigServiceTelemetryLogs = telemetry.LogsConfig
-
-// Deprecated: [v0.54.0] use telemetry.Config
-type ConfigServiceTelemetryMetrics = telemetry.MetricsConfig
-
 type ConfigServicePipeline = config.Pipeline
diff --git a/service/config_test.go b/service/config_test.go
@@ -24,6 +24,7 @@ import (
 
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/collector/service/telemetry"
 )
 
 var (
@@ -264,8 +265,8 @@ func generateConfig() *Config {
 			},
 		},
 		Service: ConfigService{
-			Telemetry: ConfigServiceTelemetry{
-				Logs: ConfigServiceTelemetryLogs{
+			Telemetry: telemetry.Config{
+				Logs: telemetry.LogsConfig{
 					Level:             zapcore.DebugLevel,
 					Development:       true,
 					Encoding:          "console",
@@ -275,7 +276,7 @@ func generateConfig() *Config {
 					ErrorOutputPaths:  []string{"stderr", "./error-output-logs"},
 					InitialFields:     map[string]interface{}{"fieldKey": "filed-value"},
 				},
-				Metrics: ConfigServiceTelemetryMetrics{
+				Metrics: telemetry.MetricsConfig{
 					Level:   configtelemetry.LevelNormal,
 					Address: ":8080",
 				},

diff --git a/service/telemetry.go b/service/telemetry.go
@@ -41,6 +41,7 @@ import (
 	"go.opentelemetry.io/collector/processor/batchprocessor"
 	semconv "go.opentelemetry.io/collector/semconv/v1.5.0"
 	"go.opentelemetry.io/collector/service/featuregate"
+	"go.opentelemetry.io/collector/service/telemetry"
 )
 
 // collectorTelemetry is collector's own telemetrySettings.
@@ -79,7 +80,7 @@ func newColTelemetry(registry *featuregate.Registry) *telemetryInitializer {
 	}
 }
 
-func (tel *telemetryInitializer) init(buildInfo component.BuildInfo, logger *zap.Logger, cfg ConfigServiceTelemetry, asyncErrorChannel chan error) error {
+func (tel *telemetryInitializer) init(buildInfo component.BuildInfo, logger *zap.Logger, cfg telemetry.Config, asyncErrorChannel chan error) error {
 	var err error
 	tel.doInitOnce.Do(
 		func() {
@@ -89,7 +90,7 @@ func (tel *telemetryInitializer) init(buildInfo component.BuildInfo, logger *zap
 	return err
 }
 
-func (tel *telemetryInitializer) initOnce(buildInfo component.BuildInfo, logger *zap.Logger, cfg ConfigServiceTelemetry, asyncErrorChannel chan error) error {
+func (tel *telemetryInitializer) initOnce(buildInfo component.BuildInfo, logger *zap.Logger, cfg telemetry.Config, asyncErrorChannel chan error) error {
 	if cfg.Metrics.Level == configtelemetry.LevelNone || cfg.Metrics.Address == "" {
 		logger.Info(
 			"Skipping telemetry setup.",
@@ -157,7 +158,7 @@ func (tel *telemetryInitializer) initOnce(buildInfo component.BuildInfo, logger
 	return nil
 }
 
-func (tel *telemetryInitializer) initOpenCensus(cfg ConfigServiceTelemetry, telAttrs map[string]string) (http.Handler, error) {
+func (tel *telemetryInitializer) initOpenCensus(cfg telemetry.Config, telAttrs map[string]string) (http.Handler, error) {
 	tel.ocRegistry = ocmetric.NewRegistry()
 	metricproducer.GlobalManager().AddProducer(tel.ocRegistry)