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

Author: himaschal

.gitignore

@@ -27,3 +27,4 @@
 /trillian_log_signer
 /trillian.json
 trillian/ctfe/ct_server/ctfe_server
+**/Dockerfile.local

trillian/ctfe/config/config.go

@@ -1,17 +1,47 @@
 package config
 
 import (
+	"os"
+
 	"github.com/digicert/ctutils/logging"
 	"github.com/digicert/ctutils/logging/adapters"
 )
 
 // InitLogging sets up the logging adapter for CTFE.
-func InitLogging() {
+// 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.
+// 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())
+
+	// 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
+	}
 
-	// Initialize logging adapter with JSON format
-	logCfg := logging.Config{Format: "json"}
+	logLevelStr := os.Getenv("LOG_LEVEL")
+	var logLevel logging.LogLevel
+	switch logLevelStr {
+	case "DEBUG":
+		logLevel = logging.DebugLevel
+	case "INFO":
+		logLevel = logging.InfoLevel
+	case "WARN":
+		logLevel = logging.WarnLevel
+	case "ERROR":
+		logLevel = logging.ErrorLevel
+	default:
+		logLevel = logging.InfoLevel
+	}
+
+	logCfg := logging.Config{
+		Format: logFormat,
+		Level:  logLevel,
+	}
 	adapter := adapters.NewLogrusAdapter(logCfg)
 	logging.SetLoggerAdapter(adapter)
+
+	return shutdown
 }

trillian/ctfe/config/config_test.go

@@ -0,0 +1,44 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/digicert/ctutils/logging"
+)
+
+func TestInitLogging(t *testing.T) {
+	tests := []struct {
+		name      string
+		logFormat string
+		logLevel  string
+	}{
+		{"Default", "", ""},
+		{"JSON_Debug", "json", "DEBUG"},
+		{"Text_Error", "text", "ERROR"},
+		{"Text_Info", "text", "INFO"},
+		{"Invalid_Formats", "invalid", "INVALID"}, // Should fallback to defaults
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.logFormat != "" {
+				t.Setenv("LOG_FORMAT", tt.logFormat)
+			}
+			if tt.logLevel != "" {
+				t.Setenv("LOG_LEVEL", tt.logLevel)
+			}
+
+			// 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 {
+				t.Error("InitLogging() failed to set global logger")
+			}
+		})
+	}
+}

trillian/ctfe/ct_server/main.go

@@ -103,7 +103,8 @@ func main() {
 	ctx := context.Background()
 
 	// Initialize logging with OpenTelemetry support
-	config.InitLogging()
+	shutdown := config.InitLogging()
+	defer shutdown()
 
 	keys.RegisterHandler(&keyspb.PEMKeyFile{}, pem.FromProto)
 	keys.RegisterHandler(&keyspb.PrivateKey{}, der.FromProto)