Merge branch 'RA-8279_improve_application_visibility_timing_logs' into RA-8661_apply_updates_from_google

Author: himaschal

.gitignore

@@ -26,3 +26,4 @@ cockroach-data/
 server/.DS_Store
 .DS_Store
 cmd/trillian_log_server/trillian_log_server
+**/Dockerfile.local

cmd/trillian_log_server/main.go

@@ -95,7 +95,8 @@ func main() {
 
 	// Set up logging adapter via config logic
 	// This can be extended to use env vars, flags, or config files
-	config.InitLogging()
+	shutdown := config.InitLogging()
+	defer shutdown()
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

config/config.go

@@ -10,11 +10,12 @@ import (
 // InitLogging sets up the logging adapter for the project.
 // Note: This function is fail-safe. If OpenTelemetry initialization fails,
 // it logs an error and falls back to a no-op tracer provider to ensure the binary continues running.
-func InitLogging() {
+// Returns a shutdown function that should be deferred in main().
+func InitLogging() func() {
 	// Initialize OpenTelemetry with config struct
-	logging.InitOpenTelemetry(logging.TelemetryConfigFromEnv())
+	shutdown := logging.InitOpenTelemetry(logging.TelemetryConfigFromEnv())
 
-	// Example: select logger backend via config, env var, or flag
+	// Read logger backend configuration from env vars
 	logFormat := os.Getenv("LOG_FORMAT")
 	if logFormat == "" {
 		logFormat = "text" // Default to text for human readability if not specified
@@ -41,4 +42,6 @@ func InitLogging() {
 	}
 	adapter := adapters.NewLogrusAdapter(logCfg)
 	logging.SetLoggerAdapter(adapter)
+
+	return shutdown
 }

config/config_test.go

@@ -30,10 +30,12 @@ func TestInitLogging(t *testing.T) {
 				t.Setenv("LOG_LEVEL", tt.logLevel)
 			}
 
-			// Ideally we would inspect the set logger, but since the global logger
-			// is hidden/private in ctutils or hard to inspect without getters,
-			// we at least verify this doesn't panic.
-			InitLogging()
+			// Verify shutdown function is returned and works
+			shutdown := InitLogging()
+			if shutdown == nil {
+				t.Fatal("InitLogging() should return non-nil shutdown function")
+			}
+			defer shutdown() // Verify shutdown doesn't panic
 
 			// Check that a logger is set (not nil)
 			if logging.GetLogger() == nil {