From 2efe2be897438d3219b043f75a3c2708176cab13 Mon Sep 17 00:00:00 2001 From: Kiarash Sotoudeh Date: Fri, 19 Jan 2024 23:04:31 -0500 Subject: [PATCH 1/2] Replace deprecated use of host.ReportFatalError --- receiver/awsfirehosereceiver/receiver.go | 5 +- receiver/datadogreceiver/receiver.go | 58 ++++++++++++------------ receiver/signalfxreceiver/receiver.go | 4 +- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go index ee26ce2237f9..97a9ea792786 100644 --- 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 index b80498d5fe67..2976cc94f71b 100644 --- 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 index 419112058577..dd2a0106128c 100644 --- 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 From 0ed7e79b9dc779f8ec0aec475a4f1cfef9854964 Mon Sep 17 00:00:00 2001 From: Kiarash Sotoudeh <70961538+zzadxz@users.noreply.github.com> Date: Tue, 30 Jan 2024 21:37:10 -0500 Subject: [PATCH 2/2] Fix unused context parameter in SignalFx receiver and remove deprecated use of host.ReportFatalError --- .../fix_deprecated_reportfatalerror.yaml | 27 +++++++++++++++++++ receiver/signalfxreceiver/receiver.go | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100755 .chloggen/fix_deprecated_reportfatalerror.yaml diff --git a/.chloggen/fix_deprecated_reportfatalerror.yaml b/.chloggen/fix_deprecated_reportfatalerror.yaml new file mode 100755 index 000000000000..cb52ecc2acfb --- /dev/null +++ b/.chloggen/fix_deprecated_reportfatalerror.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: signalfxreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixed an issue in the SignalFx receiver where the context parameter was not utilized properly. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30598] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index dd2a0106128c..3e5f6bb5b6e8 100644 --- 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(ctx context.Context, host component.Host) error { +func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { if r.metricsConsumer == nil && r.logsConsumer == nil { return component.ErrNilNextConsumer }