Merge pull request #56 from aykhans/bump/version

Bump version to 0.5.3
2025-07-01 07:57:48 +00:00 · 2024-12-18 00:15:42 +04:00 · 2024-12-18 00:15:31 +04:00 · 2024-12-17 23:22:30 +04:00 · 2024-12-17 23:07:25 +04:00 · 2024-12-17 17:51:29 +04:00
17 changed files with 390 additions and 215 deletions
--- a/.github/workflows/publish-docker-image.yml
+++ b/.github/workflows/publish-docker-image.yml
@ -0,0 +1,86 @@
+name: publish-docker-image
+
+on:
+  push:
+    tags:
+      # Match stable and pre versions, such as 'v1.0.0', 'v0.23.0-a', 'v0.23.0-a.2', 'v0.23.0-b', 'v0.23.0-b.3'
+      - "v*.*.*"
+      - "v*.*.*-a"
+      - "v*.*.*-a.*"
+      - "v*.*.*-b"
+      - "v*.*.*-b.*"
+
+jobs:
+  build-and-push-stable-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Extract build args
+        # Extract version number and check if it's an pre version
+        run: |
+          if [[ "${GITHUB_REF_NAME}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+              echo "PRE_RELEASE=false" >> $GITHUB_ENV
+          else
+              echo "PRE_RELEASE=true" >> $GITHUB_ENV
+          fi
+          echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: aykhans
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+          version: v0.9.1
+
+      # Metadata for stable versions
+      - name: Docker meta for stable
+        id: meta-stable
+        if: env.PRE_RELEASE == 'false'
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            aykhans/dodo
+          tags: |
+            type=semver,pattern={{version}},value=${{ env.VERSION }}
+            type=raw,value=stable
+          flavor: |
+            latest=true
+          labels: |
+            org.opencontainers.image.version=${{ env.VERSION }}
+
+      # Metadata for pre versions
+      - name: Docker meta for pre
+        id: meta-pre
+        if: env.PRE_RELEASE == 'true'
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            aykhans/dodo
+          tags: |
+            type=raw,value=${{ env.VERSION }}
+          labels: |
+            org.opencontainers.image.version=${{ env.VERSION }}
+
+      - name: Build and Push
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta-stable.outputs.tags || steps.meta-pre.outputs.tags }}
+          labels: ${{ steps.meta-stable.outputs.labels || steps.meta-pre.outputs.labels }}
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine AS builder
+FROM golang:1.23.2-alpine AS builder

 WORKDIR /dodo

--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 <h1 align="center">Dodo is a simple and easy-to-use HTTP benchmarking tool.</h1>
 <p align="center">
-<img width="30%" height="30%" src="https://raw.githubusercontent.com/aykhans/dodo/main/assets/dodo.png">
+<img width="30%" height="30%" src="https://ftp.aykhans.me/web/client/pubshares/hB6VSdCnBCr8gFPeiMuCji/browse?path=%2Fdodo.png">
 </p>

 ## Installation
@ -49,7 +49,7 @@ dodo -u https://example.com -m GET -d 10 -r 1000 -t 2000
 ```
 With Docker:
 ```sh
-docker run --rm aykhans/dodo -u https://example.com -m GET -d 10 -r 1000 -t 2000
+docker run --rm -i aykhans/dodo -u https://example.com -m GET -d 10 -r 1000 -t 2000
 ```

 ### 2. JSON config file
@ -85,7 +85,7 @@ dodo -c /path/config.json
 ```
 With Docker:
 ```sh
-docker run --rm -v ./path/config.json:/dodo/config.json -i aykhans/dodo
+docker run --rm -i -v ./path/config.json:/dodo/config.json aykhans/dodo
 ```

 ### 3. Both (CLI & JSON)
@ -96,7 +96,7 @@ dodo -c /path/config.json -u https://example.com -m GET -d 10 -r 1000 -t 2000
 ```
 With Docker:
 ```sh
