Add ability to test from gaction

redpanda-data · Oct 15, 2024 · 19e2b6a · 19e2b6a
1 parent e3cded8
commit 19e2b6a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,11 +16,6 @@ jobs:
     - name: Check Out Repo
       uses: actions/checkout@v4
 
-    - name: Add telemetry variables
-      env:
-        CONNECT_TELEMETRY_PRIV_KEY: ${{ secrets.TelemetryPrivateKey }}
-        CONNECT_TELEMETRY_DELAY: 1m
-
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -54,6 +49,8 @@ jobs:
       run: ./resources/scripts/release_notes.sh > ./release_notes.md
 
     - name: Write telemetry private key
+      env:
+        CONNECT_TELEMETRY_PRIV_KEY: ${{ secrets.TELEMETRY_PRIVATE_KEY }}
       run: echo "$CONNECT_TELEMETRY_PRIV_KEY" > ./internal/telemetry/key.pem
 
     - uses: actions/setup-python@v5
@@ -71,6 +68,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CLOUDSMITH_API_KEY: ${{ env.CLOUDSMITH_API_KEY }}
+        CONNECT_TELEMETRY_DELAY: 1m
+        CONNECT_TELEMETRY_PERIOD: 30s
+        CONNECT_TELEMETRY_HOST: http://localhost:8080
 
   docker:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/upload_plugin.yml b/.github/workflows/upload_plugin.yml
@@ -33,14 +33,15 @@ jobs:
         with:
           aws-region: ${{ vars.RP_AWS_CRED_REGION }}
           role-to-assume: arn:aws:iam::${{ secrets.RP_AWS_CRED_ACCOUNT_ID }}:role/${{ vars.RP_AWS_CRED_BASE_ROLE_NAME }}${{ github.event.repository.name }}
-      - name: Add telemetry variables
-        env:
-          CONNECT_TELEMETRY_PRIV_KEY: ${{ secrets.TelemetryPrivateKey }}
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: 1.22.x
           check-latest: true
+      - name: Write telemetry private key
+        env:
+          CONNECT_TELEMETRY_PRIV_KEY: ${{ secrets.TELEMETRY_PRIVATE_KEY }}
+        run: echo "$CONNECT_TELEMETRY_PRIV_KEY" > ./internal/telemetry/key.pem
       - name: Build binaries (dry run / snapshot mode)
         if: ${{ env.DRY_RUN != 'false' }}
         uses: goreleaser/goreleaser-action@v6

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -29,7 +29,9 @@ builds:
       -X main.Version={{.Version}}
       -X main.DateBuilt={{.Date}}
       -X main.BinaryName=redpanda-connect
+      -X github.com/redpanda-data/connect/v4/internal/telemetry.ExportHost={{ if index .Env "CONNECT_TELEMETRY_HOST"  }}{{ .Env.CONNECT_TELEMETRY_HOST }}{{ else }}{{ end }}
       -X github.com/redpanda-data/connect/v4/internal/telemetry.ExportDelay={{ if index .Env "CONNECT_TELEMETRY_DELAY"  }}{{ .Env.CONNECT_TELEMETRY_DELAY }}{{ else }}{{ end }}
+      -X github.com/redpanda-data/connect/v4/internal/telemetry.ExportPeriod={{ if index .Env "CONNECT_TELEMETRY_PERIOD"  }}{{ .Env.CONNECT_TELEMETRY_PERIOD }}{{ else }}{{ end }}
 
   - id: connect-cloud
     main: cmd/redpanda-connect-cloud/main.go

diff --git a/internal/impl/prometheus/metrics_prometheus.go b/internal/impl/prometheus/metrics_prometheus.go
@@ -80,17 +80,17 @@ If the Push Gateway requires HTTP Basic Authentication it can be configured with
 					Default(0.0),
 			).
 				Description("A list of timing metrics summary buckets (as quantiles). Applicable when `use_histogram_timing` is set to `false`.").
-				Example([]map[string]float64{
-					{"quantile": 0.5, "error": 0.05},
-					{"quantile": 0.9, "error": 0.01},
-					{"quantile": 0.99, "error": 0.001},
+				Example([]any{
+					map[string]any{"quantile": 0.5, "error": 0.05},
+					map[string]any{"quantile": 0.9, "error": 0.01},
+					map[string]any{"quantile": 0.99, "error": 0.001},
 				}).
 				Advanced().
 				Version("4.23.0").
-				Default([]map[string]float64{
-					{"quantile": 0.5, "error": 0.05},
-					{"quantile": 0.9, "error": 0.01},
-					{"quantile": 0.99, "error": 0.001},
+				Default([]any{
+					map[string]any{"quantile": 0.5, "error": 0.05},
+					map[string]any{"quantile": 0.9, "error": 0.01},
+					map[string]any{"quantile": 0.99, "error": 0.001},
 				}),
 			service.NewBoolField(pmFieldAddProcessMetrics).
 				Description("Whether to export process metrics such as CPU and memory usage in addition to Redpanda Connect metrics.").