more refactoring

This commit is contained in:
A.Unger
2021-08-09 18:15:34 +02:00
parent b13863b717
commit ad994ded16
14 changed files with 37 additions and 31 deletions

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the proxy service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the glauth service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the proxy service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the graph service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the idp service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -11,30 +11,36 @@ import (
)
// Propagator ensures the importer module uses the same trace propagation strategy.
var Propagator propagation.TextMapPropagator
var Propagator = propagation.NewCompositeTextMapPropagator(
propagation.Baggage{},
propagation.TraceContext{},
)
// GetTraceProvider returns a configured open-telemetry trace provider.
func GetTraceProvider(collectorEndpoint, traceType, serviceName string) (*sdktrace.TracerProvider, error) {
switch t := traceType; t {
case "jaeger":
{
exp, err := jaeger.New(
jaeger.WithCollectorEndpoint(
jaeger.WithEndpoint(collectorEndpoint),
),
)
if err != nil {
return nil, err
}
return sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exp),
sdktrace.WithResource(resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceNameKey.String(serviceName)),
),
), nil
if collectorEndpoint == "" {
return sdktrace.NewTracerProvider(), nil
}
exp, err := jaeger.New(
jaeger.WithCollectorEndpoint(
jaeger.WithEndpoint(collectorEndpoint),
),
)
if err != nil {
return nil, err
}
return sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exp),
sdktrace.WithResource(resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceNameKey.String(serviceName)),
),
), nil
case "agent":
fallthrough
case "zipkin":

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the ocs service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the onlyoffice service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the proxy service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the settings service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the store service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the thumbnails service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the web service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {

View File

@@ -8,7 +8,7 @@ import (
var (
// TraceProvider is the global trace provider for the proxy service.
TraceProvider = sdktrace.NewTracerProvider()
TraceProvider *sdktrace.TracerProvider
)
func Configure(cfg *config.Config) error {