Skip to content

Commit

Permalink
exporter: return err when exporter fails to start
Browse files Browse the repository at this point in the history
In general, when Tetragon encounters an error in its initial configuration, we expect the agent to fail to start and return an appriate error explaining the configuration issue. This is the case for many aspects of initialization, except for the exporter which currently just logs an error message. This is perplexing behaviour because users who want to configure an exporter generally consume Tetragon events that way, so it makes no sense to simply refuse to export events and merrily hum along. Fix this issue by returning an appropriate error when the exporter fails to start so we can bubble it up.

Signed-off-by: William Findlay <will@isovalent.com>
  • Loading branch information
willfindlay committed Feb 21, 2024
1 parent fd34bfb commit 1a8e6f6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
3 changes: 1 addition & 2 deletions cmd/tetragon/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,7 @@ func startExporter(ctx context.Context, server *server.Server) error {
log.WithFields(logrus.Fields{"fieldFilters": fieldFilters}).Debug("Configured field filters")
log.WithFields(logrus.Fields{"logger": writer, "request": &req}).Info("Starting JSON exporter")
exporter := exporter.NewExporter(ctx, &req, server, encoder, writer, rateLimiter)
exporter.Start()
return nil
return exporter.Start()
}

func Serve(ctx context.Context, listenAddr string, srv *server.Server) error {
Expand Down
4 changes: 3 additions & 1 deletion pkg/bench/bench.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ func startBenchmarkExporter(ctx context.Context, obs *observer.Observer, summary

req := tetragon.GetEventsRequest{AllowList: nil, DenyList: nil, AggregationOptions: nil}
exporter := exporter.NewExporter(ctx, &req, processManager.Server, &timingEncoder, writer, nil)
exporter.Start()
if err := exporter.Start(); err != nil {
return err
}
obs.AddListener(processManager)
return nil
}
9 changes: 5 additions & 4 deletions pkg/exporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package exporter

import (
"context"
"fmt"
"io"
"sync"

Expand Down Expand Up @@ -39,17 +40,17 @@ func NewExporter(
return &Exporter{ctx, request, server, encoder, closer, rateLimiter}
}

func (e *Exporter) Start() {
func (e *Exporter) Start() error {
var readyWG sync.WaitGroup
var exporterStartErr error
readyWG.Add(1)
go func() {
if err := e.server.GetEventsWG(e.request, e, e.closer, &readyWG); err != nil {
if e.ctx.Err() == nil {
logger.GetLogger().WithError(err).Error("Failed to start JSON exporter")
}
exporterStartErr = fmt.Errorf("error starting JSON exporter: %w", err)
}
}()
readyWG.Wait()
return exporterStartErr
}

func (e *Exporter) Send(event *tetragon.GetEventsResponse) error {
Expand Down
4 changes: 2 additions & 2 deletions pkg/exporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func TestExporter_Send(t *testing.T) {
encoder := encoder.NewProtojsonEncoder(results)
request := tetragon.GetEventsRequest{DenyList: []*tetragon.Filter{{BinaryRegex: []string{"b"}}}}
exporter := NewExporter(ctx, &request, grpcServer, encoder, results, nil)
exporter.Start()
assert.NoError(t, exporter.Start(), "exporter must start without errors")
eventNotifier.NotifyListener(nil, &tetragon.GetEventsResponse{
Event: &tetragon.GetEventsResponse_ProcessExec{
ProcessExec: &tetragon.ProcessExec{Process: &tetragon.Process{Binary: "a"}},
Expand Down Expand Up @@ -202,7 +202,7 @@ func Test_rateLimitExport(t *testing.T) {
results,
ratelimit.NewRateLimiter(ctx, 50*time.Millisecond, tt.rateLimit, encoder),
)
exporter.Start()
assert.NoError(t, exporter.Start(), "exporter must start without errors")
for i := 0; i < tt.totalEvents; i++ {
eventNotifier.NotifyListener(nil, &tetragon.GetEventsResponse{
Event: &tetragon.GetEventsResponse_ProcessExec{
Expand Down
4 changes: 3 additions & 1 deletion pkg/observer/observertesthelper/observer_test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,9 @@ func loadExporter(tb testing.TB, ctx context.Context, obs *observer.Observer, op
req := tetragon.GetEventsRequest{AllowList: opts.allowList, DenyList: opts.denyList}
exporter := exporter.NewExporter(ctx, &req, processManager.Server, encoder, outF, nil)
logger.GetLogger().Info("Starting JSON exporter")
exporter.Start()
if err := exporter.Start(); err != nil {
return err
}
obs.AddListener(processManager)
tb.Cleanup(func() {
obs.RemoveListener(processManager)
Expand Down

0 comments on commit 1a8e6f6

Please sign in to comment.