Merge branch 'prometheus:master' into go-file

Signed-off-by: HARSHIT NAGPAL <[email protected]>

.github/dependabot.yml

@@ -12,7 +12,3 @@ updates:
         patterns:
           - "go.opentelemetry.io/*"
     open-pull-requests-limit: 20
-  #- package-ecosystem: "pip"
-   # directory: "/tools/load-generator"
-   # schedule:
-    #  interval: "monthly"

.github/workflows/golangci-lint.yml

@@ -36,4 +36,4 @@ jobs:
         uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
         with:
           args: --verbose
-          version: v1.59.0
+          version: v1.59.1

.promu.yml

@@ -18,6 +18,8 @@ build:
           path: ./tools/fake-webserver
         - name: tools/scaler
           path: ./tools/scaler
+        - name: tools/load-generator
+          path: ./tools/load-generator
     flags: -a -tags netgo
 crossbuild:
     platforms:

Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.59.0
+GOLANGCI_LINT_VERSION ?= v1.59.1
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

tools/load-generator/Dockerfile

@@ -1,14 +1,8 @@
-FROM golang:1.20-alpine
+FROM quay.io/prometheus/busybox:latest
+LABEL maintainer="The Prometheus Authors <[email protected]>"
 
-WORKDIR /usr/src/app
-
-COPY go.mod go.sum ./
-RUN go mod download
-
-COPY . .
-
-RUN go build -o load-generator .
+COPY load-generator /bin/load-generator
 
 EXPOSE 8080
 
-ENTRYPOINT ["./load-generator"]
+ENTRYPOINT ["/bin/load-generator"]

tools/load-generator/main.go

@@ -1,3 +1,16 @@
+// Copyright 2019 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package main
 
 import (
@@ -16,7 +29,6 @@ import (
 
 // Global variables and Prometheus metrics
 var (
-	namespace    string
 	max404Errors = 30
 	domainName   = os.Getenv("DOMAIN_NAME")
 
@@ -185,7 +197,6 @@ func main() {
 		os.Exit(2)
 	}
 
-	namespace = os.Args[1]
 	prNumber := os.Args[2]
 
 	configFile, err := os.ReadFile("/etc/loadgen/config.yaml")