[#180]: feature: remove semaphores, add go 1.23 support

Author: rustatian

.github/workflows/linters.yml

@@ -15,7 +15,7 @@ on:
       - "**.md"
 
 jobs:
-  golangci-lint:
+  linters:
     name: Golang-CI (lint)
     runs-on: ubuntu-latest
     steps:

dep/in_test.go

@@ -3,8 +3,6 @@ package dep
 import (
 	"reflect"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 type BarBaz interface {
@@ -17,5 +15,7 @@ func TestImplements(t *testing.T) {
 		println("foo")
 	}, (*BarBaz)(nil))
 
-	assert.Equal(t, reflect.Interface, in.Type.Kind())
+	if reflect.Interface != in.Type.Kind() {
+		t.Fail()
+	}
 }

dep/out_test.go

@@ -3,8 +3,6 @@ package dep
 import (
 	"reflect"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 type FooBar interface {
@@ -27,6 +25,11 @@ func TestOutType(t *testing.T) {
 	p := Plugin{}
 	tt := Bind((*FooBar)(nil), p.F)
 
-	assert.Equal(t, reflect.Interface, tt.Type.Kind())
-	assert.Equal(t, "F", tt.Method)
+	if reflect.Interface != tt.Type.Kind() {
+		t.Fail()
+	}
+
+	if tt.Method != "F" {
+		t.Fail()
+	}
 }

go.mod

@@ -4,14 +4,4 @@ go 1.23
 
 toolchain go1.23.0
 
-require (
-	github.com/roadrunner-server/errors v1.4.1
-	github.com/stretchr/testify v1.9.0
-	golang.org/x/sync v0.8.0
-)
-
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+require github.com/roadrunner-server/errors v1.4.1

go.sum

@@ -1,14 +1,2 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/roadrunner-server/errors v1.4.1 h1:LKNeaCGiwd3t8IaL840ZNF3UA9yDQlpvHnKddnh0YRQ=
 github.com/roadrunner-server/errors v1.4.1/go.mod h1:qeffnIKG0e4j1dzGpa+OGY5VKSfMphizvqWIw8s2lAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.work

@@ -2,5 +2,6 @@ go 1.23.0
 
 use (
 	.
+	./tests
 	./examples/sample_1
 )

go.work.sum

@@ -19,6 +19,7 @@ golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
 golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=

stop.go

@@ -7,8 +7,6 @@ import (
 	"reflect"
 	"sync"
 
-	"golang.org/x/sync/semaphore"
-
 	"github.com/roadrunner-server/errors"
 )
 
@@ -24,20 +22,23 @@ func (e *Endure) stop() error {
 
 	mu := new(sync.Mutex)
 	errs := make([]error, 0, 2)
-	sema := semaphore.NewWeighted(int64(len(vertices)))
+	wg := &sync.WaitGroup{}
+	wg.Add(len(vertices))
 
 	// reverse order
 	for i := len(vertices) - 1; i >= 0; i-- {
 		if !vertices[i].IsActive() {
+			wg.Done()
 			continue
 		}
 
 		if !reflect.TypeOf(vertices[i].Plugin()).Implements(reflect.TypeOf((*Service)(nil)).Elem()) {
+			wg.Done()
 			continue
 		}
 
-		_ = sema.Acquire(context.Background(), 1)
 		go func(i int) {
+			defer wg.Done()
 			stopMethod, _ := reflect.TypeOf(vertices[i].Plugin()).MethodByName(StopMethodName)
 
 			var inVals []reflect.Value
@@ -59,12 +60,11 @@ func (e *Endure) stop() error {
 				mu.Unlock()
 			}
 
-			sema.Release(1)
 			cancel()
 		}(i)
 	}
 
-	_ = sema.Acquire(context.Background(), int64(len(vertices)))
+	wg.Wait()
 
 	if len(errs) > 0 {
 		return stderr.Join(errs...)

tests/go.mod

@@ -0,0 +1,19 @@
+module github.com/roadrunner-server/endure/v2/tests
+
+go 1.23
+
+toolchain go1.23.0
+
+replace github.com/roadrunner-server/endure/v2 => ../
+
+require (
+	github.com/roadrunner-server/endure/v2 v2.0.0-00010101000000-000000000000
+	github.com/roadrunner-server/errors v1.4.1
+	github.com/stretchr/testify v1.9.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

tests/go.sum

@@ -0,0 +1,12 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/roadrunner-server/errors v1.4.1 h1:LKNeaCGiwd3t8IaL840ZNF3UA9yDQlpvHnKddnh0YRQ=
+github.com/roadrunner-server/errors v1.4.1/go.mod h1:qeffnIKG0e4j1dzGpa+OGY5VKSfMphizvqWIw8s2lAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=