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.

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

Properly shutdown tracer to flush Spans #376

Merged
merged 1 commit into from
Aug 17, 2022
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions pkg/eventshub/eventshub.go
Original file line number Diff line number Diff line change
@@ -43,9 +43,11 @@ func Start(eventLogFactories map[string]EventLogFactory, eventGeneratorFactories
ctx, _ := injection.EnableInjectionOrDie(nil, nil)
ctx = ConfigureLogging(ctx, "eventshub")

if err := ConfigureTracing(logging.FromContext(ctx), ""); err != nil {
tracer, err := ConfigureTracing(logging.FromContext(ctx), "")
if err != nil {
logging.FromContext(ctx).Fatal("Unable to setup trace publishing", err)
}
defer tracer.Shutdown(context.Background())

var env envConfig
if err := envconfig.Process("", &env); err != nil {
@@ -54,7 +56,7 @@ func Start(eventLogFactories map[string]EventLogFactory, eventGeneratorFactories
logging.FromContext(ctx).Infof("Events Hub environment configuration: %+v", env)

eventLogs := createEventLogs(ctx, eventLogFactories, env.EventLogs)
err := startEventGenerators(ctx, eventGeneratorFactories, env.EventGenerators, eventLogs)
err = startEventGenerators(ctx, eventGeneratorFactories, env.EventGenerators, eventLogs)

if err != nil {
logging.FromContext(ctx).Fatal("Error during start: ", err)
21 changes: 17 additions & 4 deletions pkg/eventshub/utils.go
Original file line number Diff line number Diff line change
@@ -59,19 +59,32 @@ func ParseDurationStr(durationStr string, defaultDuration int) time.Duration {
}

// ConfigureTracing can be used in test-images to configure tracing
func ConfigureTracing(logger *zap.SugaredLogger, serviceName string) error {
func ConfigureTracing(logger *zap.SugaredLogger, serviceName string) (tracing.Tracer, error) {
tracingEnv := os.Getenv(ConfigTracingEnv)

var (
tracer tracing.Tracer
err error
)

if tracingEnv == "" {
return tracing.SetupStaticPublishing(logger, serviceName, config.NoopConfig())
tracer, err = tracing.SetupPublishingWithStaticConfig(logger, serviceName, config.NoopConfig())
if err != nil {
return tracer, err
}
}

conf, err := config.JSONToTracingConfig(tracingEnv)
if err != nil {
return err
return tracer, err
}

tracer, err = tracing.SetupPublishingWithStaticConfig(logger, serviceName, conf)
if err != nil {
return tracer, err
}

return tracing.SetupStaticPublishing(logger, serviceName, conf)
return tracer, nil
}

// ConfigureTracing can be used in test-images to configure tracing