From 2aa0bcc4a61ac907256efd64bfe3fd7e6b6245d6 Mon Sep 17 00:00:00 2001 From: Andrew Glaude Date: Fri, 9 Feb 2024 16:15:40 -0500 Subject: [PATCH] Close the channel and log on startup --- exporter/datadogexporter/factory.go | 5 +++++ exporter/datadogexporter/traces_exporter.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index d7d142e7d2570..f373dff9080d0 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -289,6 +289,8 @@ func (f *factory) createMetricsExporter( } statsToAgent := make(chan *pb.StatsPayload) statsWriter := writer.NewStatsWriter(acfg, statsToAgent, telemetry.NewNoopCollector()) + + set.Logger.Debug("Starting Datadog Trace-Agent StatsWriter") go statsWriter.Run() var statsIn chan []byte @@ -356,6 +358,9 @@ func (f *factory) createMetricsExporter( if statsIn != nil { close(statsIn) } + if statsToAgent != nil { + close(statsToAgent) + } return nil }), ) diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 2184574365699..a25d3d80583ab 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -186,7 +186,6 @@ func newTraceAgent(ctx context.Context, params exporter.CreateSettings, cfg *Con if err != nil { return nil, err } - tracelog.SetLogger(&zaplogger{params.Logger}) return agent.NewAgent(ctx, acfg, telemetry.NewNoopCollector()), nil } @@ -218,5 +217,6 @@ func newTraceAgentConfig(ctx context.Context, params exporter.CreateSettings, cf if addr := cfg.Traces.Endpoint; addr != "" { acfg.Endpoints[0].Host = addr } + tracelog.SetLogger(&zaplogger{params.Logger}) //TODO: This shouldn't be a singleton return acfg, nil }