fix: use build flags for startup log version (#2551)

Author: ousamabenyounes

caddy/app.go

@@ -25,7 +25,7 @@ var (
 	optionsMU sync.RWMutex
 )
 
-const appBaseOptionCapacity = 8
+const appBaseOptionCapacity = 7
 
 // EXPERIMENTAL: RegisterWorkers provides a way for extensions to register frankenphp.Workers
 func RegisterWorkers(name, fileName string, num int, wo ...frankenphp.WorkerOption) frankenphp.Workers {
@@ -180,7 +180,6 @@ func (f *FrankenPHPApp) Start() error {
 	f.opts = append(f.opts,
 		frankenphp.WithContext(f.ctx),
 		frankenphp.WithLogger(f.logger),
-		frankenphp.WithFrankenPHPVersion(frankenPHPVersionFromCaddyCustomVersion(caddy.CustomVersion)),
 		frankenphp.WithNumThreads(f.NumThreads),
 		frankenphp.WithMaxThreads(f.MaxThreads),
 		frankenphp.WithMetrics(f.metrics),

caddy/version.go

@@ -87,6 +87,10 @@ frankenphp_version frankenphp_get_version() {
   };
 }
 
+const char *frankenphp_get_frankenphp_version() {
+  return TOSTRING(FRANKENPHP_VERSION);
+}
+
 frankenphp_config frankenphp_get_config() {
   return (frankenphp_config){
 #ifdef ZTS

caddy/version_test.go

@@ -145,6 +145,10 @@ func Version() PHPVersion {
 	}
 }
 
+func frankenPHPVersion() string {
+	return C.GoString(C.frankenphp_get_frankenphp_version())
+}
+
 func Config() PHPConfig {
 	cConfig := C.frankenphp_get_config()
 
@@ -342,7 +346,7 @@ func Init(options ...Option) error {
 	initAutoScaling(mainThread)
 
 	if globalLogger.Enabled(globalCtx, slog.LevelInfo) {
-		globalLogger.LogAttrs(globalCtx, slog.LevelInfo, startupLogMessage, startupLogAttrs(opt.frankenPHPVersion, Version().Version, mainThread.numThreads, mainThread.maxThreads, maxRequestsPerThread)...)
+		globalLogger.LogAttrs(globalCtx, slog.LevelInfo, startupLogMessage, startupLogAttrs(Version().Version, mainThread.numThreads, mainThread.maxThreads, maxRequestsPerThread)...)
 
 		if EmbeddedAppPath != "" {
 			globalLogger.LogAttrs(globalCtx, slog.LevelInfo, "embedded PHP app 📦", slog.String("path", EmbeddedAppPath))

frankenphp.c

@@ -179,6 +179,7 @@ typedef struct frankenphp_version {
   unsigned long version_id;
 } frankenphp_version;
 frankenphp_version frankenphp_get_version();
+const char *frankenphp_get_frankenphp_version();
 
 typedef struct frankenphp_config {
   bool zts;

frankenphp.go

@@ -22,17 +22,16 @@ type WorkerOption func(*workerOpt) error
 type opt struct {
 	hotReloadOpt
 
-	ctx               context.Context
-	numThreads        int
-	maxThreads        int
-	workers           []workerOpt
-	logger            *slog.Logger
-	frankenPHPVersion string
-	metrics           Metrics
-	phpIni            map[string]string
-	maxWaitTime       time.Duration
-	maxIdleTime       time.Duration
-	maxRequests       int
+	ctx         context.Context
+	numThreads  int
+	maxThreads  int
+	workers     []workerOpt
+	logger      *slog.Logger
+	metrics     Metrics
+	phpIni      map[string]string
+	maxWaitTime time.Duration
+	maxIdleTime time.Duration
+	maxRequests int
 }
 
 type workerOpt struct {
@@ -142,15 +141,6 @@ func WithLogger(l *slog.Logger) Option {
 	}
 }
 
-// WithFrankenPHPVersion configures the FrankenPHP version exposed in startup logs.
-func WithFrankenPHPVersion(version string) Option {
-	return func(o *opt) error {
-		o.frankenPHPVersion = version
-
-		return nil
-	}
-}
-
 // WithPhpIni configures user defined PHP ini settings.
 func WithPhpIni(overrides map[string]string) Option {
 	return func(o *opt) error {

frankenphp.h

@@ -12,10 +12,10 @@ const (
 	startupLogAttrCapacity    = 5
 )
 
-func startupLogAttrs(frankenPHPVersion string, phpVersion string, numThreads int, maxThreads int, maxRequests int) []slog.Attr {
+func startupLogAttrs(phpVersion string, numThreads int, maxThreads int, maxRequests int) []slog.Attr {
 	attrs := make([]slog.Attr, 0, startupLogAttrCapacity)
-	if frankenPHPVersion != "" {
-		attrs = append(attrs, slog.String(startupLogAttrVersion, frankenPHPVersion))
+	if version := frankenPHPVersion(); version != "" {
+		attrs = append(attrs, slog.String(startupLogAttrVersion, version))
 	}
 
 	return append(attrs,

options.go

@@ -1,17 +1,26 @@
 package frankenphp
 
-import "testing"
+import (
+	"os"
+	"testing"
+)
 
-func TestStartupLogAttrsIncludeConfiguredFrankenPHPVersion(t *testing.T) {
+const startupLogTestExpectedVersionEnv = "FRANKENPHP_EXPECT_VERSION"
+
+func TestStartupLogAttrsIncludeFrankenPHPVersion(t *testing.T) {
 	const (
-		expectedFrankenPHPVersion = "1.12.4-test"
-		testPHPVersion            = "8.2.31"
-		testNumThreads            = 4
-		testMaxThreads            = 8
-		testMaxRequests           = 0
+		testPHPVersion  = "8.2.31"
+		testNumThreads  = 4
+		testMaxThreads  = 8
+		testMaxRequests = 0
 	)
 
-	attrs := startupLogAttrs(expectedFrankenPHPVersion, testPHPVersion, testNumThreads, testMaxThreads, testMaxRequests)
+	expectedFrankenPHPVersion := os.Getenv(startupLogTestExpectedVersionEnv)
+	if expectedFrankenPHPVersion == "" {
+		expectedFrankenPHPVersion = frankenPHPVersion()
+	}
+
+	attrs := startupLogAttrs(testPHPVersion, testNumThreads, testMaxThreads, testMaxRequests)
 	if len(attrs) == 0 {
 		t.Fatal("expected startup log attrs")
 	}