Close the channel and log on startup

open-telemetry · Feb 9, 2024 · 2aa0bcc · 2aa0bcc
1 parent 78a1cd5
commit 2aa0bcc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
 }