Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[exporter/datadog] Use statswriter, client aggregator is for tracer stats only #31173

Merged
merged 17 commits into from
Feb 14, 2024
Merged

[exporter/datadog] Use statswriter, client aggregator is for tracer stats only #31173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ba0504d
use statswriter, client aggregator is for tracer stats only
ajgajg1134 Feb 9, 2024
78a1cd5
Stop the statswriter on shutdown
ajgajg1134 Feb 9, 2024
2aa0bcc
Close the channel and log on startup
ajgajg1134 Feb 9, 2024
4b59856
must call cancel before returning error
ajgajg1134 Feb 12, 2024
0430a47
Update integration test to cover this change, (test fails on main)
ajgajg1134 Feb 12, 2024
1d2870c
Add changelog
ajgajg1134 Feb 12, 2024
2bf56ca
Merge branch 'main' into andrew.glaude/pocStats
ajgajg1134 Feb 12, 2024
3bdca5d
Fix other branch of metrics exporting logic, also needs to use stats …
ajgajg1134 Feb 12, 2024
9d92eeb
Merge branch 'main' into andrew.glaude/pocStats
ajgajg1134 Feb 12, 2024
bbfdb35
Fix linting error, clarify comment
ajgajg1134 Feb 13, 2024
163d2ac
Merge branch 'main' into andrew.glaude/pocStats
ajgajg1134 Feb 13, 2024
2fe4344
re-generate otelcontribcol
ajgajg1134 Feb 13, 2024
41ebaff
Keep tracerVersion behavior for perf feature gate disabled
ajgajg1134 Feb 13, 2024
8d62f2b
keep previous behavior of setting tracerVersion
ajgajg1134 Feb 13, 2024
a862b2d
Set toolchain to latest to try and get genotelcontribcol check to pass
ajgajg1134 Feb 13, 2024
df1c58e
make genoteltestbedcol changes toolchain version
ajgajg1134 Feb 13, 2024
bdfba65
Merge branch 'main' into andrew.glaude/pocStats
mx-psi Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Close the channel and log on startup
  • Loading branch information
@ajgajg1134
ajgajg1134 committed Feb 9, 2024
commit 2aa0bcc4a61ac907256efd64bfe3fd7e6b6245d6
5 changes: 5 additions & 0 deletions exporter/datadogexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ func (f *factory) createMetricsExporter(
}
statsToAgent := make(chan *pb.StatsPayload)
statsWriter := writer.NewStatsWriter(acfg, statsToAgent, telemetry.NewNoopCollector())
ajgajg1134 marked this conversation as resolved.
Show resolved Hide resolved

set.Logger.Debug("Starting Datadog Trace-Agent StatsWriter")
go statsWriter.Run()

var statsIn chan []byte
Expand Down Expand Up @@ -356,6 +358,9 @@ func (f *factory) createMetricsExporter(
if statsIn != nil {
close(statsIn)
}
if statsToAgent != nil {
close(statsToAgent)
}
return nil
}),
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/traces_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}
Loading