Merge branch 'dev' into dev

Author: rogeralsing

.github/workflows/checks.yml

@@ -1,8 +1,7 @@
 name: checks 
-on: [
-  pull_request,
-  workflow_dispatch,
-]
+on:
+  - pull_request
+  - workflow_dispatch
 env:
 
   TERM: xterm
@@ -14,25 +13,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_version: ['1.21']
+        go_version: ['1.23.8']
     # services:
     #   redis:
     #     image: redis:5.0-alpine
     #     ports: 
     #       - 6379:6379
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go_version }}
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          cache: true
       - name: start services
         run: docker compose up -d
       - name: run testcases

.github/workflows/github_sponsors.yml

@@ -8,17 +8,19 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Generate Sponsors 💖
         uses: JamesIves/[email protected]
         with:
           token: ${{ secrets.PAT }}
           file: "README.md"
 
-      - name: Deploy to GitHub Pages 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.1
+      - name: Commit updated README
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          branch: dev
-          folder: "."
+          commit_message: "docs: update sponsors list"
+          file_pattern: README.md

cluster/clusterproviders/automanaged/automanaged.go

@@ -12,39 +12,35 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/asynkron/protoactor-go/cluster"
-	"github.com/labstack/echo"
+	"github.com/labstack/echo/v4"
 	"golang.org/x/sync/errgroup"
 )
 
-// TODO: needs to be attached to the provider instance
-var (
-	clusterTTLErrorMutex       = new(sync.Mutex)
-	clusterMonitorErrorMutex   = new(sync.Mutex)
-	shutdownMutex              = new(sync.Mutex)
-	deregisteredMutex          = new(sync.Mutex)
-	activeProviderMutex        = new(sync.Mutex)
-	activeProviderRunningMutex = new(sync.Mutex)
-)
-
 type AutoManagedProvider struct {
-	deregistered          bool
-	shutdown              bool
-	activeProvider        *echo.Echo
-	activeProviderRunning bool
-	activeProviderTesting bool
-	httpClient            *http.Client
-	monitoringStatus      bool
-	clusterName           string
-	address               string
-	autoManagePort        int
-	memberPort            int
-	knownKinds            []string
-	knownNodes            []*NodeModel
-	hosts                 []string
-	refreshTTL            time.Duration
-	clusterTTLError       error
-	clusterMonitorError   error
-	cluster               *cluster.Cluster
+	deregistered               bool
+	shutdown                   bool
+	activeProvider             *echo.Echo
+	activeProviderRunning      bool
+	activeProviderTesting      bool
+	httpClient                 *http.Client
+	monitoringStatus           bool
+	clusterName                string
+	address                    string
+	autoManagePort             int
+	memberPort                 int
+	knownKinds                 []string
+	knownNodes                 []*NodeModel
+	hosts                      []string
+	refreshTTL                 time.Duration
+	clusterTTLError            error
+	clusterMonitorError        error
+	cluster                    *cluster.Cluster
+	clusterTTLErrorMutex       sync.Mutex
+	clusterMonitorErrorMutex   sync.Mutex
+	shutdownMutex              sync.Mutex
+	deregisteredMutex          sync.Mutex
+	activeProviderMutex        sync.Mutex
+	activeProviderRunningMutex sync.Mutex
 }
 
 // New creates a AutoManagedProvider that connects locally
