Replace deprecated use of host.ReportFatalError

open-telemetry · Jan 20, 2024 · 2efe2be · 2efe2be
1 parent bd1d706
commit 2efe2be
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go
@@ -105,7 +105,7 @@ var _ http.Handler = (*firehoseReceiver)(nil)
 
 // Start spins up the receiver's HTTP server and makes the receiver start
 // its processing.
-func (fmr *firehoseReceiver) Start(_ context.Context, host component.Host) error {
+func (fmr *firehoseReceiver) Start(ctx context.Context, host component.Host) error {
 	if host == nil {
 		return errMissingHost
 	}
@@ -126,13 +126,14 @@ func (fmr *firehoseReceiver) Start(_ context.Context, host component.Host) error
 		defer fmr.shutdownWG.Done()
 
 		if errHTTP := fmr.server.Serve(listener); errHTTP != nil && !errors.Is(errHTTP, http.ErrServerClosed) {
-			host.ReportFatalError(errHTTP)
+			fmr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(errHTTP))
 		}
 	}()
 
 	return nil
 }
 
+
 // Shutdown tells the receiver that should stop reception,
 // giving it a chance to perform any necessary clean-up and
 // shutting down its HTTP server.

diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go
@@ -47,35 +47,35 @@ func newDataDogReceiver(config *Config, nextConsumer consumer.Traces, params rec
 }
 
 func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error {
-	ddmux := http.NewServeMux()
-	ddmux.HandleFunc("/v0.3/traces", ddr.handleTraces)
-	ddmux.HandleFunc("/v0.4/traces", ddr.handleTraces)
-	ddmux.HandleFunc("/v0.5/traces", ddr.handleTraces)
-	ddmux.HandleFunc("/v0.7/traces", ddr.handleTraces)
-	ddmux.HandleFunc("/api/v0.2/traces", ddr.handleTraces)
-
-	var err error
-	ddr.server, err = ddr.config.HTTPServerSettings.ToServer(
-		host,
-		ddr.params.TelemetrySettings,
-		ddmux,
-	)
-	if err != nil {
-		return fmt.Errorf("failed to create server definition: %w", err)
-	}
-	hln, err := ddr.config.HTTPServerSettings.ToListener()
-	if err != nil {
-		return fmt.Errorf("failed to create datadog listener: %w", err)
-	}
-
-	ddr.address = hln.Addr().String()
-
-	go func() {
-		if err := ddr.server.Serve(hln); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			host.ReportFatalError(fmt.Errorf("error starting datadog receiver: %w", err))
-		}
-	}()
-	return nil
+    ddmux := http.NewServeMux()
+    ddmux.HandleFunc("/v0.3/traces", ddr.handleTraces)
+    ddmux.HandleFunc("/v0.4/traces", ddr.handleTraces)
+    ddmux.HandleFunc("/v0.5/traces", ddr.handleTraces)
+    ddmux.HandleFunc("/v0.7/traces", ddr.handleTraces)
+    ddmux.HandleFunc("/api/v0.2/traces", ddr.handleTraces)
+
+    var err error
+    ddr.server, err = ddr.config.HTTPServerSettings.ToServer(
+        host,
+        ddr.params.TelemetrySettings,
+        ddmux,
+    )
+    if err != nil {
+        return fmt.Errorf("failed to create server definition: %w", err)
+    }
+    hln, err := ddr.config.HTTPServerSettings.ToListener()
+    if err != nil {
+        return fmt.Errorf("failed to create datadog listener: %w", err)
+    }
+
+    ddr.address = hln.Addr().String()
+
+    go func() {
+        if err := ddr.server.Serve(hln); err != nil && !errors.Is(err, http.ErrServerClosed) {
+            ddr.params.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err))
+        }
+    }()
+    return nil
 }
 
 func (ddr *datadogReceiver) Shutdown(ctx context.Context) (err error) {

diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go
@@ -115,7 +115,7 @@ func (r *sfxReceiver) RegisterLogsConsumer(lc consumer.Logs) {
 // Start tells the receiver to start its processing.
 // By convention the consumer of the received data is set when the receiver
 // instance is created.
-func (r *sfxReceiver) Start(_ context.Context, host component.Host) error {
+func (r *sfxReceiver) Start(ctx context.Context, host component.Host) error {
 	if r.metricsConsumer == nil && r.logsConsumer == nil {
 		return component.ErrNilNextConsumer
 	}
@@ -148,7 +148,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error {
 	go func() {
 		defer r.shutdownWG.Done()
 		if errHTTP := r.server.Serve(ln); !errors.Is(errHTTP, http.ErrServerClosed) && errHTTP != nil {
-			host.ReportFatalError(errHTTP)
+			r.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(errHTTP))
 		}
 	}()
 	return nil