lint

zeitlinger · zeitlinger · commit 13c87ca77fed · 2025-04-29T16:17:38.000+02:00
Signed-off-by: Gregor Zeitlinger &lt;gregor.zeitlinger@grafana.com&gt;
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,12 +1,15 @@
+---
 version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: weekly
   - package-ecosystem: maven
-    # excluding simpleclient_archive from the update is not possible, only includes are supported
-    # when we use includes, we run into https://github.com/dependabot/dependabot-core/issues/10415 -
+    # excluding simpleclient_archive from the update is not possible,
+    # only includes are supported
+    # when we use includes,
+    # we run into https://github.com/dependabot/dependabot-core/issues/10415
     # even if we limit to 1 PR at a time
     # therefore we just rename pom.xml in simpleclient_archive for now
     # if this becomes a problem, we can move to renovate
diff --git a/.github/super-linter.env b/.github/super-linter.env
@@ -12,7 +12,10 @@ VALIDATE_JAVASCRIPT_STANDARD=false
 # we have many duplicate code in our codebase for demo purposes
 VALIDATE_JSCPD=false
 
+FILTER_REGEX_EXCLUDE=src/main/generated/.*|docs/themes/.*
+
 FIX_ENV=true
+FIX_GO=true
 FIX_GOOGLE_JAVA_FORMAT=true
 FIX_JAVASCRIPT_PRETTIER=true
 FIX_JSON=true
@@ -21,5 +24,8 @@ FIX_JSONC_PRETTIER=true
 FIX_JSON_PRETTIER=true
 FIX_MARKDOWN=true
 FIX_MARKDOWN_PRETTIER=true
+FIX_PYTHON_BLACK=true
+FIX_PYTHON_ISORT=true
+FIX_PYTHON_PYINK=true
 FIX_SHELL_SHFMT=true
 FIX_YAML_PRETTIER=true
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -1,3 +1,4 @@
+---
 name: OpenTelemetry Acceptance Tests
 
 on:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,3 +1,4 @@
+---
 name: Build
 
 on:
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
@@ -2,18 +2,18 @@ name: Deploy Documentation to Github Pages
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
   # Runs on pushes targeting the 1.0.x branch
   # todo revert this
-#on:
-#  push:
-#    branches:
-#      - main
-#    tags:
-#      - "v*.*.*" # updates the version in the docs
+  #on:
+  #  push:
+  #    branches:
+  #      - main
+  #    tags:
+  #      - "v*.*.*" # updates the version in the docs
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml
@@ -3,11 +3,10 @@ name: Acceptance Tests
 
 on: [pull_request]
 
-permissions: {}
+permissions: { }
 
 jobs:
   acceptance-tests:
-    permissions: {}
     runs-on: ubuntu-24.04
     steps:
       - name: Check out
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -1,3 +1,4 @@
+---
 name: GraalVM Native Tests
 
 on:
@@ -6,7 +7,7 @@ on:
   pull_request:
     branches: ["main"]
 
-permissions: {}
+permissions: { }
 
 jobs:
   native-tests:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,3 +1,4 @@
+---
 name: Deploy to Maven Central
 
 on:
@@ -9,7 +10,7 @@ jobs:
   deploy:
     if: ${{ github.repository == 'prometheus/client_java' }}
     runs-on: ubuntu-24.04
-    permissions: {}
+    permissions: { }
 
     steps:
       - name: Debug gpg key - remove after debugging
diff --git a/.yaml-lint.yml b/.yaml-lint.yml
@@ -0,0 +1,5 @@
+extends: relaxed
+
+rules:
+  line-length:
+    max: 120
diff --git a/examples/example-exemplars-tail-sampling/config/grafana-datasources.yaml b/examples/example-exemplars-tail-sampling/config/grafana-datasources.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: 1
 
 datasources:
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml
@@ -1,4 +1,5 @@
-# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
+# OATS is an acceptance testing framework for OpenTelemetry -
+# https://github.com/grafana/oats/tree/main/yaml
 docker-compose:
   files:
     - ./docker-compose.yml
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/service-instance-id-check.py b/examples/example-exporter-opentelemetry/oats-tests/agent/service-instance-id-check.py
@@ -3,32 +3,37 @@
 # This script is used to check if the service instance id is present in the exported data
 # The script will return 0 if the service instance id is present in the exported data
 
-from urllib.request import urlopen
-import urllib.parse
 import json
+import urllib.parse
+from urllib.request import urlopen
 
-url = ' http://localhost:9090/api/v1/query?query=target_info'
-res = json.loads(urlopen(url).read().decode('utf-8'))
+url = " http://localhost:9090/api/v1/query?query=target_info"
+res = json.loads(urlopen(url).read().decode("utf-8"))
 
 # uncomment the following line to use the local file instead of the url - for debugging
 # with open('example_target_info.json') as f:
 #   res = json.load(f)
 