@@ -131,17 +127,17 @@ func (p *AutoManagedProvider) StartClient(cluster *cluster.Cluster) error {
 
 // DeregisterMember set the shutdown to true preventing anymore TTL updates
 func (p *AutoManagedProvider) DeregisterMember() error {
-	deregisteredMutex.Lock()
-	defer deregisteredMutex.Unlock()
+	p.deregisteredMutex.Lock()
+	defer p.deregisteredMutex.Unlock()
 
 	p.deregistered = true
 	return nil
 }
 
 // Shutdown set the shutdown to true preventing anymore TTL updates
 func (p *AutoManagedProvider) Shutdown(graceful bool) error {
-	shutdownMutex.Lock()
-	defer shutdownMutex.Unlock()
+	p.shutdownMutex.Lock()
+	defer p.shutdownMutex.Unlock()
 
 	p.shutdown = true
 	p.activeProvider.Close()
@@ -150,9 +146,9 @@ func (p *AutoManagedProvider) Shutdown(graceful bool) error {
 
 // UpdateTTL sets up an endpoint to respond to other members
 func (p *AutoManagedProvider) UpdateTTL() {
-	activeProviderRunningMutex.Lock()
+	p.activeProviderRunningMutex.Lock()
 	running := p.activeProviderRunning
-	activeProviderRunningMutex.Unlock()
+	p.activeProviderRunningMutex.Unlock()
 
 	if (p.isShutdown() || p.isDeregistered()) && running {
 		p.activeProvider.Close()
@@ -174,16 +170,16 @@ func (p *AutoManagedProvider) UpdateTTL() {
 		})
 	}
 	go func() {
-		activeProviderRunningMutex.Lock()
+		p.activeProviderRunningMutex.Lock()
 		p.activeProviderRunning = true
-		activeProviderRunningMutex.Unlock()
+		p.activeProviderRunningMutex.Unlock()
 
 		appURI := fmt.Sprintf("0.0.0.0:%d", p.autoManagePort)
 		p.cluster.Logger().Error("Automanaged server stopping..!", slog.Any("error", p.activeProvider.Start(appURI)))
 
-		activeProviderRunningMutex.Lock()
+		p.activeProviderRunningMutex.Lock()
 		p.activeProviderRunning = false
-		activeProviderRunningMutex.Unlock()
+		p.activeProviderRunningMutex.Unlock()
 	}()
 }
 
@@ -202,10 +198,10 @@ func (p *AutoManagedProvider) monitorMemberStatusChanges() {
 // GetHealthStatus returns an error if the cluster health status has problems
 func (p *AutoManagedProvider) GetHealthStatus() error {
 	var err error
-	clusterTTLErrorMutex.Lock()
-	clusterMonitorErrorMutex.Lock()
-	defer clusterMonitorErrorMutex.Unlock()
-	defer clusterTTLErrorMutex.Unlock()
+	p.clusterTTLErrorMutex.Lock()
+	p.clusterMonitorErrorMutex.Lock()
+	defer p.clusterMonitorErrorMutex.Unlock()
+	defer p.clusterTTLErrorMutex.Unlock()
 
 	if p.clusterTTLError != nil {
 		err = fmt.Errorf("TTL: %s", p.clusterTTLError.Error())
@@ -228,8 +224,8 @@ func (p *AutoManagedProvider) GetHealthStatus() error {
 
 // monitorStatuses checks for node changes in the cluster
 func (p *AutoManagedProvider) monitorStatuses() {
-	clusterMonitorErrorMutex.Lock()
-	defer clusterMonitorErrorMutex.Unlock()
+	p.clusterMonitorErrorMutex.Lock()
+	defer p.clusterMonitorErrorMutex.Unlock()
 
 	autoManagedNodes, err := p.checkNodes()
 	if err != nil && len(autoManagedNodes) == 0 {
@@ -321,16 +317,16 @@ func (p *AutoManagedProvider) checkNodes() ([]*NodeModel, error) {
 }
 
 func (p *AutoManagedProvider) deregisterService() {
-	deregisteredMutex.Lock()
-	defer deregisteredMutex.Unlock()
+	p.deregisteredMutex.Lock()
+	defer p.deregisteredMutex.Unlock()
 
 	p.deregistered = true
 }
 
 func (p *AutoManagedProvider) startActiveProvider() {
-	activeProviderRunningMutex.Lock()
+	p.activeProviderRunningMutex.Lock()
 	running := p.activeProviderRunning
-	activeProviderRunningMutex.Unlock()
+	p.activeProviderRunningMutex.Unlock()
 
 	if !running {
 		if !p.activeProviderTesting {
@@ -344,15 +340,15 @@ func (p *AutoManagedProvider) startActiveProvider() {
 		appURI := fmt.Sprintf("0.0.0.0:%d", p.autoManagePort)
 
 		go func() {
-			activeProviderRunningMutex.Lock()
+			p.activeProviderRunningMutex.Lock()
 			p.activeProviderRunning = true
-			activeProviderRunningMutex.Unlock()
+			p.activeProviderRunningMutex.Unlock()
 			err := p.activeProvider.Start(appURI)
 			p.cluster.Logger().Error("Automanaged server stopping..!", slog.Any("error", err))
 
-			activeProviderRunningMutex.Lock()
+			p.activeProviderRunningMutex.Lock()
 			p.activeProviderRunning = false
-			activeProviderRunningMutex.Unlock()
+			p.activeProviderRunningMutex.Unlock()
 		}()
 	}
 }
@@ -362,20 +358,20 @@ func (p *AutoManagedProvider) stopActiveProvider() {
 }
 
 func (p *AutoManagedProvider) isShutdown() bool {
-	shutdownMutex.Lock()
-	defer shutdownMutex.Unlock()
+	p.shutdownMutex.Lock()
+	defer p.shutdownMutex.Unlock()
 	return p.shutdown
 }
 
 func (p *AutoManagedProvider) isDeregistered() bool {
-	deregisteredMutex.Lock()
-	defer deregisteredMutex.Unlock()
+	p.deregisteredMutex.Lock()
+	defer p.deregisteredMutex.Unlock()
 	return p.deregistered
 }
 
 func (p *AutoManagedProvider) isActiveProviderRunning() bool {
-	activeProviderRunningMutex.Lock()
-	defer activeProviderRunningMutex.Unlock()
+	p.activeProviderRunningMutex.Lock()
+	defer p.activeProviderRunningMutex.Unlock()
 	return p.activeProviderRunning
 }
 

cluster/clusterproviders/etcd/config.go

@@ -0,0 +1,39 @@
+package etcd
+
+import (
+	clientv3 "go.etcd.io/etcd/client/v3"
+)
+
+type RoleChangedListener interface {
+	OnRoleChanged(RoleType)
+}
+
+type Option func(*config)
+
+func WithBaseKey(baseKey string) Option {
+	return func(o *config) {
+		o.BaseKey = baseKey
+	}
+}
+
+func WithEtcdConfig(cfg clientv3.Config) Option {
+	return func(o *config) {
+		o.cfg = cfg
+	}
+}
+
+func WithRoleChangedListener(l RoleChangedListener) Option {
+	return func(o *config) {
+		o.RoleChanged = l
+	}
+}
+
+type config struct {
+	BaseKey     string
+	cfg         clientv3.Config
+	RoleChanged RoleChangedListener
+}
+
+func defaultConfig() *config {
+	return &config{}
+}