From fbbfd2da4792b81f770d82cfba83ac0b26d46b1c Mon Sep 17 00:00:00 2001 From: Lauren Leach Date: Mon, 30 Jun 2025 14:36:01 -0700 Subject: [PATCH 1/3] test debug log --- vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go b/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go index 14082a35..f9d87a15 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go @@ -259,6 +259,7 @@ func (c *otelConfig) initLogging(ctx context.Context, cc *grpc.ClientConn) (cont ) otelzapcore := otelzap.NewCore(c.serviceName, otelzap.WithVersion(sdk.Version), otelzap.WithLoggerProvider(provider)) + otelzapcore.Enabled(zap.DebugLevel) addOtel := zap.WrapCore(func(c zapcore.Core) zapcore.Core { return zapcore.NewTee(c, otelzapcore) }) From 389af43dace6dc3b0c8c0573cedd342c820022ba Mon Sep 17 00:00:00 2001 From: Lauren Leach Date: Mon, 30 Jun 2025 16:43:14 -0700 Subject: [PATCH 2/3] use runCtx for initOtel --- vendor/github.com/conductorone/baton-sdk/pkg/cli/commands.go | 2 +- .../conductorone/baton-sdk/pkg/cli/lambda_server__added.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/cli/commands.go b/vendor/github.com/conductorone/baton-sdk/pkg/cli/commands.go index 14cdde2a..0c683f8d 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/cli/commands.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/cli/commands.go @@ -327,7 +327,7 @@ func initOtel(ctx context.Context, name string, v *viper.Viper, initialLogFields otelOpts = append(otelOpts, uotel.WithOtelEndpoint(otelEndpoint, otelTLSCertPath, otelTLSCert)) } - return uotel.InitOtel(context.Background(), otelOpts...) + return uotel.InitOtel(ctx, otelOpts...) } func MakeGRPCServerCommand[T field.Configurable]( diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/cli/lambda_server__added.go b/vendor/github.com/conductorone/baton-sdk/pkg/cli/lambda_server__added.go index 8791cdfd..55301121 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/cli/lambda_server__added.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/cli/lambda_server__added.go @@ -74,7 +74,7 @@ func OptionallyAddLambdaCommand[T field.Configurable]( return err } - runCtx, otelShutdown, err := initOtel(context.Background(), name, v, initalLogFields) + runCtx, otelShutdown, err := initOtel(runCtx, name, v, initalLogFields) if err != nil { return err } From f78994aaf74533549d5d78c491e18901e303b0fb Mon Sep 17 00:00:00 2001 From: Lauren Leach Date: Mon, 30 Jun 2025 21:26:05 -0700 Subject: [PATCH 3/3] test without otelzap debug level --- vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go b/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go index f9d87a15..cc7a6f01 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/uotel/config.go @@ -259,7 +259,7 @@ func (c *otelConfig) initLogging(ctx context.Context, cc *grpc.ClientConn) (cont ) otelzapcore := otelzap.NewCore(c.serviceName, otelzap.WithVersion(sdk.Version), otelzap.WithLoggerProvider(provider)) - otelzapcore.Enabled(zap.DebugLevel) + // otelzapcore.Enabled(zap.DebugLevel) addOtel := zap.WrapCore(func(c zapcore.Core) zapcore.Core { return zapcore.NewTee(c, otelzapcore) })