Rename service.Application to service.Collector

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Remove unused logstest package (#3222)
 - Introduce `AppSettings` instead of `Parameters` (#3163)
+- Rename `service.Application` to `service.Collector` (#3268)
 - Remove unused testutil.TempSocketName (#3291)
 - Move BigEndian helper functions in `tracetranslator` to an internal package.(#3298)
 

cmd/otelcol/main.go

@@ -37,20 +37,20 @@ func main() {
 		Version:     version.Version,
 	}
 
-	if err := run(service.AppSettings{BuildInfo: info, Factories: factories}); err != nil {
+	if err := run(service.ColSettings{BuildInfo: info, Factories: factories}); err != nil {
 		log.Fatal(err)
 	}
 }
 
-func runInteractive(settings service.AppSettings) error {
+func runInteractive(settings service.ColSettings) error {
 	app, err := service.New(settings)
 	if err != nil {
-		return fmt.Errorf("failed to construct the application: %w", err)
+		return fmt.Errorf("failed to construct the collector server: %w", err)
 	}
 
 	err = app.Run()
 	if err != nil {
-		return fmt.Errorf("application run finished with error: %w", err)
+		return fmt.Errorf("collector server run finished with error: %w", err)
 	}
 
 	return nil

cmd/otelcol/main_others.go

@@ -18,6 +18,6 @@ package main
 
 import "go.opentelemetry.io/collector/service"
 
-func run(settings service.AppSettings) error {
+func run(settings service.ColSettings) error {
 	return runInteractive(settings)
 }

cmd/otelcol/main_windows.go

@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/collector/service"
 )
 
-func run(set service.AppSettings) error {
+func run(set service.ColSettings) error {
 	if useInteractiveMode, err := checkUseInteractiveMode(); err != nil {
 		return err
 	} else if useInteractiveMode {
@@ -51,7 +51,7 @@ func checkUseInteractiveMode() (bool, error) {
 	}
 }
 
-func runService(set service.AppSettings) error {
+func runService(set service.ColSettings) error {
 	// do not need to supply service name when startup is invoked through Service Control Manager directly
 	if err := svc.Run("", service.NewWindowsService(set)); err != nil {
 		return fmt.Errorf("failed to start service %w", err)

component/host.go

@@ -19,7 +19,7 @@ import (
 )
 
 // Host represents the entity that is hosting a Component. It is used to allow communication
-// between the Component and its host (normally the service.Service is the host).
+// between the Component and its host (normally the service.Collector is the host).
 type Host interface {
 	// ReportFatalError is used to report to the host that the component
 	// encountered a fatal error (i.e.: an error that the instance can't recover

docs/service-extensions.md

@@ -20,7 +20,7 @@ to receive data. These are a necessary addition to allow implementing extensions
 that indicate to LBs and external systems if the service instance is ready or 
 not to receive data 
 (e.g.: a [k8s readiness probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#define-readiness-probes)). 
-These state changes are under the control of the service application hosting 
+These state changes are under the control of the service server hosting 
 the extensions.
 
 There are more complex scenarios in which there can be notifications of state