From e6ecec93a4857e6c324ae3c74038704bd9a47fca Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Wed, 29 Jun 2022 23:58:23 +0200 Subject: [PATCH] feat: add env vars to control otel --- integration/temporal/client.go | 4 ++-- persistence/mongo/persistor.go | 6 ++++-- telemetry/tracer.go | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/integration/temporal/client.go b/integration/temporal/client.go index d5c4934..d1ee963 100644 --- a/integration/temporal/client.go +++ b/integration/temporal/client.go @@ -31,7 +31,7 @@ type ( func ClientWithOtelEnabled(v bool) ClientOption { return func(o *ClientOptions) { - o.OtelEnabled = env.GetBool("OTEL_ENABLED", v) + o.OtelEnabled = v } } @@ -52,7 +52,7 @@ func DefaultClientOptions() ClientOptions { Logger: log.Logger(), Namespace: "default", RegisterNamespace: nil, - OtelEnabled: env.GetBool("OTEL_ENABLED", false), + OtelEnabled: env.GetBool("TEMPORAL_OTEL_ENABLED", env.GetBool("OTEL_ENABLED", false)), } } diff --git a/persistence/mongo/persistor.go b/persistence/mongo/persistor.go index 7975571..7d09abe 100644 --- a/persistence/mongo/persistor.go +++ b/persistence/mongo/persistor.go @@ -56,8 +56,10 @@ func WithDatabaseOptions(v *options.DatabaseOptions) Option { func DefaultOptions() Options { return Options{ - OtelEnabled: env.GetBool("OTEL_ENABLED", false), - OtelOptions: nil, + OtelEnabled: env.GetBool("MONGO_OTEL_ENABLED", env.GetBool("OTEL_ENABLED", false)), + OtelOptions: []otelmongo.Option{ + otelmongo.WithCommandAttributeDisabled(env.GetBool("OTEL_MONGO_COMMAND_ATTRIBUTE_DISABLED", false)), + }, ClientOptions: options.Client(). SetReadConcern(readconcern.Majority()). SetWriteConcern(writeconcern.New(writeconcern.WMajority())), diff --git a/telemetry/tracer.go b/telemetry/tracer.go index 099f5f3..1d75e4d 100644 --- a/telemetry/tracer.go +++ b/telemetry/tracer.go @@ -83,7 +83,7 @@ func newTracerProvider(e sdktrace.SpanExporter) (trace.TracerProvider, error) { tracerProvider := sdktrace.NewTracerProvider( sdktrace.WithBatcher(e), sdktrace.WithResource(resource), - sdktrace.WithSampler(sdktrace.AlwaysSample()), + sdktrace.WithSampler(sdktrace.TraceIDRatioBased(env.GetFloat64("OTEL_TRACE_RATIO", 1))), ) otel.SetTracerProvider(tracerProvider)