added group options

examples/dummy_executor.go

@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/scayle/goload"
+	"github.com/HenriBeck/goload"
 )
 
 type DummyExecutor struct {

examples/main.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/scayle/goload"
-	goload_http "github.com/scayle/goload/http"
-	"github.com/scayle/goload/http/url_builder"
-	"github.com/scayle/goload/pacer"
+	"github.com/HenriBeck/goload"
+	goload_http "github.com/HenriBeck/goload/http"
+	"github.com/HenriBeck/goload/http/url_builder"
+	"github.com/HenriBeck/goload/pacer"
 	"time"
 )
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/scayle/goload
+module github.com/HenriBeck/goload
 
 go 1.21
 

group.go

@@ -3,7 +3,6 @@ package goload
 import (
 	"context"
 	"github.com/mroth/weightedrand/v2"
-	"github.com/rs/zerolog/log"
 	"time"
 )
 
@@ -14,30 +13,6 @@ type executorGroup struct {
 	timeout time.Duration
 }
 
-// TODO: add options
-func NewGroup(name string, weight int, executors []Executor) Executor {
-	if len(executors) == 0 {
-		log.Fatal().Msg("group can't be empty")
-	}
-	choises := make([]weightedrand.Choice[Executor, int], 0, len(executors))
-	for _, exec := range executors {
-		choises = append(choises, weightedrand.NewChoice(exec, exec.Options().Weight))
-	}
-	chooser, err := weightedrand.NewChooser(
-		choises...,
-	)
-	if err != nil {
-		log.Fatal().Err(err).Msg("can't create chooser")
-	}
-
-	return &executorGroup{
-		name:    name,
-		chooser: chooser,
-		weight:  weight,
-		timeout: 0,
-	}
-}
-
 func (e *executorGroup) Execute(ctx context.Context) ExecutionResponse {
 	return e.chooser.Pick().Execute(ctx)
 }

group_options.go

@@ -0,0 +1,76 @@
+package goload
+
+import (
+	"github.com/mroth/weightedrand/v2"
+	"github.com/rs/zerolog/log"
+	"time"
+)
+
+type GroupOptions struct {
+	name      string
+	weight    int
+	timeout   time.Duration
+	executors []Executor
+}
+
+type GroupOption func(*GroupOptions)
+
+func WithGroup(opts ...GroupOption) Executor {
+	options := &GroupOptions{}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	if len(options.executors) == 0 {
+		log.Fatal().Msg("group can't be empty")
+	}
+	choises := make([]weightedrand.Choice[Executor, int], 0, len(options.executors))
+	for _, exec := range options.executors {
+		choises = append(choises, weightedrand.NewChoice(exec, exec.Options().Weight))
+	}
+	chooser, err := weightedrand.NewChooser(
+		choises...,
+	)
+	if err != nil {
+		log.Fatal().Err(err).Msg("can't create chooser")
+	}
+
+	if options.weight == 0 {
+		weightSum := 0
+		for _, exec := range options.executors {
+			weightSum += exec.Options().Weight
+		}
+		options.weight = weightSum
+	}
+
+	return &executorGroup{
+		name:    options.name,
+		chooser: chooser,
+		weight:  options.weight,
+		timeout: options.timeout,
+	}
+}
+
+func WithGroupWeight(weight int) GroupOption {
+	return func(options *GroupOptions) {
+		options.weight = weight
+	}
+}
+
+func WithGroupTimeout(timeout time.Duration) GroupOption {
+	return func(options *GroupOptions) {
+		options.timeout = timeout
+	}
+}
+
+func WithGroupExecutors(executors ...Executor) GroupOption {
+	return func(options *GroupOptions) {
+		options.executors = append(options.executors, executors...)
+	}
+}
+
+func WithGroupName(name string) GroupOption {
+	return func(options *GroupOptions) {
+		options.name = name
+	}
+}

http/http_endpoint.go

@@ -3,8 +3,8 @@ package goload_http
 import (
 	"context"
 	"fmt"
+	"github.com/HenriBeck/goload"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload"
 	"io"
 	"net/http"
 	"net/url"

http/options.go

@@ -2,8 +2,8 @@ package goload_http
 
 import (
 	"errors"
-	"github.com/scayle/goload"
-	"github.com/scayle/goload/http/url_builder"
+	"github.com/HenriBeck/goload"
+	"github.com/HenriBeck/goload/http/url_builder"
 	"io"
 	"net/http"
 	"net/url"

http/url_builder/query_param.go

@@ -1,9 +1,9 @@
 package url_builder
 
 import (
+	"github.com/HenriBeck/goload/utils/random"
 	"github.com/mroth/weightedrand/v2"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload/utils/random"
 	"net/url"
 )
 

http/url_builder/query_param_options.go

@@ -1,9 +1,9 @@
 package url_builder
 
 import (
+	"github.com/HenriBeck/goload/utils/random"
 	"github.com/mroth/weightedrand/v2"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload/utils/random"
 	"strconv"
 )
 

http/url_builder/url_builder.go

@@ -2,8 +2,8 @@ package url_builder
 
 import (
 	"fmt"
+	"github.com/HenriBeck/goload/utils/random"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload/utils/random"
 	"net/url"
 	"strings"
 )

loadtest.go

@@ -3,10 +3,10 @@ package goload
 import (
 	"context"
 	"fmt"
+	"github.com/HenriBeck/goload/pacer"
+	ctx_utils "github.com/HenriBeck/goload/utils/ctx"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload/pacer"
-	ctx_utils "github.com/scayle/goload/utils/ctx"
 	"math"
 	"os"
 	"time"

options.go

@@ -2,7 +2,7 @@ package goload
 
 import (
 	"context"
-	"github.com/scayle/goload/pacer"
+	"github.com/HenriBeck/goload/pacer"
 	"time"
 )
 

runner.go

@@ -2,9 +2,9 @@ package goload
 
 import (
 	"context"
+	"github.com/HenriBeck/goload/pacer"
 	"github.com/mroth/weightedrand/v2"
 	"github.com/rs/zerolog/log"
-	"github.com/scayle/goload/pacer"
 	"sync"
 	"time"
 )