Merge branch 'main' into add/icmp-prober

.github/dependabot.yml

@@ -4,16 +4,19 @@ updates:
     directory: "/"
     schedule:
       interval: monthly
-    assignees:
-      - m-yosefpor
     labels:
       - dependencies
-
+    groups:
+       dev-dependencies:
+          patterns:
+            - "*"  
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
       interval: "monthly"
-    assignees:
-      - m-yosefpor
     labels:
       - dependencies
+    groups:
+       dev-dependencies:
+          patterns:
+            - "*"  

Dockerfile

@@ -1,5 +1,5 @@
 #build stage
-FROM golang:1.17 AS builder
+FROM golang:1.21 AS builder
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
 

config/config.go

@@ -51,6 +51,7 @@ type HTTP struct {
 	Timeout           time.Duration `mapstructure:"timeout"`
 	TLSSkipVerify     bool          `mapstructure:"tls_skip_verify"`
 	DisableKeepAlives bool          `mapstructure:"disable_keepalives"`
+	H2cEnabled        bool          `mapstructure:"h2c_enabled"`
 	Host              string        `mapstructure:"host"`
 }
 

main.go

@@ -33,10 +33,10 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	for _, ht := range config.Get().Targets.HTTP {
-		httpProber := prober.NewHttp(ht.Name, ht.URL, ht.RPS, ht.Timeout, ht.TLSSkipVerify, ht.DisableKeepAlives, ht.Host)
+		httpProber := prober.NewHttp(ht.Name, ht.URL, ht.RPS, ht.Timeout, ht.TLSSkipVerify, ht.DisableKeepAlives, ht.H2cEnabled, ht.Host)
 
-		klog.Infof("Probing HTTP target '%s' with url '%s', RPS: %.2f, timeout: %s, TLS_skip_verify: %v, disableKeepAlives: %v ...\n",
-			ht.Name, ht.URL, ht.RPS, ht.Timeout, ht.TLSSkipVerify, ht.DisableKeepAlives)
+		klog.Infof("Probing HTTP target '%s' with url '%s', RPS: %.2f, timeout: %s, TLS_skip_verify: %v, disableKeepAlives: %v, h2cEnabled: %v ...\n",
+			ht.Name, ht.URL, ht.RPS, ht.Timeout, ht.TLSSkipVerify, ht.DisableKeepAlives, ht.H2cEnabled)
 		go httpProber.Start(ctx)
 	}
 

prober/http.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/net/http2"
 	klog "k8s.io/klog/v2"
 )
 
@@ -48,16 +49,32 @@ func init() {
 
 }
 
-func NewHttp(name string, url string, rps float64, timeout time.Duration, tlsSkipVerify, disableKeepAlives bool, host string) HTTP {
+func NewHttp(name string, url string, rps float64, timeout time.Duration, tlsSkipVerify, disableKeepAlives, h2cEnabled bool, host string) HTTP {
 	client := &http.Client{
 		Timeout: timeout,
 	}
-	customTransport := http.DefaultTransport.(*http.Transport).Clone()
-	customTransport.DisableKeepAlives = disableKeepAlives
-	if tlsSkipVerify {
-		customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+
+	if h2cEnabled {
+		customTransport := &http2.Transport{
+			AllowHTTP: true,
+			DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+				return net.Dial(network, addr)
+			},
+		}
+		if tlsSkipVerify {
+			customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+		}
+		client.Transport = customTransport
+	} else {
+		customTransport := http.DefaultTransport.(*http.Transport).Clone()
+
+		// disableKeepalive is only for http1.1
+		customTransport.DisableKeepAlives = disableKeepAlives
+		if tlsSkipVerify {
+			customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+		}
+		client.Transport = customTransport
 	}
-	client.Transport = customTransport
 
 	return HTTP{
 		Name:   name,