-values = list({r['metric']['instance'] for r in res['data']['result'] if not r['metric']['service_name'] == 'otelcol-contrib'})
+values = list(
+    {
+        r["metric"]["instance"]
+        for r in res["data"]["result"]
+        if not r["metric"]["service_name"] == "otelcol-contrib"
+    }
+)
 print(values)
 
 # both the agent and the exporter should report the same instance id
 assert len(values) == 1
 
 path = 'target_info{instance="%s"}' % values[0]
 path = urllib.parse.quote_plus(path)
-url = 'http://localhost:9090/api/v1/query?query=%s' % path
-res = json.loads(urlopen(url).read().decode('utf-8'))
+url = "http://localhost:9090/api/v1/query?query=%s" % path
+res = json.loads(urlopen(url).read().decode("utf-8"))
 
-infos = res['data']['result']
+infos = res["data"]["result"]
 print(infos)
 
 # they should not have the same target info
 # e.g. only the agent has telemetry_distro_name
 assert len(infos) == 2
-
diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml
@@ -1,4 +1,5 @@
-# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
+# OATS is an acceptance testing framework for OpenTelemetry -
+# https://github.com/grafana/oats/tree/main/yaml
 docker-compose:
   files:
     - ./docker-compose.yml
diff --git a/examples/example-native-histogram/docker-compose/prometheus.yml b/examples/example-native-histogram/docker-compose/prometheus.yml
@@ -1,8 +1,10 @@
+---
 global:
   scrape_interval: 5s # very short interval for demo purposes
 
 scrape_configs:
   - job_name: "demo"
-    scrape_classic_histograms: true # this will make Prometheus scrape both, the native and the classic histogram.
+    # this will make Prometheus scrape both, the native and the classic histogram.
+    scrape_classic_histograms: true
     static_configs:
       - targets: ["localhost:9400"]
diff --git a/integration-tests/it-pushgateway/src/test/resources/pushgateway-basicauth.yaml b/integration-tests/it-pushgateway/src/test/resources/pushgateway-basicauth.yaml
@@ -1,4 +1,7 @@
+---
 basic_auth_users:
-  # Note: The bcrypt hash of the password was generated with the following command line:
-  # python -c 'import bcrypt; print(bcrypt.hashpw(b"secret_password", bcrypt.gensalt(rounds=10)).decode("ascii"))'
+  # Note: The bcrypt hash of the password was generated
+  # with the following command line:
+  # python -c 'import bcrypt; print(bcrypt.hashpw(b"secret_password",
+  #   bcrypt.gensalt(rounds=10)).decode("ascii"))'
   my_user: $2b$10$kmIxr/4wpcORDXnKLvTMC.WPGqT8nqjBm8AI3MqGkzcSrWJioTfUG
diff --git a/integration-tests/it-pushgateway/src/test/resources/pushgateway-ssl.yaml b/integration-tests/it-pushgateway/src/test/resources/pushgateway-ssl.yaml
@@ -1,6 +1,7 @@
 tls_server_config:
   # cert and key have been generated with the following command:
-  # openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 36500 -nodes -subj "/CN=localhost"
+  # openssl req -x509 -newkey rsa:4096 -keyout key.pem -out
+  # cert.pem -sha256 -days 36500 -nodes -subj "/CN=localhost"
   cert: |
     -----BEGIN CERTIFICATE-----
     MIIFCzCCAvOgAwIBAgIUPwSov6+heI4uY6+fvB1N+1EN3FwwDQYJKoZIhvcNAQEL
diff --git a/mise.toml b/mise.toml
@@ -87,7 +87,7 @@ env = { HUGO_ENVIRONMENT = "production", HUGO_ENV = "production" }
 dir = "docs"
 run = [
   "hugo --gc --minify --baseURL ${BASE_URL}/",
-  "echo 'ls ./docs/public/api' && ls ./docs/public/api"
+  "echo 'ls ./public/api' && ls ./public/api"
 ]
 
 [settings]
diff --git a/mvnw b/mvnw
diff --git a/simpleclient-archive/integration_tests/it_pushgateway/src/test/resources/web-config.yml b/simpleclient-archive/integration_tests/it_pushgateway/src/test/resources/web-config.yml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`name: OpenTelemetry Acceptance Tests`
`2`	`3`
`3`	`4`	`on:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`name: Build`
`2`	`3`
`3`	`4`	`on:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`apiVersion: 1`
`2`	`3`
`3`	`4`	`datasources:`