Merge branch 'main' into repo_sync

Author: zeitlinger

.github/release.yml

@@ -0,0 +1,17 @@
+# .github/release.yml
+
+changelog:
+  categories:
+    - title: 🏕 Features
+      labels:
+        - "*"
+      exclude:
+        labels:
+          - chore
+          - dependencies
+    - title: 🧹 Chore
+      labels:
+        - chore
+    - title: 👒 Dependencies
+      labels:
+        - dependencies

.github/workflows/acceptance-tests.yml

@@ -17,6 +17,6 @@ jobs:
         with:
           persist-credentials: false
         uses: actions/checkout@v4
-      - uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
       - name: Run acceptance tests
         run: mise run acceptance-test

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:

.github/workflows/github-pages.yaml

@@ -36,7 +36,7 @@ jobs:
           persist-credentials: false
           fetch-tags: "true"
           fetch-depth: 0
-      - uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
         with:
           cache: "false"
       - name: Prepare GitHub Pages

.github/workflows/lint-rest.yml

@@ -6,13 +6,13 @@ on: [pull_request]
 permissions: {}
 
 jobs:
-  acceptance-tests:
+  lint:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out
         with:
           persist-credentials: false
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
       - name: Lint
         run: mise run lint-rest

.github/workflows/native-tests.yml

@@ -17,6 +17,6 @@ jobs:
         with:
           persist-credentials: false
         uses: actions/checkout@v4
-      - uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.1.1
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
       - name: Run native tests
         run: mise run native-test

.github/workflows/test-release-build.yml

@@ -0,0 +1,28 @@
+---
+name: Build
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+permissions: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Run the Maven verify phase
+        run: mise run build-release

docs/content/getting-started/quickstart.md

@@ -55,7 +55,7 @@ standalone HTTP server.
 {{< hint type=note >}}
 
 If you do not use the protobuf exposition format, you can
-[exclude]({{< relref "quickstart.md#exclude-protobuf-exposition-format" >}})
+[exclude]({{< relref "../exporters/formats.md#exclude-protobuf-exposition-format" >}})
 it from the dependencies.
 
 {{< /hint >}}

integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml

@@ -16,7 +16,7 @@
     Jetty Sample for the Exporter Integration Test
   </description>
   <properties>
-    <jetty-server.version>12.0.19</jetty-server.version>
+    <jetty-server.version>12.0.20</jetty-server.version>
     <java.version>17</java.version>
   </properties>
 

mise.toml

@@ -6,17 +6,13 @@ PROTO_GENERATION = "true"
 "go:github.com/gohugoio/hugo" = "latest"
 "go:github.com/grafana/oats" = "latest"
 java = "temurin-17.0.13+11"
- lychee = "latest"
+lychee = "latest"
 protoc = "latest"
 
 [tasks.ci]
 description = "CI Build"
-run = [
-  "./mvnw clean install",
-  # just to check if javadoc can be generated
-  "./mvnw javadoc:javadoc -P javadoc"
-]
-env = { REQUIRE_PROTO_UP_TO_DATE = "true" }
+run = "./mvnw clean install"
+env.REQUIRE_PROTO_UP_TO_DATE = "true"
 
 [tasks.format]
 description = "format source code"
@@ -80,6 +76,11 @@ run = "./scripts/set-release-version-github-pages.sh"
 description = "Prepare GitHub pages"
 depends = ["javadoc", "set-gh-pages-version"]
 
+[tasks.gh-pages-dev]
+description = "Build GitHub pages for dev"
+run = "hugo server -D"
+dir = "docs"
+
 [tasks.build-gh-pages]
 description = "Build GitHub pages"
 # For maximum backward compatibility with Hugo modules
@@ -90,6 +91,11 @@ run = [
   "echo 'ls ./public/api' && ls ./public/api"
 ]
 
+[tasks.build-release]
+description = "Build release"
+run = "./scripts/build-release.sh"
+env.TAG = "1.4.0-SNAPSHOT"
+
 [settings]
 # to get lock file support and for go backend
 experimental = true