-docker run --rm -v ./path/config.json:/dodo/config.json -i aykhans/dodo -u https://example.com -m GET -d 10 -r 1000 -t 2000
+docker run --rm -i -v ./path/config.json:/dodo/config.json aykhans/dodo -u https://example.com -m GET -d 10 -r 1000 -t 2000
 ```

 ## CLI and JSON Config Parameters
--- a/assets/dodo.png
+++ b/assets/dodo.png
--- a/config/config.go
+++ b/config/config.go
@ -6,12 +6,13 @@ import (
 	"os"
 	"time"

+	. "github.com/aykhans/dodo/types"
 	"github.com/aykhans/dodo/utils"
 	"github.com/jedib0t/go-pretty/v6/table"
 )

 const (
-	VERSION                 string = "0.5.2"
+	VERSION                 string = "0.5.3"
 	DefaultUserAgent        string = "Dodo/" + VERSION
 	ProxyCheckURL           string = "https://www.google.com"
 	DefaultMethod           string = "GET"
@ -21,10 +22,6 @@ const (
 	MaxDodosCountForProxies uint   = 20 // Max dodos count for proxy check
 )

-type IConfig interface {
-	MergeConfigs(newConfig IConfig) IConfig
-}
-
 type RequestConfig struct {
 	Method       string
 	URL          *url.URL
@ -48,6 +45,12 @@ func (config *RequestConfig) Print() {
 		{Number: 2, WidthMax: 50},
 	})

+	newHeaders := make(map[string][]string)
+	newHeaders["User-Agent"] = []string{DefaultUserAgent}
+	for k, v := range config.Headers {
+		newHeaders[k] = v
+	}
+
 	t.AppendHeader(table.Row{"Request Configuration"})
 	t.AppendRow(table.Row{"Method", config.Method})
 	t.AppendSeparator()
@ -57,11 +60,11 @@ func (config *RequestConfig) Print() {
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Dodos", config.DodosCount})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Request", config.RequestCount})
+	t.AppendRow(table.Row{"Requests", config.RequestCount})
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Params", utils.MarshalJSON(config.Params, 3)})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Headers", utils.MarshalJSON(config.Headers, 3)})
+	t.AppendRow(table.Row{"Headers", utils.MarshalJSON(newHeaders, 3)})
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Cookies", utils.MarshalJSON(config.Cookies, 3)})
 	t.AppendSeparator()
@ -95,7 +98,27 @@ type Config struct {
 	Timeout      uint32       `json:"timeout" validate:"gte=1,lte=100000"`
 	DodosCount   uint         `json:"dodos_count" validate:"gte=1"`
 	RequestCount uint         `json:"request_count" validation_name:"request-count" validate:"gte=1"`
-	NoProxyCheck utils.Option[bool] `json:"no_proxy_check"`
+	NoProxyCheck Option[bool] `json:"no_proxy_check"`
+}
+
+func NewConfig(
+	method string,
+	timeout uint32,
+	dodosCount uint,
+	requestCount uint,
+	noProxyCheck Option[bool],
+) *Config {
+	if noProxyCheck == nil {
+		noProxyCheck = NewNoneOption[bool]()
+	}
+
+	return &Config{
+		Method:       method,
+		Timeout:      timeout,
+		DodosCount:   dodosCount,
+		RequestCount: requestCount,
+		NoProxyCheck: noProxyCheck,
+	}
 }

 func (config *Config) MergeConfigs(newConfig *Config) {
@ -133,7 +156,7 @@ func (config *Config) SetDefaults() {
 		config.RequestCount = DefaultRequestCount
 	}
 	if config.NoProxyCheck.IsNone() {
-		config.NoProxyCheck = utils.NewOption(false)
+		config.NoProxyCheck = NewOption(false)
 	}
 }

@ -144,7 +167,7 @@ type Proxy struct {
 }

 type JSONConfig struct {
-	Config
+	*Config
 	Params  map[string][]string `json:"params"`
 	Headers map[string][]string `json:"headers"`
 	Cookies map[string][]string `json:"cookies"`
@ -152,8 +175,21 @@ type JSONConfig struct {
 	Body    []string            `json:"body"`
 }

+func NewJSONConfig(
+	config *Config,
+	params map[string][]string,
+	headers map[string][]string,
+	cookies map[string][]string,
+	proxies []Proxy,
+	body []string,
+) *JSONConfig {
+	return &JSONConfig{
+		config, params, headers, cookies, proxies, body,
+	}
+}
+
 func (config *JSONConfig) MergeConfigs(newConfig *JSONConfig) {
-	config.Config.MergeConfigs(&newConfig.Config)
+	config.Config.MergeConfigs(newConfig.Config)
 	if len(newConfig.Params) != 0 {
 		config.Params = newConfig.Params
 	}
@ -172,13 +208,23 @@ func (config *JSONConfig) MergeConfigs(newConfig *JSONConfig) {
 }

 type CLIConfig struct {
-	Config
+	*Config
 	Yes        bool   `json:"yes" validate:"omitempty"`
 	ConfigFile string `validation_name:"config-file" validate:"omitempty,filepath"`
 }

+func NewCLIConfig(
+	config *Config,
+	yes bool,
+	configFile string,
+) *CLIConfig {
+	return &CLIConfig{
+		config, yes, configFile,
+	}
+}
+
 func (config *CLIConfig) MergeConfigs(newConfig *CLIConfig) {
-	config.Config.MergeConfigs(&newConfig.Config)
+	config.Config.MergeConfigs(newConfig.Config)
 	if newConfig.ConfigFile != "" {
 		config.ConfigFile = newConfig.ConfigFile
 	}
--- a/go.mod
+++ b/go.mod
@ -1,14 +1,14 @@
 module github.com/aykhans/dodo

-go 1.22.6
+go 1.23.2

 require (
 	github.com/go-playground/validator/v10 v10.23.0
-	github.com/jedib0t/go-pretty/v6 v6.6.2
+	github.com/jedib0t/go-pretty/v6 v6.6.5
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
-	github.com/valyala/fasthttp v1.57.0
-	golang.org/x/net v0.31.0
+	github.com/valyala/fasthttp v1.58.0
+	golang.org/x/net v0.32.0
 )

 require (
@ -22,8 +22,8 @@ require (
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/term v0.26.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -15,8 +15,8 @@ github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL
 github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jedib0t/go-pretty/v6 v6.6.2 h1:27bLj3nRODzaiA7tPIxy9UVWHoPspFfME9XxgwiiNsM=
-github.com/jedib0t/go-pretty/v6 v6.6.2/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
+github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3NgSqAo=
+github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@ -37,20 +37,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.57.0 h1:Xw8SjWGEP/+wAAgyy5XTvgrWlOD1+TxbbvNADYCm1Tg=
-github.com/valyala/fasthttp v1.57.0/go.mod h1:h6ZBaPRlzpZ6O3H5t2gEk1Qi33+TmLvfwgLLp0t9CpE=
+github.com/valyala/fasthttp v1.58.0 h1:GGB2dWxSbEprU9j0iMJHgdKYJVDyjrOwF9RE59PbRuE=
+github.com/valyala/fasthttp v1.58.0/go.mod h1:SYXvHHaFp7QZHGKSHmoMipInhrI5StHrhDTYVEjK/Kw=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 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=
--- a/main.go
+++ b/main.go
@ -21,8 +21,10 @@ import (

 func main() {
 	validator := validation.NewValidator()
-	conf := config.Config{}
-	jsonConf := config.JSONConfig{}
+	conf := config.NewConfig("", 0, 0, 0, nil)
+	jsonConf := config.NewJSONConfig(
+		config.NewConfig("", 0, 0, 0, nil), nil, nil, nil, nil, nil,
+	)

 	cliConf, err := readers.CLIConfigReader()
 	if err != nil || cliConf == nil {
@ -51,11 +53,11 @@ func main() {
 				),
 			)
 		}
-		jsonConf = *jsonConfNew
-		conf.MergeConfigs(&jsonConf.Config)
+		jsonConf = jsonConfNew
+		conf.MergeConfigs(jsonConf.Config)
 	}

-	conf.MergeConfigs(&cliConf.Config)
+	conf.MergeConfigs(cliConf.Config)
 	conf.SetDefaults()
 	if err := validator.Struct(conf); err != nil {
 		utils.PrintErrAndExit(
@ -81,7 +83,7 @@ func main() {
 		Proxies:      jsonConf.Proxies,
 		Body:         jsonConf.Body,
 		Yes:          cliConf.Yes,
-		NoProxyCheck: *conf.NoProxyCheck.ValueOrPanic(),
+		NoProxyCheck: conf.NoProxyCheck.ValueOrPanic(),
 	}
 	requestConf.Print()
 	if !cliConf.Yes {
--- a/readers/cli.go
+++ b/readers/cli.go
@ -5,6 +5,7 @@ import (

 	"github.com/aykhans/dodo/config"
 	"github.com/aykhans/dodo/custom_errors"
+	. "github.com/aykhans/dodo/types"
 	"github.com/aykhans/dodo/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@ -13,11 +14,7 @@ import (
 func CLIConfigReader() (*config.CLIConfig, error) {
 	var (
 		returnNil    = false
-		cliConfig = &config.CLIConfig{
-			Config: config.Config{
-				NoProxyCheck: utils.NewNoneOption[bool](),
-			},
-		}
+		cliConfig    = config.NewCLIConfig(config.NewConfig("", 0, 0, 0, nil), false, "")
 		dodosCount   uint
 		requestCount uint
 		timeout      uint32
@ -65,7 +62,7 @@ func CLIConfigReader() (*config.CLIConfig, error) {
 		case "timeout":
 			cliConfig.Timeout = timeout
 		case "no-proxy-check":
-			cliConfig.NoProxyCheck = utils.NewOption(noProxyCheck)
+			cliConfig.NoProxyCheck = NewOption(noProxyCheck)
 		}
 	})
 	if returnNil {
--- a/readers/json.go
+++ b/readers/json.go
@ -6,7 +6,6 @@ import (

 	"github.com/aykhans/dodo/config"
 	customerrors "github.com/aykhans/dodo/custom_errors"
-	"github.com/aykhans/dodo/utils"
 )

 func JSONConfigReader(filePath string) (*config.JSONConfig, error) {
@ -14,11 +13,10 @@ func JSONConfigReader(filePath string) (*config.JSONConfig, error) {
 	if err != nil {
 		return nil, customerrors.OSErrorFormater(err)
 	}
-	jsonConf := &config.JSONConfig{
-		Config: config.Config{
-			NoProxyCheck: utils.NewNoneOption[bool](),
-		},
-	}
+	jsonConf := config.NewJSONConfig(
+		config.NewConfig("", 0, 0, 0, nil),
+		nil, nil, nil, nil, nil,
+	)
 	err = json.Unmarshal(data, &jsonConf)

 	if err != nil {
--- a/requests/response.go
+++ b/requests/response.go
@ -1,85 +1,106 @@
 package requests

 import (
-	"fmt"
 	"os"
 	"time"

-	"github.com/aykhans/dodo/utils"
+	. "github.com/aykhans/dodo/types"
 	"github.com/jedib0t/go-pretty/v6/table"
 )

 type Response struct {
-	StatusCode int
-	Error      error
+	Response string
 	Time     time.Duration
 }

 type Responses []*Response

 // Print prints the responses in a tabular format, including information such as
-// response count, minimum time, maximum time, and average time.
+// response count, minimum time, maximum time, average time, and latency percentiles.
 func (respones Responses) Print() {
-	var (
-		totalMinDuration time.Duration = respones[0].Time
-		totalMaxDuration time.Duration = respones[0].Time
-		totalDuration    time.Duration
-		totalCount       int = len(respones)
-	)
-	mergedResponses := make(map[string][]time.Duration)
+	total := struct {
+		Count int
+		Min   time.Duration
+		Max   time.Duration
+		Sum   time.Duration
+		P90   time.Duration
+		P95   time.Duration
+		P99   time.Duration
+	}{
+		Count: len(respones),
+		Min:   respones[0].Time,
+		Max:   respones[0].Time,
+	}
+	mergedResponses := make(map[string]Durations)
+	var allDurations Durations

 	for _, response := range respones {
-		if response.Time < totalMinDuration {
-			totalMinDuration = response.Time
+		if response.Time < total.Min {
+			total.Min = response.Time
 		}
-		if response.Time > totalMaxDuration {
-			totalMaxDuration = response.Time
+		if response.Time > total.Max {
+			total.Max = response.Time
 		}
-		totalDuration += response.Time
+		total.Sum += response.Time

-		if response.Error != nil {
-			mergedResponses[response.Error.Error()] = append(
-				mergedResponses[response.Error.Error()],
-				response.Time,
-			)
-		} else {
-			mergedResponses[fmt.Sprintf("%d", response.StatusCode)] = append(
-				mergedResponses[fmt.Sprintf("%d", response.StatusCode)],
+		mergedResponses[response.Response] = append(
+			mergedResponses[response.Response],
 			response.Time,
 		)
+		allDurations = append(allDurations, response.Time)
 	}
-	}
+	allDurations.Sort()
+	allDurationsLenAsFloat := float64(len(allDurations) - 1)
+	total.P90 = allDurations[int(0.90*allDurationsLenAsFloat)]
+	total.P95 = allDurations[int(0.95*allDurationsLenAsFloat)]
+	total.P99 = allDurations[int(0.99*allDurationsLenAsFloat)]

 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
 	t.SetStyle(table.StyleLight)
 	t.SetColumnConfigs([]table.ColumnConfig{
-		{Number: 1, WidthMax: 80},
+		{Number: 1, WidthMax: 40},
 	})
-
 	t.AppendHeader(table.Row{
 		"Response",
 		"Count",
 		"Min Time",
 		"Max Time",
 		"Average Time",
+		"P90",
+		"P95",
+		"P99",
 	})
+
 	for key, durations := range mergedResponses {
+		durations.Sort()
+		durationsLen := len(durations)
+		durationsLenAsFloat := float64(durationsLen - 1)
+
 		t.AppendRow(table.Row{
 			key,
-			len(durations),
-			utils.MinDuration(durations...),
-			utils.MaxDuration(durations...),
-			utils.AvgDuration(durations...),
+			durationsLen,
+			durations.First(),
+			durations.Last(),
+			durations.Avg(),
+			durations[int(0.90*durationsLenAsFloat)],
+			durations[int(0.95*durationsLenAsFloat)],
+			durations[int(0.99*durationsLenAsFloat)],
 		})
 		t.AppendSeparator()
 	}
+
+	if len(mergedResponses) > 1 {
 		t.AppendRow(table.Row{
 			"Total",
-		totalCount,
-		totalMinDuration,
-		totalMaxDuration,
-		totalDuration / time.Duration(totalCount),
+			total.Count,
+			total.Min,
+			total.Max,
+			total.Sum / time.Duration(total.Count), // Average
+			total.P90,
+			total.P95,
+			total.P99,
 		})
+	}
 	t.Render()
 }
--- a/requests/run.go
+++ b/requests/run.go
@ -2,6 +2,7 @@ package requests

 import (
 	"context"
+	"strconv"
 	"sync"
 	"time"

@ -142,8 +143,7 @@ func sendRequest(
 					return
 				}
 				*responseData = append(*responseData, &Response{
-					StatusCode: 0,
-					Error:      err,
+					Response: err.Error(),
 					Time:     completedTime,
 				})
 				increase <- 1
@ -151,8 +151,7 @@ func sendRequest(
 			}

 			*responseData = append(*responseData, &Response{
-				StatusCode: response.StatusCode(),
-				Error:      nil,
+				Response: strconv.Itoa(response.StatusCode()),
 				Time:     completedTime,
 			})
 			increase <- 1
--- a/types/durations.go
+++ b/types/durations.go
@ -0,0 +1,41 @@
+package types
+
+import (
+	"sort"
+	"time"
+)
+
+type Durations []time.Duration
+
+func (d Durations) Sort(ascending ...bool) {
+	// If ascending is provided and is false, sort in descending order
+	if len(ascending) > 0 && ascending[0] == false {
+		sort.Slice(d, func(i, j int) bool {
+			return d[i] > d[j]
+		})
+	} else { // Otherwise, sort in ascending order
+		sort.Slice(d, func(i, j int) bool {
+			return d[i] < d[j]
+		})
+	}
+}
+
+func (d Durations) First() *time.Duration {
+	return &d[0]
+}
+
+func (d Durations) Last() *time.Duration {
+	return &d[len(d)-1]
+}
+
+func (d Durations) Sum() time.Duration {
+	sum := time.Duration(0)
+	for _, duration := range d {
+		sum += duration
+	}
+	return sum
+}
+
+func (d Durations) Avg() time.Duration {
+	return d.Sum() / time.Duration(len(d))
+}
--- a/types/option.go
+++ b/types/option.go
@ -0,0 +1,87 @@
+package types
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+type NonNilT interface {
+	~int | ~float64 | ~string | ~bool
+}
+
+type Option[T NonNilT] interface {
+	IsNone() bool
+	ValueOrErr() (T, error)
+	ValueOr(def T) T
+	ValueOrPanic() T
+	UnmarshalJSON(data []byte) error
+}
+
+// Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead.
+type option[T NonNilT] struct {
+	// value holds the actual value of the Option if it is not None.
+	value T
+	// none indicates whether the Option is None (i.e., has no value).
+	none bool
+}
+
+func (o *option[T]) IsNone() bool {
+	return o.none
+}
+
+// If the Option is None, it will return zero value of the type and an error.
+func (o *option[T]) ValueOrErr() (T, error) {
+	if o.IsNone() {
+		return o.value, errors.New("Option is None")
+	}
+	return o.value, nil
+}
+
+// If the Option is None, it will return the default value.
+func (o *option[T]) ValueOr(def T) T {
+	if o.IsNone() {
+		return def
+	}
+	return o.value
+}
+
+// If the Option is None, it will panic.
+func (o *option[T]) ValueOrPanic() T {
+	if o.IsNone() {
+		panic("Option is None")
+	}
+	return o.value
+}
+
+func (o *option[T]) SetValue(value T) {
+	o.value = value
+	o.none = false
+}
+
+func (o *option[T]) SetNone() {
+	var zeroValue T
+	o.value = zeroValue
+	o.none = true
+}
+
+func (o *option[T]) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" || len(data) == 0 {
+		o.SetNone()
+		return nil
+	}
+
+	if err := json.Unmarshal(data, &o.value); err != nil {
+		o.SetNone()
+		return err
+	}
+	o.none = false
+	return nil
+}
+
+func NewOption[T NonNilT](value T) *option[T] {
+	return &option[T]{value: value}
+}
+
+func NewNoneOption[T NonNilT]() *option[T] {
+	return &option[T]{none: true}
+}
--- a/utils/time.go
+++ b/utils/time.go
@ -1,31 +0,0 @@
-package utils
-
-import "time"
-
-func MinDuration(durations ...time.Duration) time.Duration {
-	min := durations[0]
-	for _, d := range durations {
-		if d < min {
-			min = d
-		}
-	}
-	return min
-}
-
-func MaxDuration(durations ...time.Duration) time.Duration {
-	max := durations[0]
-	for _, d := range durations {
-		if d > max {
-			max = d
-		}
-	}
-	return max
-}
-
-func AvgDuration(durations ...time.Duration) time.Duration {
-	total := time.Duration(0)
-	for _, d := range durations {
-		total += d
-	}
-	return total / time.Duration(len(durations))
-}
--- a/utils/types.go
+++ b/utils/types.go
@ -1,71 +0,0 @@
-package utils
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-type NonNilConcrete interface {
-	~int | ~float64 | ~string | ~bool
-}
-
-type Option[T NonNilConcrete] interface {
-	IsNone() bool
-	ValueOrErr() (*T, error)
-	ValueOr(def *T) *T
-	ValueOrPanic() *T
-	UnmarshalJSON(data []byte) error
-}
-
-// Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead.
-type option[T NonNilConcrete] struct {
-	// value holds the actual value of the Option if it is not None.
-	value T
-	// none indicates whether the Option is None (i.e., has no value).
-	none bool
-}
-
-func (o *option[T]) IsNone() bool {
-	return o.none
-}
-
-// The returned value can be nil, if the Option is None, it will return nil and an error.
-func (o *option[T]) ValueOrErr() (*T, error) {
-	if o.IsNone() {
-		return nil, errors.New("Option is None")
-	}
-	return &o.value, nil
-}
-
-// The returned value can't be nil, if the Option is None, it will return the default value.
-func (o *option[T]) ValueOr(def *T) *T {
-	if o.IsNone() {
-		return def
-	}
-	return &o.value
-}
-
-// The returned value can't be nil, if the Option is None, it will panic.
-func (o *option[T]) ValueOrPanic() *T {
-	if o.IsNone() {
-		panic("Option is None")
-	}
-	return &o.value
-}
-
-func (o *option[T]) UnmarshalJSON(data []byte) error {
-	if string(data) == "null" {
-		o.none = true
-		return nil
-	}
-	o.none = false
-	return json.Unmarshal(data, &o.value)
-}
-
-func NewOption[T NonNilConcrete](value T) *option[T] {
-	return &option[T]{value: value}
-}
-
-func NewNoneOption[T NonNilConcrete]() *option[T] {
-	return &option[T]{none: true}
-}
Author	SHA1	Message	Date
Aykhan Shahsuvarov	04e5b5f3eb	Merge pull request #56 from aykhans/bump/version Bump version to 0.5.3	2024-12-18 00:15:42 +04:00
Aykhan Shahsuvarov	2bebf09adb	Bump version to 0.5.3	2024-12-18 00:15:31 +04:00
Aykhan Shahsuvarov	ebacebff16	Merge pull request #55 from aykhans/refactor/response-struct 🔨 Reduce memory usage of the 'Response' struct	2024-12-17 23:22:30 +04:00
Aykhan Shahsuvarov	575ca2913a	🔨 Reduce memory usage of the 'Response' struct	2024-12-17 23:07:25 +04:00
Aykhan Shahsuvarov	4686e26ede	Merge pull request #53 from aykhans/feat/add-metrics Add latency percentiles to the results table	2024-12-17 17:51:29 +04:00
Aykhan Shahsuvarov	bd33b2c6a2	✨ Add latency percentiles to the results table	2024-12-17 03:42:52 +04:00
Aykhan Shahsuvarov	3068e0acae	🔨 Add 'types' package	2024-12-17 02:46:55 +04:00
Aykhan Shahsuvarov	7a40bbbd3c	Merge pull request #51 from aykhans/dependabot/go_modules/go_modules-5a9c29dde4 Bump golang.org/x/crypto from 0.30.0 to 0.31.0 in the go_modules group	2024-12-16 22:59:56 +04:00
dependabot[bot]	43c0bd2138	Bump golang.org/x/crypto from 0.30.0 to 0.31.0 in the go_modules group Bumps the go_modules group with 1 update: [golang.org/x/crypto](https://github.com/golang/crypto). Updates `golang.org/x/crypto` from 0.30.0 to 0.31.0 - [Commits](https://github.com/golang/crypto/compare/v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect dependency-group: go_modules ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 18:57:55 +00:00
Aykhan Shahsuvarov	fddeec1791	Merge pull request #50 from aykhans/dependabot/go_modules/github.com/jedib0t/go-pretty/v6-6.6.5 Bump github.com/jedib0t/go-pretty/v6 from 6.6.4 to 6.6.5	2024-12-16 22:56:58 +04:00
dependabot[bot]	6f5fa1860c	Bump github.com/jedib0t/go-pretty/v6 from 6.6.4 to 6.6.5 Bumps [github.com/jedib0t/go-pretty/v6](https://github.com/jedib0t/go-pretty) from 6.6.4 to 6.6.5. - [Release notes](https://github.com/jedib0t/go-pretty/releases) - [Commits](https://github.com/jedib0t/go-pretty/compare/v6.6.4...v6.6.5) --- updated-dependencies: - dependency-name: github.com/jedib0t/go-pretty/v6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 00:53:59 +00:00
Aykhan Shahsuvarov	4480aed0f0	Merge pull request #48 from aykhans/dependabot/go_modules/github.com/valyala/fasthttp-1.58.0 Bump github.com/valyala/fasthttp from 1.57.0 to 1.58.0	2024-12-10 15:18:36 +04:00
dependabot[bot]	f5144ac4be	Bump github.com/valyala/fasthttp from 1.57.0 to 1.58.0 Bumps [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) from 1.57.0 to 1.58.0. - [Release notes](https://github.com/valyala/fasthttp/releases) - [Commits](https://github.com/valyala/fasthttp/compare/v1.57.0...v1.58.0) --- updated-dependencies: - dependency-name: github.com/valyala/fasthttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 10:53:23 +00:00
Aykhan Shahsuvarov	4a1051e08c	Merge pull request #47 from aykhans/dependabot/go_modules/github.com/jedib0t/go-pretty/v6-6.6.4 Bump github.com/jedib0t/go-pretty/v6 from 6.6.3 to 6.6.4	2024-12-10 14:52:10 +04:00
dependabot[bot]	2371986909	Bump github.com/jedib0t/go-pretty/v6 from 6.6.3 to 6.6.4 Bumps [github.com/jedib0t/go-pretty/v6](https://github.com/jedib0t/go-pretty) from 6.6.3 to 6.6.4. - [Release notes](https://github.com/jedib0t/go-pretty/releases) - [Commits](https://github.com/jedib0t/go-pretty/compare/v6.6.3...v6.6.4) --- updated-dependencies: - dependency-name: github.com/jedib0t/go-pretty/v6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 00:26:21 +00:00
Aykhan Shahsuvarov	e9af46084d	Merge pull request #45 from aykhans/docs/refactor 📚 Update README.md	2024-12-09 02:15:53 +04:00
Aykhan Shahsuvarov	cdaa63152f	📚 Update docs	2024-12-09 02:14:08 +04:00
Aykhan Shahsuvarov	16791421c7	📚 Update README.md	2024-12-09 02:11:52 +04:00
Aykhan Shahsuvarov	c90cfd8090	Merge pull request #44 from aykhans/dependabot/go_modules/golang.org/x/net-0.32.0 Bump golang.org/x/net from 0.31.0 to 0.32.0	2024-12-06 23:33:40 +04:00
dependabot[bot]	1aaea8e437	Bump golang.org/x/net from 0.31.0 to 0.32.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.31.0 to 0.32.0. - [Commits](https://github.com/golang/net/compare/v0.31.0...v0.32.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-06 00:40:06 +00:00
Aykhan Shahsuvarov	c44a0c978a	Merge pull request #43 from aykhans/dependabot/go_modules/github.com/jedib0t/go-pretty/v6-6.6.3 Bump github.com/jedib0t/go-pretty/v6 from 6.6.2 to 6.6.3	2024-12-01 20:54:09 +04:00
dependabot[bot]	1ace7be2b4	Bump github.com/jedib0t/go-pretty/v6 from 6.6.2 to 6.6.3 Bumps [github.com/jedib0t/go-pretty/v6](https://github.com/jedib0t/go-pretty) from 6.6.2 to 6.6.3. - [Release notes](https://github.com/jedib0t/go-pretty/releases) - [Commits](https://github.com/jedib0t/go-pretty/compare/v6.6.2...v6.6.3) --- updated-dependencies: - dependency-name: github.com/jedib0t/go-pretty/v6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-29 00:50:11 +00:00
Aykhan Shahsuvarov	fa55de0cf2	Merge pull request #39 from aykhans/feat/add-proxy-check Add 'no-proxy-check' parameter	2024-11-28 04:22:12 +04:00
Aykhan Shahsuvarov	d392d4a787	🔨 Refactor method 'UnmarshalJSON' of 'option[T]'	2024-11-28 04:20:01 +04:00
Aykhan Shahsuvarov	2e6110e54a	🔥 Remove assets	2024-11-27 01:30:15 +04:00
Aykhan Shahsuvarov	48721b4ae7	Update README.md	2024-11-27 01:28:07 +04:00
Aykhan Shahsuvarov	fe4a93b394	🔨 Add constructors to config structs	2024-11-27 00:46:14 +04:00
Aykhan Shahsuvarov	0725c1a481	🔨 Refactor 'option[T]' type	2024-11-24 16:54:38 +04:00
Aykhan Shahsuvarov	e3cbe1e9b4	Merge pull request #42 from aykhans/bump-go-version 🔖 Bump go version '1.22.6 -> 1.23.2'	2024-11-23 18:02:00 +04:00
Aykhan Shahsuvarov	94211eb018	🔖 Bump go version '1.22.6 -> 1.23.2'	2024-11-23 18:01:03 +04:00
Aykhan Shahsuvarov	565079fe97	Merge pull request #41 from aykhans/add-workflow-1 Rename publish-docker-image to publish-docker-image.yml	2024-11-23 01:19:56 +04:00
Aykhan Shahsuvarov	696176e611	Rename publish-docker-image to publish-docker-image.yml	2024-11-23 01:19:38 +04:00
Aykhan Shahsuvarov	9ea06593f9	Merge pull request #40 from aykhans/add-workflow Create publish-docker-image	2024-11-23 01:18:09 +04:00
Aykhan Shahsuvarov	7f7dc07f4c	Create publish-docker-image	2024-11-23 01:17:24 +04:00