feat: implement v2 interfaces across modules (v1.12.1)

examples/logger-reconfiguration/main.go

@@ -30,7 +30,7 @@ func main() {
 
 			// Create a new logger based on configuration settings
 			var handler slog.Handler
-			
+
 			// Configure handler based on log format
 			switch cfg.LogFormat {
 			case "json":
@@ -49,10 +49,10 @@ func main() {
 
 			// Create new logger with configuration-based settings
 			newLogger := slog.New(handler)
-			
+
 			// Replace the logger before modules initialize
 			app.SetLogger(newLogger)
-			
+
 			newLogger.Info("Logger reconfigured from configuration",
 				"format", cfg.LogFormat,
 				"level", cfg.LogLevel)
@@ -154,11 +154,11 @@ func (m *ServiceModule) Init(app modular.Application) error {
 	// This module also caches the logger
 	m.logger = app.Logger()
 	m.logger.Info("ServiceModule initialized", "module", m.Name(), "status", "ready")
-	
+
 	// Demonstrate that the logger has the correct configuration
-	m.logger.Debug("Service module debug information", 
+	m.logger.Debug("Service module debug information",
 		"feature", "logger_reconfiguration",
 		"working", true)
-	
+
 	return nil
 }

modules/auth/go.mod

@@ -3,7 +3,7 @@ module github.com/GoCodeAlone/modular/modules/auth
 go 1.26
 
 require (
-	github.com/GoCodeAlone/modular v1.12.0
+	github.com/GoCodeAlone/modular v1.12.1
 	github.com/cloudevents/sdk-go/v2 v2.16.2
 	github.com/cucumber/godog v0.15.1
 	github.com/golang-jwt/jwt/v5 v5.2.3

modules/auth/go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoCodeAlone/modular v1.12.0 h1:C4tLfJe65rrUQsbtndiVfldtT8IRKZcHczNRNbBK4wo=
-github.com/GoCodeAlone/modular v1.12.0/go.mod h1:ET7mlekRjkRq9mwJdWmaC2KDUWvjla2IqKVFrYO2JnY=
+github.com/GoCodeAlone/modular v1.12.1 h1:FEyAPr7vDp+qrSjgWEZI7sH+YUN4/o6R58XuzpCSXUU=
+github.com/GoCodeAlone/modular v1.12.1/go.mod h1:mKkOcJtHO/Xlkaeb7G6g0JgRYBwqTyAgQ9Vvs1NosNs=
 github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM=
 github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=

modules/cache/engine.go

@@ -97,4 +97,8 @@ type CacheEngine interface {
 	//
 	// The context can be used for operation timeouts.
 	DeleteMulti(ctx context.Context, keys []string) error
+
+	// Stats returns engine-specific metrics as key-value pairs.
+	// Used by the MetricsProvider interface to collect operational metrics.
+	Stats(ctx context.Context) map[string]float64
 }

modules/cache/go.mod

@@ -5,7 +5,7 @@ go 1.26
 toolchain go1.26.0
 
 require (
-	github.com/GoCodeAlone/modular v1.12.0
+	github.com/GoCodeAlone/modular v1.12.1
 	github.com/alicebob/miniredis/v2 v2.35.0
 	github.com/cloudevents/sdk-go/v2 v2.16.2
 	github.com/cucumber/godog v0.15.1

modules/cache/go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoCodeAlone/modular v1.12.0 h1:C4tLfJe65rrUQsbtndiVfldtT8IRKZcHczNRNbBK4wo=
-github.com/GoCodeAlone/modular v1.12.0/go.mod h1:ET7mlekRjkRq9mwJdWmaC2KDUWvjla2IqKVFrYO2JnY=
+github.com/GoCodeAlone/modular v1.12.1 h1:FEyAPr7vDp+qrSjgWEZI7sH+YUN4/o6R58XuzpCSXUU=
+github.com/GoCodeAlone/modular v1.12.1/go.mod h1:mKkOcJtHO/Xlkaeb7G6g0JgRYBwqTyAgQ9Vvs1NosNs=
 github.com/alicebob/miniredis/v2 v2.35.0 h1:QwLphYqCEAo1eu1TqPRN2jgVMPBweeQcR21jeqDCONI=
 github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=

modules/cache/memory.go

@@ -201,6 +201,18 @@ func (c *MemoryCache) DeleteMulti(ctx context.Context, keys []string) error {
 	return nil
 }
 
+// Stats returns memory cache metrics.
+func (c *MemoryCache) Stats(_ context.Context) map[string]float64 {
+	c.mutex.RLock()
+	count := float64(len(c.items))
+	maxItems := float64(c.config.MaxItems)
+	c.mutex.RUnlock()
+	return map[string]float64{
+		"item_count": count,
+		"max_items":  maxItems,
+	}
+}
+
 // startCleanupTimer starts the cleanup timer for expired items
 func (c *MemoryCache) startCleanupTimer(ctx context.Context) {
 	// Run cleanup immediately on start

modules/cache/module.go

@@ -102,6 +102,7 @@ const ServiceName = "cache.provider"
 type CacheModule struct {
 	name        string
 	config      *CacheConfig
+	configMu    sync.RWMutex // protects config field reads/writes during reload
 	logger      modular.Logger
 	cacheEngine CacheEngine
 	// subject is the observable subject used for event emission. It can be written
@@ -377,7 +378,9 @@ func (m *CacheModule) Get(ctx context.Context, key string) (interface{}, bool) {
 //	err := cache.Set(ctx, "session:abc", sessionData, time.Hour)
 func (m *CacheModule) Set(ctx context.Context, key string, value interface{}, ttl time.Duration) error {
 	if ttl == 0 {
+		m.configMu.RLock()
 		ttl = m.config.DefaultTTL
+		m.configMu.RUnlock()
 	}
 
 	if err := m.cacheEngine.Set(ctx, key, value, ttl); err != nil {
@@ -511,7 +514,9 @@ func (m *CacheModule) GetMulti(ctx context.Context, keys []string) (map[string]i
 //	err := cache.SetMulti(ctx, items, time.Minute*30)
 func (m *CacheModule) SetMulti(ctx context.Context, items map[string]interface{}, ttl time.Duration) error {
 	if ttl == 0 {
+		m.configMu.RLock()
 		ttl = m.config.DefaultTTL
+		m.configMu.RUnlock()
 	}
 	if err := m.cacheEngine.SetMulti(ctx, items, ttl); err != nil {
 		return fmt.Errorf("failed to set multiple cache items: %w", err)

modules/cache/redis.go

@@ -190,3 +190,19 @@ func (c *RedisCache) DeleteMulti(ctx context.Context, keys []string) error {
 	}
 	return nil
 }
+
+// Stats returns redis cache metrics using pool statistics (no network round-trip).
+func (c *RedisCache) Stats(_ context.Context) map[string]float64 {
+	if c.client == nil {
+		return map[string]float64{"connected": 0}
+	}
+	ps := c.client.PoolStats()
+	return map[string]float64{
+		"connected":   1,
+		"pool_hits":   float64(ps.Hits),
+		"pool_misses": float64(ps.Misses),
+		"total_conns": float64(ps.TotalConns),
+		"idle_conns":  float64(ps.IdleConns),
+		"stale_conns": float64(ps.StaleConns),
+	}
+}

modules/cache/v2_interfaces.go

@@ -0,0 +1,71 @@
+package cache
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/GoCodeAlone/modular"
+)
+
+// Compile-time interface checks.
+var (
+	_ modular.MetricsProvider = (*CacheModule)(nil)
+	_ modular.Reloadable      = (*CacheModule)(nil)
+)
+
+// CollectMetrics implements modular.MetricsProvider.
+// It delegates to the underlying CacheEngine's Stats method.
+// Safe to call before Init (returns empty metrics when engine is nil).
+func (m *CacheModule) CollectMetrics(ctx context.Context) modular.ModuleMetrics {
+	if m.cacheEngine == nil {
+		return modular.ModuleMetrics{Name: m.name, Values: map[string]float64{}}
+	}
+	return modular.ModuleMetrics{
+		Name:   m.name,
+		Values: m.cacheEngine.Stats(ctx),
+	}
+}
+
+// CanReload implements modular.Reloadable.
+func (m *CacheModule) CanReload() bool {
+	return true
+}
+
+// ReloadTimeout implements modular.Reloadable.
+func (m *CacheModule) ReloadTimeout() time.Duration {
+	return 5 * time.Second
+}
+
+// Reload implements modular.Reloadable.
+// It applies configuration changes for DefaultTTL and MaxItems.
+// CleanupInterval is not reloadable since the cleanup ticker is already running.
+// Config writes are protected by configMu (and the engine's mutex for MaxItems)
+// to avoid data races with concurrent reads.
+func (m *CacheModule) Reload(_ context.Context, changes []modular.ConfigChange) error {
+	for _, ch := range changes {
+		switch ch.FieldPath {
+		case "defaultTTL":
+			if d, err := time.ParseDuration(ch.NewValue); err == nil {
+				m.configMu.Lock()
+				m.config.DefaultTTL = d
+				m.configMu.Unlock()
+			}
+		case "maxItems":
+			var n int
+			if _, err := fmt.Sscan(ch.NewValue, &n); err == nil && n > 0 {
+				m.configMu.Lock()
+				// MemoryCache reads MaxItems under its own mutex, so lock both.
+				if mc, ok := m.cacheEngine.(*MemoryCache); ok {
+					mc.mutex.Lock()
+					m.config.MaxItems = n
+					mc.mutex.Unlock()
+				} else {
+					m.config.MaxItems = n
+				}
+				m.configMu.Unlock()
+			}
+		}
+	}
+	return nil
+}

modules/cache/v2_interfaces_test.go

@@ -0,0 +1,73 @@
+package cache
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/GoCodeAlone/modular"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// newTestCacheModule creates a CacheModule initialised with a memory engine for testing.
+func newTestCacheModule(t *testing.T) (*CacheModule, context.Context) {
+	t.Helper()
+	module := NewModule().(*CacheModule)
+	app := newMockApp()
+
+	// Pre-register config with explicit values so struct-tag defaults are not needed.
+	cfg := &CacheConfig{
+		Engine:          "memory",
+		DefaultTTL:      300 * time.Second,
+		CleanupInterval: 60 * time.Second,
+		MaxItems:        10000,
+	}
+	app.RegisterConfigSection(module.Name(), modular.NewStdConfigProvider(cfg))
+
+	require.NoError(t, module.RegisterConfig(app)) // skips (already registered)
+	require.NoError(t, module.Init(app))
+
+	ctx := context.Background()
+	require.NoError(t, module.Start(ctx))
+	t.Cleanup(func() { _ = module.Stop(ctx) })
+
+	return module, ctx
+}
+
+func TestCacheModule_CollectMetrics(t *testing.T) {
+	t.Parallel()
+
+	module, ctx := newTestCacheModule(t)
+
+	// Add some items
+	require.NoError(t, module.Set(ctx, "key1", "val1", time.Minute))
+	require.NoError(t, module.Set(ctx, "key2", "val2", time.Minute))
+	require.NoError(t, module.Set(ctx, "key3", "val3", time.Minute))
+
+	metrics := module.CollectMetrics(ctx)
+	assert.Equal(t, "cache", metrics.Name)
+	assert.Equal(t, 3.0, metrics.Values["item_count"])
+	assert.Equal(t, 10000.0, metrics.Values["max_items"])
+}
+
+func TestCacheModule_Reloadable(t *testing.T) {
+	t.Parallel()
+
+	module, ctx := newTestCacheModule(t)
+
+	// Verify interface compliance
+	var reloadable modular.Reloadable = module
+	assert.True(t, reloadable.CanReload())
+	assert.Equal(t, 5*time.Second, reloadable.ReloadTimeout())
+
+	// Verify reload updates config (cleanupInterval is not reloadable)
+	changes := []modular.ConfigChange{
+		{FieldPath: "defaultTTL", NewValue: "600s"},
+		{FieldPath: "maxItems", NewValue: "5000"},
+	}
+	require.NoError(t, reloadable.Reload(ctx, changes))
+
+	assert.Equal(t, 600*time.Second, module.config.DefaultTTL)
+	assert.Equal(t, 5000, module.config.MaxItems)
+}

modules/chimux/go.mod

@@ -3,7 +3,7 @@ module github.com/GoCodeAlone/modular/modules/chimux
 go 1.26
 
 require (
-	github.com/GoCodeAlone/modular v1.12.0
+	github.com/GoCodeAlone/modular v1.12.1
 	github.com/cloudevents/sdk-go/v2 v2.16.2
 	github.com/cucumber/godog v0.15.1
 	github.com/go-chi/chi/v5 v5.2.2

modules/chimux/go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoCodeAlone/modular v1.12.0 h1:C4tLfJe65rrUQsbtndiVfldtT8IRKZcHczNRNbBK4wo=
-github.com/GoCodeAlone/modular v1.12.0/go.mod h1:ET7mlekRjkRq9mwJdWmaC2KDUWvjla2IqKVFrYO2JnY=
+github.com/GoCodeAlone/modular v1.12.1 h1:FEyAPr7vDp+qrSjgWEZI7sH+YUN4/o6R58XuzpCSXUU=
+github.com/GoCodeAlone/modular v1.12.1/go.mod h1:mKkOcJtHO/Xlkaeb7G6g0JgRYBwqTyAgQ9Vvs1NosNs=
 github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM=
 github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=

modules/configwatcher/go.mod

@@ -3,7 +3,7 @@ module github.com/GoCodeAlone/modular/modules/configwatcher
 go 1.26
 
 require (
-	github.com/GoCodeAlone/modular v1.12.0
+	github.com/GoCodeAlone/modular v1.12.1
 	github.com/fsnotify/fsnotify v1.9.0
 )
 
@@ -17,6 +17,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

modules/configwatcher/go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoCodeAlone/modular v1.12.0 h1:C4tLfJe65rrUQsbtndiVfldtT8IRKZcHczNRNbBK4wo=
-github.com/GoCodeAlone/modular v1.12.0/go.mod h1:ET7mlekRjkRq9mwJdWmaC2KDUWvjla2IqKVFrYO2JnY=
+github.com/GoCodeAlone/modular v1.12.1 h1:FEyAPr7vDp+qrSjgWEZI7sH+YUN4/o6R58XuzpCSXUU=
+github.com/GoCodeAlone/modular v1.12.1/go.mod h1:mKkOcJtHO/Xlkaeb7G6g0JgRYBwqTyAgQ9Vvs1NosNs=
 github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM=
 github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -74,8 +74,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

modules/database/go.mod

@@ -3,7 +3,7 @@ module github.com/GoCodeAlone/modular/modules/database/v2
 go 1.26
 
 require (
-	github.com/GoCodeAlone/modular v1.12.0
+	github.com/GoCodeAlone/modular v1.12.1
 	github.com/aws/aws-sdk-go-v2/config v1.31.0
 	github.com/cloudevents/sdk-go/v2 v2.16.2
 	github.com/cucumber/godog v0.15.1

modules/database/go.sum

@@ -5,8 +5,8 @@ filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoCodeAlone/modular v1.12.0 h1:C4tLfJe65rrUQsbtndiVfldtT8IRKZcHczNRNbBK4wo=
-github.com/GoCodeAlone/modular v1.12.0/go.mod h1:ET7mlekRjkRq9mwJdWmaC2KDUWvjla2IqKVFrYO2JnY=
+github.com/GoCodeAlone/modular v1.12.1 h1:FEyAPr7vDp+qrSjgWEZI7sH+YUN4/o6R58XuzpCSXUU=
+github.com/GoCodeAlone/modular v1.12.1/go.mod h1:mKkOcJtHO/Xlkaeb7G6g0JgRYBwqTyAgQ9Vvs1NosNs=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk=

modules/database/module.go

@@ -406,6 +406,7 @@ func (l *lazyDefaultService) SetEventEmitter(emitter EventEmitter) {
 type Module struct {
 	config      *Config
 	connections map[string]*sql.DB
+	connMu      sync.RWMutex // Protects connections map
 	services    map[string]DatabaseService
 	subject     modular.Subject // For event observation
 	subjectMu   sync.RWMutex    // Protects subject field from race conditions