Migrate frontend to new service tracing setup.

This alters the frontend to use the new service tracing setup.
This commit is contained in:
Daniël Franke
2023-07-03 10:25:51 +02:00
parent f15ed6bc91
commit 7a229e438b
21 changed files with 98 additions and 83 deletions
+11 -2
View File
@@ -21,6 +21,7 @@ package runtime
import (
"github.com/rs/zerolog"
"go-micro.dev/v4/registry"
"go.opentelemetry.io/otel/trace"
)
// Option defines a single option function.
@@ -28,8 +29,9 @@ type Option func(o *Options)
// Options defines the available options for this package.
type Options struct {
Logger *zerolog.Logger
Registry registry.Registry
Logger *zerolog.Logger
Registry registry.Registry
TraceProvider trace.TracerProvider
}
// newOptions initializes the available default options.
@@ -56,3 +58,10 @@ func WithRegistry(r registry.Registry) Option {
o.Registry = r
}
}
// WithTraceProvider provides a function to set the trace provider.
func WithTraceProvider(tp trace.TracerProvider) Option {
return func(o *Options) {
o.TraceProvider = tp
}
}
+14 -4
View File
@@ -58,7 +58,7 @@ func RunWithOptions(mainConf map[string]interface{}, pidFile string, opts ...Opt
panic(err)
}
run(mainConf, coreConf, options.Logger, pidFile)
run(mainConf, coreConf, options.Logger, options.TraceProvider, pidFile)
}
type coreConf struct {
@@ -74,11 +74,21 @@ type coreConf struct {
TracingService string `mapstructure:"tracing_service"`
}
func run(mainConf map[string]interface{}, coreConf *coreConf, logger *zerolog.Logger, filename string) {
func run(
mainConf map[string]interface{},
coreConf *coreConf,
logger *zerolog.Logger,
tp trace.TracerProvider,
filename string,
) {
host, _ := os.Hostname()
logger.Info().Msgf("host info: %s", host)
tp := initTracing(coreConf)
// Only initialise tracing if we didn't get a tracer provider.
if tp == nil {
logger.Debug().Msg("No pre-existing tracer given, initializing tracing")
tp = initTracing(coreConf)
}
initCPUCount(coreConf, logger)
servers := initServers(mainConf, logger, tp)
@@ -241,7 +251,7 @@ func getWriter(out string) (io.Writer, error) {
return os.Stdout, nil
}
fd, err := os.OpenFile(out, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
fd, err := os.OpenFile(out, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
if err != nil {
err = errors.Wrap(err, "error creating log file: "+out)
return nil, err