update

ScoreTrak · Jan 29, 2023 · 6365728 · 6365728
1 parent 3006eff
commit 6365728
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/pkg/server/grpc/server.go b/pkg/server/grpc/server.go
@@ -26,7 +26,7 @@ import (
 
 func NewGrpcServer(staticConfig config.StaticConfig, logger *zap.Logger, authInterceptor *auth.Interceptor) (*grpc.Server, error) {
 
-	var server *grpc.Server
+	var s *grpc.Server
 
 	var serverOptions []grpc.ServerOption
 
@@ -96,14 +96,14 @@ func NewGrpcServer(staticConfig config.StaticConfig, logger *zap.Logger, authInt
 	}
 
 	// New GRPC Server
-	server = grpc.NewServer(serverOptions...)
+	s = grpc.NewServer(serverOptions...)
 
 	// Reflection
 	if !staticConfig.Prod {
-		reflection.Register(server)
+		reflection.Register(s)
 	}
 
-	return server, nil
+	return s, nil
 }
 
 func InitGrpcServer(lc fx.Lifecycle, config server.Config, server *grpc.Server) {

diff --git a/pkg/telemetry/telemetryfx/module.go b/pkg/telemetry/telemetryfx/module.go
@@ -5,22 +5,29 @@ import (
 	"go.uber.org/fx"
 )
 
-var OtlpModule = fx.Module("otlp",
+var LoggingModule = fx.Options(
+	// Logging
+	fx.Provide(telemetry.NewLogger),
+)
+
+var OTELModule = fx.Options(
+	// Tracing
+	fx.Provide(telemetry.NewResource),
+
+	// Exporters
 	fx.Provide(
 		telemetry.NewOtlpGrpcExporter,
 		telemetry.NewOtlpGrpcTracerProvider,
 	),
+
+	// Set Global Tracer
+	fx.Invoke(telemetry.RegisterTracerProvider),
 )
 
 var Module = fx.Options(
 	// Logging
-	fx.Provide(telemetry.NewLogger),
-	// Tracing
-	fx.Provide(telemetry.NewResource),
-
-	// OTLP
-	OtlpModule,
+	LoggingModule,
 
-	// Set Global Tracer
-	fx.Invoke(telemetry.RegisterTracerProvider),
+	// Open Telemetry
+	//OTELModule,
 )