Merge branch 'main' into adhoc-numeric-varchar-field

grafana · Dec 11, 2023 · 0bac4d2 · 0bac4d2
2 parents af647da + a919fd2
commit 0bac4d2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/pull-request-image.yml b/.github/workflows/pull-request-image.yml
@@ -26,7 +26,7 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Install Go environment
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 'stable'
 

diff --git a/.github/workflows/run-backend-tests.yml b/.github/workflows/run-backend-tests.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v4.1.0
+        uses: actions/setup-go@v5
         with:
           go-version: 'stable'
 

diff --git a/.github/workflows/run-frontend-tests.yml b/.github/workflows/run-frontend-tests.yml
@@ -33,7 +33,7 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Install Go
-        uses: actions/setup-go@v4.1.0
+        uses: actions/setup-go@v5
         with:
           go-version: 'stable'
 

diff --git a/.github/workflows/run-k6e2e-tests.yml b/.github/workflows/run-k6e2e-tests.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v4.1.0
+        uses: actions/setup-go@v5
         with:
           go-version: 'stable'
 

diff --git a/pkg/plugin/driver.go b/pkg/plugin/driver.go
@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -56,8 +55,10 @@ func getTLSConfig(settings Settings) (*tls.Config, error) {
 	return tlsConfig, nil
 }
 
-func getClientInfoProducts() (products []struct{ Name, Version string }) {
-	if version := os.Getenv("GF_VERSION"); version != "" {
+func getClientInfoProducts(ctx context.Context) (products []struct{ Name, Version string }) {
+	version := backend.UserAgentFromContext(ctx).GrafanaVersion()
+
+	if version != "" {
 		products = append(products, struct{ Name, Version string }{
 			Name:    "grafana",
 			Version: version,
@@ -140,9 +141,13 @@ func (h *Clickhouse) Connect(config backend.DataSourceInstanceSettings, message
 		}
 	}
 
+	timeout := time.Duration(t)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout*time.Second)
+	defer cancel()
+
 	opts := &clickhouse.Options{
 		ClientInfo: clickhouse.ClientInfo{
-			Products: getClientInfoProducts(),
+			Products: getClientInfoProducts(ctx),
 		},
 		TLS:         tlsConfig,
 		Addr:        []string{fmt.Sprintf("%s:%d", settings.Server, settings.Port)},
@@ -179,10 +184,6 @@ func (h *Clickhouse) Connect(config backend.DataSourceInstanceSettings, message
 
 	db := clickhouse.OpenDB(opts)
 
-	timeout := time.Duration(t)
-	ctx, cancel := context.WithTimeout(context.Background(), timeout*time.Second)
-	defer cancel()
-
 	chErr := make(chan error, 1)
 	go func() {
 		err = db.PingContext(ctx)